aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorBrandon Philips <bphilips@suse.de>2009-10-29 13:58:07 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-08 10:22:36 -0800
commitd801d0a919fd2e54ad91626a0cb7d006a9c6de84 (patch)
treef344c9b7e75114b35e883b0456445d27289e858d /drivers/net
parentc089a8dcd8a99f8c6505a539d45a754a9f84c9dd (diff)
sky2: set carrier off in probe
commit 33cb7d33a1c36e07839d08a4d1a33bf6a0f70bba upstream. Before bringing up a sky2 interface up ethtool reports "Link detected: yes". Do as ixgbe does and netif_carrier_off() on probe(). Signed-off-by: Brandon Philips <bphilips@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/sky2.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index a606e7fc013..329f447f5bf 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4528,6 +4528,8 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
goto err_out_free_netdev;
}
+ netif_carrier_off(dev);
+
netif_napi_add(dev, &hw->napi, sky2_poll, NAPI_WEIGHT);
err = request_irq(pdev->irq, sky2_intr,