|
|
@@ -16,7 +16,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
|
|
|
|
|
--- a/drivers/net/phy/phy.c
|
|
|
+++ b/drivers/net/phy/phy.c
|
|
|
-@@ -58,13 +58,13 @@ static const char *phy_state_to_str(enum
|
|
|
+@@ -70,13 +70,13 @@ static void phy_process_state_change(str
|
|
|
|
|
|
static void phy_link_up(struct phy_device *phydev)
|
|
|
{
|
|
|
@@ -33,7 +33,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
|
|
phy_led_trigger_change_speed(phydev);
|
|
|
}
|
|
|
|
|
|
-@@ -572,7 +572,7 @@ int phy_start_cable_test(struct phy_devi
|
|
|
+@@ -584,7 +584,7 @@ int phy_start_cable_test(struct phy_devi
|
|
|
goto out;
|
|
|
|
|
|
/* Mark the carrier down until the test is complete */
|
|
|
@@ -42,7 +42,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
|
|
|
|
|
netif_testing_on(dev);
|
|
|
err = phydev->drv->cable_test_start(phydev);
|
|
|
-@@ -643,7 +643,7 @@ int phy_start_cable_test_tdr(struct phy_
|
|
|
+@@ -655,7 +655,7 @@ int phy_start_cable_test_tdr(struct phy_
|
|
|
goto out;
|
|
|
|
|
|
/* Mark the carrier down until the test is complete */
|
|
|
@@ -51,7 +51,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
|
|
|
|
|
netif_testing_on(dev);
|
|
|
err = phydev->drv->cable_test_tdr_start(phydev, config);
|
|
|
-@@ -714,7 +714,7 @@ static int phy_check_link_status(struct
|
|
|
+@@ -726,7 +726,7 @@ static int phy_check_link_status(struct
|
|
|
phy_link_up(phydev);
|
|
|
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
|
|
|
phydev->state = PHY_NOLINK;
|
|
|
@@ -60,7 +60,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
|
|
}
|
|
|
|
|
|
return 0;
|
|
|
-@@ -1226,7 +1226,7 @@ void phy_state_machine(struct work_struc
|
|
|
+@@ -1241,7 +1241,7 @@ void phy_state_machine(struct work_struc
|
|
|
case PHY_HALTED:
|
|
|
if (phydev->link) {
|
|
|
phydev->link = 0;
|