From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Sat, 7 Apr 2007 23:02:25 +0000 (-0700)
Subject: skge: turn carrier off when down
X-Git-Tag: v2.6.21-rc7~22^2~11
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5b9ddd9a0f95e133db7b43d05978f24cd6f1369;p=linux-2.6

skge: turn carrier off when down

Driver needs to turn off carrier when down, otherwise it can
confuse bonding and bridging and looks like carrier is on immediately
when it is brought back up.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 39c6677dff..cc907a1a5e 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -2535,6 +2535,7 @@ static int skge_down(struct net_device *dev)
 		printk(KERN_INFO PFX "%s: disabling interface\n", dev->name);
 
 	netif_stop_queue(dev);
+	netif_carrier_off(dev);
 	if (hw->chip_id == CHIP_ID_GENESIS && hw->phy_type == SK_PHY_XMAC)
 		del_timer_sync(&skge->link_timer);