summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrandon Philips <bphilips@suse.de>2009-10-29 13:58:07 +0000
committerDavid S. Miller <davem@davemloft.net>2009-10-30 12:25:16 -0700
commit33cb7d33a1c36e07839d08a4d1a33bf6a0f70bba (patch)
tree430318f8c25258ab048703d9c332d9707e488dbf
parent9d410c796067686b1e032d54ce475b7055537138 (diff)
downloadlinux-stable-33cb7d33a1c36e07839d08a4d1a33bf6a0f70bba.tar.gz
linux-stable-33cb7d33a1c36e07839d08a4d1a33bf6a0f70bba.tar.bz2
linux-stable-33cb7d33a1c36e07839d08a4d1a33bf6a0f70bba.zip
sky2: set carrier off in probe
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>
-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 2ab5c39f33ca..6a10d7ba5877 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4538,6 +4538,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,