From a1025d488a58b5217bfe6df4a0e49845c06398ba Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Mon, 29 Mar 2010 07:36:20 +0000
Subject: [PATCH] --- yaml --- r: 193889 b: refs/heads/master c:
 9badba2543d165154c540b80e59ff06c1b3e3f76 h: refs/heads/master i:   193887:
 e5c07421461e0ce7eef102032fd59f5b6068e8ec v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/sky2.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0a63ab941446..06864ba2b05a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b7c47aa221191b2bd62c653ea851afe5b625162
+refs/heads/master: 9badba2543d165154c540b80e59ff06c1b3e3f76
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index eec36995af22..f1c0ec308bfe 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -2146,7 +2146,8 @@ static void sky2_phy_intr(struct sky2_hw *hw, unsigned port)
 		   istatus, phystat);
 
 	if (istatus & PHY_M_IS_AN_COMPL) {
-		if (sky2_autoneg_done(sky2, phystat) == 0)
+		if (sky2_autoneg_done(sky2, phystat) == 0 &&
+		    !netif_carrier_ok(dev))
 			sky2_link_up(sky2);
 		goto out;
 	}