From: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Date: Fri, 25 Nov 2011 07:01:38 +0000 (+0530)
Subject: be2net: Fix error recovery paths
X-Git-Tag: v2.6.39-400.9.0~821^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=04436b5959f3365e11575dd285a4dba3cfe72488;p=users%2Fjedix%2Flinux-maple.git

be2net: Fix error recovery paths

When TX queues are created again after error recovery,
netif_set_real_num_tx_queues() is invoked to update number of real
TX queues created. rtnl lock needs to be held when invoking this routine.

Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
---

diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index d0ff0c6c189d..4780ab2a73a5 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -1665,9 +1665,12 @@ static int be_tx_queues_create(struct be_adapter *adapter)
 	u8 i;
 
 	adapter->num_tx_qs = be_num_txqs_want(adapter);
-	if (adapter->num_tx_qs != MAX_TX_QS)
+	if (adapter->num_tx_qs != MAX_TX_QS) {
+		rtnl_lock();
 		netif_set_real_num_tx_queues(adapter->netdev,
 			adapter->num_tx_qs);
+		rtnl_unlock();
+	}
 
 	adapter->tx_eq.max_eqd = 0;
 	adapter->tx_eq.min_eqd = 0;