Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6e1f99757a2b24b7255263b2240a0eb04215174d

Authored by Sathya Perla
Committed by David S. Miller
1 parent 2266c68f36
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

be2net: fix disabling TX in be_close() 

commit fba875591 ("disable TX in be_close()") disabled TX in be_close()
to protect be_xmit() from touching freed up queues in the AER recovery
flow.  But, TX must be disabled *before* cleaning up TX completions in
the close() path, not after. This allows be_tx_compl_clean() to free up
all TX-req skbs that were notified to the HW.

Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/net/ethernet/emulex/benet/be_main.c
Diff comments   View file @ 6e1f997
... ... @@ -2563,8 +2563,8 @@
2563 2563 /* Wait for all pending tx completions to arrive so that
2564 2564 * all tx skbs are freed.
2565 2565 */
2566   - be_tx_compl_clean(adapter);
2567 2566 netif_tx_disable(netdev);
  2567 + be_tx_compl_clean(adapter);
2568 2568  
2569 2569 be_rx_qs_destroy(adapter);
2570 2570