Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6eccabb3 authored by Eilon Greenstein's avatar Eilon Greenstein Committed by David S. Miller
Browse files

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: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2dfe0e1f

drivers/net/bnx2x_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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);
@@ -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,