]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
be2net: Fix error recovery paths
authorPadmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Fri, 25 Nov 2011 07:01:38 +0000 (12:31 +0530)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Thu, 8 Dec 2011 23:36:12 +0000 (15:36 -0800)
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>
drivers/net/benet/be_main.c

index d0ff0c6c189da423835fe5f50ca42f693ecb394c..4780ab2a73a5637130cf722f9768893a3b957f26 100644 (file)
@@ -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;