diff options
author | Eilon Greenstein <eilong@broadcom.com> | 2009-01-21 22:37:48 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-22 16:45:06 -0500 |
commit | 6eccabb301d442e6106ecc84b07a976c2816d9fb (patch) | |
tree | f705b37f9fc2eddaed7e670df5560a281cb78492 /drivers/net | |
parent | 2dfe0e1fecb582b4aae7f2490904864c05472f3a (diff) |
bnx2x: Carrier off first call
Call carrier off should not be called after register_netdev since after
register netdev open can be called at any time followed by an interrupt that
will set it to carrier_on and the probe will resume control and set it to off
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/bnx2x_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index 707c4bbe46a4..fbd71659cca6 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c | |||
@@ -9827,6 +9827,8 @@ static int bnx2x_open(struct net_device *dev) | |||
9827 | { | 9827 | { |
9828 | struct bnx2x *bp = netdev_priv(dev); | 9828 | struct bnx2x *bp = netdev_priv(dev); |
9829 | 9829 | ||
9830 | netif_carrier_off(dev); | ||
9831 | |||
9830 | bnx2x_set_power_state(bp, PCI_D0); | 9832 | bnx2x_set_power_state(bp, PCI_D0); |
9831 | 9833 | ||
9832 | return bnx2x_nic_load(bp, LOAD_OPEN); | 9834 | return bnx2x_nic_load(bp, LOAD_OPEN); |
@@ -10332,8 +10334,6 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev, | |||
10332 | goto init_one_exit; | 10334 | goto init_one_exit; |
10333 | } | 10335 | } |
10334 | 10336 | ||
10335 | netif_carrier_off(dev); | ||
10336 | |||
10337 | bp->common.name = board_info[ent->driver_data].name; | 10337 | bp->common.name = board_info[ent->driver_data].name; |
10338 | printk(KERN_INFO "%s: %s (%c%d) PCI-E x%d %s found at mem %lx," | 10338 | printk(KERN_INFO "%s: %s (%c%d) PCI-E x%d %s found at mem %lx," |
10339 | " IRQ %d, ", dev->name, bp->common.name, | 10339 | " IRQ %d, ", dev->name, bp->common.name, |