---

yaml --- r: 193889 b: refs/heads/master c: 9badba2 h: refs/heads/master i: 193887: e5c0742 v: v3
git-mirror · Mar 31, 2010 · a1025d4 · a1025d4
1 parent e8c67cf
commit a1025d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;
 	}