Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (39 commits)
  Revert "p54: Use SKB list handling helpers instead of by-hand code."
  sctp: fix warning at inet_sock_destruct() while release sctp socket
  tun/tap: Fix crashes if open() /dev/net/tun and then poll() it.
  dsa: fix 88e6xxx statistics counter snapshotting
  forcedeth: Fix NAPI race.
  drivers/net/smsc911x.c: Fix resource size off by 1 error
  pcnet_cs: add new id
  bnx2x: Fix the maximal values of coalescing timeouts.
  bnx2x: Disable HC coalescing when setting timeout to zero.
  tun: Fix device unregister race
  be2net: fix spurious interrupt handling in intx mode
  e1000e: disable K1 at 1000Mbps for 82577/82578
  e1000e: delay second read of PHY_STATUS register on failure of first read
  e1000e: prevent NVM corruption on sectors larger than 4K
  e1000e: do not write SmartSpeed register bits on parts without support
  e1000e: delay after LCD reset and proper checks for PHY configuration done
  e1000e: PHY loopback broken on 82578
  ixgbe: Not allow 8259x unsupported wol options change from ethtool
  ixgbe: fix inconsistent SFP/SFP+ failure results.
  ixgbe: fix regression on some 82598 adapters
  ...

1 files changed, 22 insertions, 3 deletions

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 61755cbd978e..eda94fcd4065 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -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) {
-                                        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;
         }