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>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index c6fb7c3f961ae57cd524b7c6b0c839d6bc017fe1..a1b8ebc6c5f2f5c6e25096b636188ba9ec61ec64 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -1666,9 +1666,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;