Skip to content

Commit

Permalink
bnx2x: Carrier off first call
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eilon Greenstein authored and David S. Miller committed Jan 22, 2009
1 parent 2dfe0e1 commit 6eccabb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/bnx2x_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -9827,6 +9827,8 @@ static int bnx2x_open(struct net_device *dev)
{
struct bnx2x *bp = netdev_priv(dev);

netif_carrier_off(dev);

bnx2x_set_power_state(bp, PCI_D0);

return bnx2x_nic_load(bp, LOAD_OPEN);
Expand Down Expand Up @@ -10332,8 +10334,6 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
goto init_one_exit;
}

netif_carrier_off(dev);

bp->common.name = board_info[ent->driver_data].name;
printk(KERN_INFO "%s: %s (%c%d) PCI-E x%d %s found at mem %lx,"
" IRQ %d, ", dev->name, bp->common.name,
Expand Down

0 comments on commit 6eccabb

Please sign in to comment.