|
@@ -22,7 +22,7 @@ Signed-off-by: Russell King <[email protected]>
|
|
|
|
|
|
--- a/drivers/net/phy/phy.c
|
|
|
+++ b/drivers/net/phy/phy.c
|
|
|
-@@ -849,6 +849,16 @@ void phy_start(struct phy_device *phydev
|
|
|
+@@ -852,6 +852,16 @@ void phy_start(struct phy_device *phydev
|
|
|
}
|
|
|
EXPORT_SYMBOL(phy_start);
|
|
|
|
|
@@ -39,7 +39,7 @@ Signed-off-by: Russell King <[email protected]>
|
|
|
/**
|
|
|
* phy_state_machine - Handle the state machine
|
|
|
* @work: work_struct that describes the work to be done
|
|
|
-@@ -890,8 +900,7 @@ void phy_state_machine(struct work_struc
|
|
|
+@@ -893,8 +903,7 @@ void phy_state_machine(struct work_struc
|
|
|
/* If the link is down, give up on negotiation for now */
|
|
|
if (!phydev->link) {
|
|
|
phydev->state = PHY_NOLINK;
|
|
@@ -49,7 +49,7 @@ Signed-off-by: Russell King <[email protected]>
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
-@@ -903,9 +912,7 @@ void phy_state_machine(struct work_struc
|
|
|
+@@ -906,9 +915,7 @@ void phy_state_machine(struct work_struc
|
|
|
/* If AN is done, we're running */
|
|
|
if (err > 0) {
|
|
|
phydev->state = PHY_RUNNING;
|
|
@@ -60,7 +60,7 @@ Signed-off-by: Russell King <[email protected]>
|
|
|
} else if (0 == phydev->link_timeout--)
|
|
|
needs_aneg = true;
|
|
|
break;
|
|
|
-@@ -930,8 +937,7 @@ void phy_state_machine(struct work_struc
|
|
|
+@@ -933,8 +940,7 @@ void phy_state_machine(struct work_struc
|
|
|
}
|
|
|
}
|
|
|
phydev->state = PHY_RUNNING;
|
|
@@ -70,7 +70,7 @@ Signed-off-by: Russell King <[email protected]>
|
|
|
}
|
|
|
break;
|
|
|
case PHY_FORCING:
|
|
|
-@@ -941,13 +947,12 @@ void phy_state_machine(struct work_struc
|
|
|
+@@ -944,13 +950,12 @@ void phy_state_machine(struct work_struc
|
|
|
|
|
|
if (phydev->link) {
|
|
|
phydev->state = PHY_RUNNING;
|
|
@@ -86,7 +86,7 @@ Signed-off-by: Russell King <[email protected]>
|
|
|
break;
|
|
|
case PHY_RUNNING:
|
|
|
/* Only register a CHANGE if we are polling or ignoring
|
|
|
-@@ -970,14 +975,12 @@ void phy_state_machine(struct work_struc
|
|
|
+@@ -982,14 +987,12 @@ void phy_state_machine(struct work_struc
|
|
|
|
|
|
if (phydev->link) {
|
|
|
phydev->state = PHY_RUNNING;
|
|
@@ -103,7 +103,7 @@ Signed-off-by: Russell King <[email protected]>
|
|
|
if (phy_interrupt_is_valid(phydev))
|
|
|
err = phy_config_interrupt(phydev,
|
|
|
PHY_INTERRUPT_ENABLED);
|
|
|
-@@ -985,8 +988,7 @@ void phy_state_machine(struct work_struc
|
|
|
+@@ -997,8 +1000,7 @@ void phy_state_machine(struct work_struc
|
|
|
case PHY_HALTED:
|
|
|
if (phydev->link) {
|
|
|
phydev->link = 0;
|
|
@@ -113,7 +113,7 @@ Signed-off-by: Russell King <[email protected]>
|
|
|
do_suspend = true;
|
|
|
}
|
|
|
break;
|
|
|
-@@ -1006,11 +1008,11 @@ void phy_state_machine(struct work_struc
|
|
|
+@@ -1018,11 +1020,11 @@ void phy_state_machine(struct work_struc
|
|
|
|
|
|
if (phydev->link) {
|
|
|
phydev->state = PHY_RUNNING;
|
|
@@ -127,7 +127,7 @@ Signed-off-by: Russell King <[email protected]>
|
|
|
} else {
|
|
|
phydev->state = PHY_AN;
|
|
|
phydev->link_timeout = PHY_AN_TIMEOUT;
|
|
|
-@@ -1022,11 +1024,11 @@ void phy_state_machine(struct work_struc
|
|
|
+@@ -1034,11 +1036,11 @@ void phy_state_machine(struct work_struc
|
|
|
|
|
|
if (phydev->link) {
|
|
|
phydev->state = PHY_RUNNING;
|