The following commit has been merged in the linux branch: commit 33cb7d33a1c36e07839d08a4d1a33bf6a0f70bba Author: Brandon Philips bphilips@suse.de Date: Thu Oct 29 13:58:07 2009 +0000

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

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 2ab5c39..6a10d7b 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,