---

yaml --- r: 218407 b: refs/heads/master c: 63a7694 h: refs/heads/master i: 218405: 30ff75b 218403: 43a81f1 218399: f41d4b6 v: v3
git-mirror · Oct 25, 2010 · f17199e · f17199e
1 parent 98f4bb1
commit f17199e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18edc84cf15cbe114dcdf7e8612ee52586d0aad7
+refs/heads/master: 63a76944b674bb758232e4213da0da95ae055012
diff --git a/trunk/drivers/net/benet/be_main.c b/trunk/drivers/net/benet/be_main.c
@@ -2556,7 +2556,6 @@ static void be_netdev_init(struct net_device *netdev)
 	netif_napi_add(netdev, &adapter->tx_eq.napi, be_poll_tx_mcc,
 		BE_NAPI_WEIGHT);
 
-	netif_carrier_off(netdev);
 	netif_stop_queue(netdev);
 }
 
@@ -2865,6 +2864,7 @@ static int __devinit be_probe(struct pci_dev *pdev,
 	status = register_netdev(netdev);
 	if (status != 0)
 		goto unsetup;
+	netif_carrier_off(netdev);
 
 	dev_info(&pdev->dev, "%s port %d\n", nic_name(pdev), adapter->port_num);
 	return 0;