From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Wed, 7 Dec 2011 21:59:27 +0000 (+0000)
Subject: net/fec: prevent dobule restart of interface on FDX/HDX change
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6ea0722fb8cdeacc774733c259d33bf45529e91b;p=linux-beck.git

net/fec: prevent dobule restart of interface on FDX/HDX change

Upon detection of a FDX/HDX change the interface is restarted twice.

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index 65ee506f9eb7..7ef408fd322a 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/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;
 		}
 	}