]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
net: bcmgenet: start with carrier off
authorFlorian Fainelli <f.fainelli@gmail.com>
Thu, 26 Jun 2014 17:26:21 +0000 (10:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Jul 2014 00:25:02 +0000 (17:25 -0700)
We use the PHY library which will determine the link state for us, make
sure we start with a carrier off until libphy has completed the link
training.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/genet/bcmgenet.c

index d17953cc5f49c80477125fb729ed9b29c19e6493..e51e462bc8fdc1e4739558bd156728eece13195d 100644 (file)
@@ -2535,6 +2535,9 @@ static int bcmgenet_probe(struct platform_device *pdev)
        netif_set_real_num_tx_queues(priv->dev, priv->hw_params->tx_queues + 1);
        netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1);
 
+       /* libphy will determine the link state */
+       netif_carrier_off(dev);
+
        /* Turn off the main clock, WOL clock is handled separately */
        if (!IS_ERR(priv->clk))
                clk_disable_unprepare(priv->clk);