aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2012-01-19 14:35:25 +0000
committerDavid S. Miller <davem@davemloft.net>2012-01-22 15:08:44 -0500
commit19f9ad789396fe5b4fe0302344b3acfa07cb6772 (patch)
tree340a59ed2cc38190e4a0f18acf6e32b10bdd1785 /drivers
parenta42b4799c683723e8c464de4026af085b2ebd5fa (diff)
downloadlinux-linaro-stable-19f9ad789396fe5b4fe0302344b3acfa07cb6772.tar.gz
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/marvell/skge.c1
1 files changed, 1 insertions, 0 deletions
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);