diff options
| author | Sathya Perla <sathya.perla@emulex.com> | 2013-08-22 12:23:41 +0530 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-22 19:58:23 -0700 |
| commit | 6e1f99757a2b24b7255263b2240a0eb04215174d (patch) | |
| tree | c733ab9b6ab44ab96d6f3b30567ca3aeb7ae5cb1 | |
| parent | 2266c68f3641df533f617426a9cac0e5fb443f69 (diff) | |
| download | blackbird-op-linux-6e1f99757a2b24b7255263b2240a0eb04215174d.tar.gz blackbird-op-linux-6e1f99757a2b24b7255263b2240a0eb04215174d.zip | |
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>
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 181edb522450..4559c35eea13 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -2563,8 +2563,8 @@ static int be_close(struct net_device *netdev) /* Wait for all pending tx completions to arrive so that * all tx skbs are freed. */ - be_tx_compl_clean(adapter); netif_tx_disable(netdev); + be_tx_compl_clean(adapter); be_rx_qs_destroy(adapter); |
