From: Wade Farnsworth <wfarnsworth@mvista.com>
Date: Wed, 1 Jul 2009 13:00:34 +0000 (+0000)
Subject: phylib: fixes for PHY_RESUMING state changes
X-Git-Tag: v2.6.31-rc3~70^2~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42caa074042e22f873c408a0d13be657b16192f1;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed