diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-30 14:04:14 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-30 14:04:14 +0400 |
| commit | c79c33af8f867e57ad4b84102db7901aee67485a (patch) | |
| tree | aa619736b89a143cfc48f9647493c929523a928a /drivers/net/ethernet/emulex/benet/be_main.c | |
| parent | 1c9a341bbdc14051a4d8c74ea67269786c7d3736 (diff) | |
| parent | 824ef826f3c4d83d1925a5e351313bfd3e5ca6cb (diff) | |
| download | linux-c79c33af8f867e57ad4b84102db7901aee67485a.tar.xz | |
Merge remote-tracking branch 'asoc/topic/core' into tmp
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 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); |