You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
973 B
30 lines
973 B
10 years ago
|
--- a/drivers/net/phy/phy_device.c
|
||
|
|
+++ b/drivers/net/phy/phy_device.c
|
||
|
|
@@ -1132,7 +1132,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;
|
||
|
|
@@ -1346,7 +1346,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 |
|
||
|
|
@@ -1361,7 +1361,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,
|