diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-06-02 10:38:32 +0200 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-07-15 10:00:23 +0100 |
| commit | 3d90c7086f42ebef947950da08e3cb60ce8266e3 (patch) | |
| tree | 741244b496587fe6456615ddb08c17b65569cfa5 /drivers/net | |
| parent | 544c8dd4f9f41c8e3026e74271225bb7ef0169fc (diff) | |
| download | linux-stable-3d90c7086f42ebef947950da08e3cb60ce8266e3.tar.gz linux-stable-3d90c7086f42ebef947950da08e3cb60ce8266e3.tar.bz2 linux-stable-3d90c7086f42ebef947950da08e3cb60ce8266e3.zip | |
ath9k: fix DMA stop sequence for AR9003+
commit 300f77c08ded96d33f492aaa02549103852f0c12 upstream.
AR93xx and newer needs to stop rx before tx to avoid getting the DMA
engine or MAC into a stuck state.
This should reduce/fix the occurence of "Failed to stop Tx DMA" logspam.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 62ac95d6bb9d..bf6efbc2c9c0 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -205,11 +205,13 @@ static bool ath_prepare_reset(struct ath_softc *sc) ath_stop_ani(sc); ath9k_hw_disable_interrupts(ah); - if (!ath_drain_all_txq(sc)) - ret = false; - - if (!ath_stoprecv(sc)) - ret = false; + if (AR_SREV_9300_20_OR_LATER(ah)) { + ret &= ath_stoprecv(sc); + ret &= ath_drain_all_txq(sc); + } else { + ret &= ath_drain_all_txq(sc); + ret &= ath_stoprecv(sc); + } return ret; } |