[106/119] sky2: set carrier off in probe

Greg KH
2009-12-07T00:15:57Z

[-- Attachment #1: sky2-set-carrier-off-in-probe.patch --]
[-- Type: text/plain, Size: 834 bytes --]

2.6.31-stable review patch. If anyone has any objections, please let us know.

------------------
From: Brandon Philips <bphilips@suse.de>

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>

---
drivers/net/sky2.c | 2 ++
1 file changed, 2 insertions(+)

--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4528,6 +4528,8 @@ static int __devinit sky2_probe(struct p
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,