From: stephen hemminger <shemminger@vyatta.com>
Date: Thu, 19 Jan 2012 14:35:25 +0000 (+0000)
Subject: skge: don't assert carrier until link is up
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=19f9ad789396fe5b4fe0302344b3acfa07cb6772;p=linux-beck.git

skge: don't assert carrier until link is up

Skge device would assert carrier (link up) as soon as network device open
was called, rather than waiting until PHY has detected link.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index 18a87a57fc0a..f580f0535bb4 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -2576,6 +2576,7 @@ static int skge_up(struct net_device *dev)
 	}
 
 	/* Initialize MAC */
+	netif_carrier_off(dev);
 	spin_lock_bh(&hw->phy_lock);
 	if (is_genesis(hw))
 		genesis_mac_init(hw, port);