skge: don't assert carrier until link is up
authorstephen hemminger <shemminger@vyatta.com>
Thu, 19 Jan 2012 14:35:25 +0000 (14:35 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 22 Jan 2012 20:08:44 +0000 (15:08 -0500)
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>
drivers/net/ethernet/marvell/skge.c

index 18a87a5..f580f05 100644 (file)
@@ -2576,6 +2576,7 @@ static int skge_up(struct net_device *dev)
        }
 
        /* Initialize MAC */
        }
 
        /* Initialize MAC */
+       netif_carrier_off(dev);
        spin_lock_bh(&hw->phy_lock);
        if (is_genesis(hw))
                genesis_mac_init(hw, port);
        spin_lock_bh(&hw->phy_lock);
        if (is_genesis(hw))
                genesis_mac_init(hw, port);