diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-15 13:43:21 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-15 13:43:21 +0100 |
commit | 4ed4d44eb2192604716226a6f0edad02ab76101f (patch) | |
tree | 74c2a4041e46b906d89c5880b9cdeb5d768827c4 /drivers/net/ethernet/emulex/benet/be_main.c | |
parent | cb03293a043ab9bda850fe143062bd304a9e2376 (diff) | |
parent | 410dbb746130bc052bb3c7a337a86252874adbdf (diff) |
Merge tag 'v3.10.12' into linux-linaro-lsklsk-13.09
This is the 3.10.12 stable release
Diffstat (limited to 'drivers/net/ethernet/emulex/benet/be_main.c')
-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 6e4342695fa7..7371626c56a1 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -2561,8 +2561,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); |