---

yaml --- r: 278520 b: refs/heads/master c: 6ea0722 h: refs/heads/master v: v3
git-mirror · Dec 9, 2011 · 05ef1a1 · 05ef1a1
1 parent 9222277
commit 05ef1a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b1436c1f94e591e240845edee835658ce98985e
+refs/heads/master: 6ea0722fb8cdeacc774733c259d33bf45529e91b
diff --git a/trunk/drivers/net/ethernet/freescale/fec.c b/trunk/drivers/net/ethernet/freescale/fec.c
@@ -865,6 +865,8 @@ static void fec_enet_adjust_link(struct net_device *ndev)
 	if (phy_dev->link) {
 		if (fep->full_duplex != phy_dev->duplex) {
 			fec_restart(ndev, phy_dev->duplex);
+			/* prevent unnecessary second fec_restart() below */
+			fep->link = phy_dev->link;
 			status_change = 1;
 		}
 	}