From 7eb7e5e09e29b84f13ff074307a4767388c0b860 Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Thu, 19 Jan 2012 14:35:25 +0000 Subject: [PATCH] --- yaml --- r: 286685 b: refs/heads/master c: 19f9ad789396fe5b4fe0302344b3acfa07cb6772 h: refs/heads/master i: 286683: 3430861ac381b3a967bf0ddf076cd42fb3215d9d v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/marvell/skge.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9021cc654787..edad4ac98cb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a42b4799c683723e8c464de4026af085b2ebd5fa +refs/heads/master: 19f9ad789396fe5b4fe0302344b3acfa07cb6772 diff --git a/trunk/drivers/net/ethernet/marvell/skge.c b/trunk/drivers/net/ethernet/marvell/skge.c index 18a87a57fc0a..f580f0535bb4 100644 --- a/trunk/drivers/net/ethernet/marvell/skge.c +++ b/trunk/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);