58b66cdd75
Changelog: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.18 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46299
29 lines
973 B
Diff
29 lines
973 B
Diff
--- a/drivers/net/phy/phy_device.c
|
|
+++ b/drivers/net/phy/phy_device.c
|
|
@@ -1133,7 +1133,7 @@ int genphy_config_init(struct phy_device
|
|
return 0;
|
|
}
|
|
|
|
-static int gen10g_soft_reset(struct phy_device *phydev)
|
|
+static int no_soft_reset(struct phy_device *phydev)
|
|
{
|
|
/* Do nothing for now */
|
|
return 0;
|
|
@@ -1347,7 +1347,7 @@ static struct phy_driver genphy_driver[]
|
|
.phy_id = 0xffffffff,
|
|
.phy_id_mask = 0xffffffff,
|
|
.name = "Generic PHY",
|
|
- .soft_reset = genphy_soft_reset,
|
|
+ .soft_reset = no_soft_reset,
|
|
.config_init = genphy_config_init,
|
|
.features = PHY_GBIT_FEATURES | SUPPORTED_MII |
|
|
SUPPORTED_AUI | SUPPORTED_FIBRE |
|
|
@@ -1362,7 +1362,7 @@ static struct phy_driver genphy_driver[]
|
|
.phy_id = 0xffffffff,
|
|
.phy_id_mask = 0xffffffff,
|
|
.name = "Generic 10G PHY",
|
|
- .soft_reset = gen10g_soft_reset,
|
|
+ .soft_reset = no_soft_reset,
|
|
.config_init = gen10g_config_init,
|
|
.features = 0,
|
|
.config_aneg = gen10g_config_aneg,
|