From f17199e480a7e5c59be0f7186452be6c5a313d74 Mon Sep 17 00:00:00 2001
From: Somnath Kotur <somnath.kotur@emulex.com>
Date: Mon, 25 Oct 2010 01:11:10 +0000
Subject: [PATCH] --- yaml --- r: 218407 b: refs/heads/master c:
 63a76944b674bb758232e4213da0da95ae055012 h: refs/heads/master i:   218405:
 30ff75b6dd98e718a15d920586f6d2b12df43eea   218403:
 43a81f144daff1255604f7d018caf9b46ba54d2f   218399:
 f41d4b6659b35615ada327489c8f3a9e560c2749 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/benet/be_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bb1601d5651a..a64da023fa0f 100644
--- 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
index 12486260c928..87673558cde5 100644
--- 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;