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. Signed-off-by: Wade Farnsworth <wfarnsworth@mvista.com> Acked-by: Andy Fleming <afleming@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
67c38fc61a
Коммит
42caa07404
|
@ -928,13 +928,32 @@ static void phy_state_machine(struct work_struct *work)
|
||||||
* Otherwise, it's 0, and we're
|
* Otherwise, it's 0, and we're
|
||||||
* still waiting for AN */
|
* still waiting for AN */
|
||||||
if (err > 0) {
|
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 {
|
} else {
|
||||||
phydev->state = PHY_AN;
|
phydev->state = PHY_AN;
|
||||||
phydev->link_timeout = PHY_AN_TIMEOUT;
|
phydev->link_timeout = PHY_AN_TIMEOUT;
|
||||||
}
|
}
|
||||||
} else
|
} else {
|
||||||
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);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче