aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-02-27 13:58:40 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-03-05 15:20:47 -0500
commit4286df60edfe19d3407fa112bf4bdfeeadda897c (patch)
tree085655bc442974aa8dc02930d056e12315afd44f /drivers/net/wireless/ath/ath9k
parentd6157bf78015e53371e806e0f8fd44ef6a1bfc5d (diff)
ath9k: do not call ath9k_hw_txprocdesc on AR9003 outside of the tx tasklet
Since AR9003 uses a global tx status queue, processing tx status outside of the regular tx tasklet is dangerous and messes up hardware/software synchronization of tx status events. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k')
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 02e95c8e746..cc2535c38be 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -2300,6 +2300,7 @@ static int ath9k_tx_last_beacon(struct ieee80211_hw *hw)
2300 struct ath_vif *avp; 2300 struct ath_vif *avp;
2301 struct ath_buf *bf; 2301 struct ath_buf *bf;
2302 struct ath_tx_status ts; 2302 struct ath_tx_status ts;
2303 bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA);
2303 int status; 2304 int status;
2304 2305
2305 vif = sc->beacon.bslot[0]; 2306 vif = sc->beacon.bslot[0];
@@ -2310,7 +2311,7 @@ static int ath9k_tx_last_beacon(struct ieee80211_hw *hw)
2310 if (!avp->is_bslot_active) 2311 if (!avp->is_bslot_active)
2311 return 0; 2312 return 0;
2312 2313
2313 if (!sc->beacon.tx_processed) { 2314 if (!sc->beacon.tx_processed && !edma) {
2314 tasklet_disable(&sc->bcon_tasklet); 2315 tasklet_disable(&sc->bcon_tasklet);
2315 2316
2316 bf = avp->av_bcbuf; 2317 bf = avp->av_bcbuf;