bnx2x: Calling netif_carrier_off at the end of the probe

Eilon Greenstein · davem330 · commit 12b56ea89e70 · 2008-11-03T16:46:40.000-08:00
netif_carrier_off was called too early at the probe. In case of failure
or simply bad timing, this can cause a fatal error since linkwatch_event
might run too soon.

Signed-off-by: Eilon Greenstein &lt;eilong@broadcom.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
@@ -10206,8 +10206,6 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
 		return -ENOMEM;
 	}
 
-	netif_carrier_off(dev);
-
 	bp = netdev_priv(dev);
 	bp->msglevel = debug;
 
@@ -10231,6 +10229,8 @@ 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,

Original file line number	Diff line number	Diff line change
`@@ -10206,8 +10206,6 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,`
`10206`	`10206`	`return -ENOMEM;`
`10207`	`10207`	`}`
`10208`	`10208`
`10209`		`- netif_carrier_off(dev);`
`10210`		`-`
`10211`	`10209`	`bp = netdev_priv(dev);`
`10212`	`10210`	`bp->msglevel = debug;`
`10213`	`10211`
`@@ -10231,6 +10229,8 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,`
`10231`	`10229`	`goto init_one_exit;`
`10232`	`10230`	`}`
`10233`	`10231`
	`10232`	`+ netif_carrier_off(dev);`
	`10233`	`+`
`10234`	`10234`	`bp->common.name = board_info[ent->driver_data].name;`
`10235`	`10235`	`printk(KERN_INFO "%s: %s (%c%d) PCI-E x%d %s found at mem %lx,"`
`10236`	`10236`	`" IRQ %d, ", dev->name, bp->common.name,`