Commit 42caa074 authored Jul 01, 2009 by Wade Farnsworth Committed by David S. Miller Jul 02, 2009

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>

parent 67c38fc6

drivers/net/phy/phy.c

+22 −3

Original line number	Diff line number	Diff line
		@@ -928,13 +928,32 @@ static void phy_state_machine(struct work_struct *work)
		* Otherwise, it's 0, and we're
		* still waiting for AN */
		if (err > 0) {
		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
		} 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;
		}

Admin message