summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-11-20 03:08:47 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-09 13:33:16 -0800
commit533549f1c91890db9f1b30eaa87288cbb8ff35bc (patch)
treef391441ab2020db026ed488fe9413da6208cbe85 /drivers
parent8dac975b179793bd7e10c5ffc3e8e9358b825980 (diff)
downloadlinux-3.10-533549f1c91890db9f1b30eaa87288cbb8ff35bc.tar.gz
linux-3.10-533549f1c91890db9f1b30eaa87288cbb8ff35bc.tar.bz2
linux-3.10-533549f1c91890db9f1b30eaa87288cbb8ff35bc.zip
ath9k: fix timeout on stopping rx dma
commit d47844a014fada1a788719f6426bc7044f2a0fd8 upstream. It seems that using ath9k_hw_stoppcurecv to stop rx dma is not enough. When it's time to stop DMA, the PCU is still busy, so the rx enable bit never clears. Using ath9k_hw_abortpcurecv helps with getting rx stopped much faster, with this change, I cannot reproduce the rx stop related WARN_ON anymore. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath9k/recv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index b4ca0b69de0..41ebd623a7a 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -508,7 +508,7 @@ bool ath_stoprecv(struct ath_softc *sc)
bool stopped;
spin_lock_bh(&sc->rx.rxbuflock);
- ath9k_hw_stoppcurecv(ah);
+ ath9k_hw_abortpcurecv(ah);
ath9k_hw_setrxfilter(ah, 0);
stopped = ath9k_hw_stopdmarecv(ah);