]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From 6eccabb301d442e6106ecc84b07a976c2816d9fb Mon Sep 17 00:00:00 2001 |
2 | From: Eilon Greenstein <eilong@broadcom.com> | |
3 | Date: Thu, 22 Jan 2009 03:37:48 +0000 | |
4 | Subject: bnx2x: Carrier off first call | |
5 | Acked-by: Karsten Keil <kkeil@novell.com> | |
6 | Reference: bnc#472500 | |
7 | ||
8 | Call carrier off should not be called after register_netdev since after | |
9 | register netdev open can be called at any time followed by an interrupt that | |
10 | will set it to carrier_on and the probe will resume control and set it to off | |
11 | ||
12 | Signed-off-by: Eilon Greenstein <eilong@broadcom.com> | |
13 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
14 | --- | |
15 | drivers/net/bnx2x_main.c | 4 ++-- | |
16 | 1 files changed, 2 insertions(+), 2 deletions(-) | |
17 | ||
18 | Index: linux-2.6.27-bnx2x_2/drivers/net/bnx2x_main.c | |
19 | =================================================================== | |
20 | --- linux-2.6.27-bnx2x_2.orig/drivers/net/bnx2x_main.c | |
21 | +++ linux-2.6.27-bnx2x_2/drivers/net/bnx2x_main.c | |
22 | @@ -9831,6 +9831,8 @@ static int bnx2x_open(struct net_device | |
23 | { | |
24 | struct bnx2x *bp = netdev_priv(dev); | |
25 | ||
26 | + netif_carrier_off(dev); | |
27 | + | |
28 | bnx2x_set_power_state(bp, PCI_D0); | |
29 | ||
30 | return bnx2x_nic_load(bp, LOAD_OPEN); | |
31 | @@ -10335,8 +10337,6 @@ static int __devinit bnx2x_init_one(stru | |
32 | goto init_one_exit; | |
33 | } | |
34 | ||
35 | - netif_carrier_off(dev); | |
36 | - | |
37 | bp->common.name = board_info[ent->driver_data].name; | |
38 | printk(KERN_INFO "%s: %s (%c%d) PCI-E x%d %s found at mem %lx," | |
39 | " IRQ %d, ", dev->name, bp->common.name, |