]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/suse-2.6.27.39/patches.drivers/sky2-no-link-at-probe.patch
Fix oinkmaster patch.
[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.39 / patches.drivers / sky2-no-link-at-probe.patch
1 From: Brandon Philips <bphilips@suse.de>
2 Subject: sky2: assume no link at probe
3 References: bnc#539010
4 Patch-Mainline: queued in net-2.6 2009-10-31 and trivial
5
6 Before bringing up a sky2 interface up ethtool reports
7 "Link detected: yes". Do as ixgbe does and netif_carrier_off() on
8 probe().
9
10 Signed-off-by: Brandon Philips <bphilips@suse.de>
11
12 ---
13 drivers/net/sky2.c | 5 ++++-
14 1 file changed, 4 insertions(+), 1 deletion(-)
15
16 Index: linux-2.6.27-SLE11_BRANCH/drivers/net/sky2.c
17 ===================================================================
18 --- linux-2.6.27-SLE11_BRANCH.orig/drivers/net/sky2.c
19 +++ linux-2.6.27-SLE11_BRANCH/drivers/net/sky2.c
20 @@ -1908,7 +1908,7 @@ static void sky2_link_down(struct sky2_p
21
22 netif_carrier_off(sky2->netdev);
23
24 - /* Turn on link LED */
25 + /* Turn off link LED */
26 sky2_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_OFF);
27
28 if (netif_msg_link(sky2))
29 @@ -4290,6 +4290,9 @@ static int __devinit sky2_probe(struct p
30 goto err_out_free_netdev;
31 }
32
33 + /* assume no link at probe */
34 + netif_carrier_off(dev);
35 +
36 netif_napi_add(dev, &hw->napi, sky2_poll, NAPI_WEIGHT);
37
38 err = request_irq(pdev->irq, sky2_intr,