aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorSujith Manoharan <Sujith.Manoharan@atheros.com>2011-01-04 03:13:39 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-01-10 15:40:51 -0500
commit6d50192c17d4481c0e34c1ed2ae24fd7bc16e121 (patch)
tree712b3e8667cb3cc14ced62683378f30d338fdb82 /drivers/net/wireless
parent69bdacc8fbac32e4dc804ab13cafe3c1bbdcba9d (diff)
ath9k_hw: Fix RX handling for USB devices
Commit "ath9k_hw: Abort rx if hw is not coming out of full sleep in reset" uncondionally added aborting RX DMA in a HW reset, though it is a bit unclear as to why this is needed. Anyway, RX DMA is handled in the target for USB devices, and this would interfere with normal operations (scanning etc.), so fix this. Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 4a44f711045e..1afb8bb85756 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -1214,7 +1214,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
1214 ah->txchainmask = common->tx_chainmask; 1214 ah->txchainmask = common->tx_chainmask;
1215 ah->rxchainmask = common->rx_chainmask; 1215 ah->rxchainmask = common->rx_chainmask;
1216 1216
1217 if (!ah->chip_fullsleep) { 1217 if ((common->bus_ops->ath_bus_type != ATH_USB) && !ah->chip_fullsleep) {
1218 ath9k_hw_abortpcurecv(ah); 1218 ath9k_hw_abortpcurecv(ah);
1219 if (!ath9k_hw_stopdmarecv(ah)) { 1219 if (!ath9k_hw_stopdmarecv(ah)) {
1220 ath_dbg(common, ATH_DBG_XMIT, 1220 ath_dbg(common, ATH_DBG_XMIT,