--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
-@@ -58,13 +58,13 @@ static const char *phy_state_to_str(enum
+@@ -71,13 +71,13 @@ static void phy_process_state_change(str
static void phy_link_up(struct phy_device *phydev)
{
phy_led_trigger_change_speed(phydev);
}
-@@ -550,7 +550,7 @@ int phy_start_cable_test(struct phy_devi
+@@ -563,7 +563,7 @@ int phy_start_cable_test(struct phy_devi
goto out;
/* Mark the carrier down until the test is complete */
netif_testing_on(dev);
err = phydev->drv->cable_test_start(phydev);
-@@ -621,7 +621,7 @@ int phy_start_cable_test_tdr(struct phy_
+@@ -634,7 +634,7 @@ int phy_start_cable_test_tdr(struct phy_
goto out;
/* Mark the carrier down until the test is complete */
netif_testing_on(dev);
err = phydev->drv->cable_test_tdr_start(phydev, config);
-@@ -693,7 +693,7 @@ static int phy_check_link_status(struct
+@@ -706,7 +706,7 @@ static int phy_check_link_status(struct
phy_link_up(phydev);
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
phydev->state = PHY_NOLINK;
}
return 0;
-@@ -1149,7 +1149,7 @@ void phy_state_machine(struct work_struc
+@@ -1192,7 +1192,7 @@ void phy_state_machine(struct work_struc
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;
break;
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
-@@ -1000,14 +1000,16 @@ struct phy_device *phy_find_first(struct
+@@ -1035,14 +1035,16 @@ struct phy_device *phy_find_first(struct
}
EXPORT_SYMBOL(phy_find_first);
phydev->mii_ts->link_state(phydev->mii_ts, phydev);
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
-@@ -946,7 +946,8 @@ void phylink_destroy(struct phylink *pl)
+@@ -1370,7 +1370,8 @@ void phylink_destroy(struct phylink *pl)
}
EXPORT_SYMBOL_GPL(phylink_destroy);
bool tx_pause, rx_pause;
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -663,7 +663,7 @@ struct phy_device {
+@@ -706,7 +706,7 @@ struct phy_device {
u8 mdix;
u8 mdix_ctrl;