phylib: fixes for PHY_RESUMING state changes
Subsystems (3)
PATCH 1/1 phylib: fixes for PHY_RESUMING state changes
The PHY_HALTED state disables phydev->link, but the link will not be updated upon entering PHY_RESUMING. Add a call to phy_read_status() to update the link before entering PHY_RUNNING. If the link is not up at this point, enter the PHY_NOLINK state instead.
Also, when transitioning from PHY_RESUMING to PHY_RUNNING, calls to netif_carrier_on() and phydev->adjust_link() are missing. Add the calls similar to the other transitions to PHY_RUNNING.
--- drivers/net/phy/phy.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-)
drivers/net/phy/phy.c +22 -3
@@ -919,13 +919,32 @@ static void phy_state_machine(struct work_struct *work)* Otherwise, it's 0, and we're * still waiting for AN */ if (err >0 ) { - phydev->state =PHY_RUNNING ; + err =phy_read_status (phydev); +if (err) +break ; + +if (phydev->link) { + phydev->state =PHY_RUNNING ; +netif_carrier_on (phydev->attached_dev); + }else + phydev->state =PHY_NOLINK ; + phydev->adjust_link (phydev->attached_dev); }else { phydev->state =PHY_AN ; phydev->link_timeout =PHY_AN_TIMEOUT ; } - }else - phydev->state =PHY_RUNNING ; + }else { + err =phy_read_status (phydev); +if (err) +break ; + +if (phydev->link) { + phydev->state =PHY_RUNNING ; +netif_carrier_on (phydev->attached_dev); + }else + phydev->state =PHY_NOLINK ; + phydev->adjust_link (phydev->attached_dev); + }break ; }
Quoted 10 lines · Wade Farnsworth
The
PHY_HALTEDstate disablesphydev->link, but the link will not be updated upon enteringPHY_RESUMING. Add a call tophy_read_status()to update the link before enteringPHY_RUNNING. If the link is not up at this point, enter thePHY_NOLINKstate instead.Also, when transitioning from
PHY_RESUMINGtoPHY_RUNNING, calls tonetif_carrier_on()andphydev->adjust_link()are missing. Add the calls similar to the other transitions toPHY_RUNNING.Signed-off-by Wade Farnsworth <[email protected]>
From: Andy Fleming <[email protected]>
Date: Wed, 1 Jul 2009 19:34:24 -0500
Quoted 9 lines · Wade Farnsworth
Quoted 7 lines
The
PHY_HALTEDstate disablesphydev->link, but the link will not be updated upon enteringPHY_RESUMING. Add a call tophy_read_status()to
update the link before enteringPHY_RUNNING. If the link is not up at this point, enter thePHY_NOLINKstate instead.
Quoted 8 lines
Quoted 6 lines
Also, when transitioning from
PHY_RESUMINGtoPHY_RUNNING, calls tonetif_carrier_on()andphydev->adjust_link()are missing. Add the calls
similar to the other transitions toPHY_RUNNING.Signed-off-by Wade Farnsworth <[email protected]>Acked-by Andy Fleming <[email protected]>
Applied.