summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-05 18:37:14 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-05 18:37:14 +0000
commitc09034e99ce739f0f3d5746f70fbcfa1efffb029 (patch)
treee7b9f4027b8f056898ec7050245e20ed7824cc46 /package/mac80211/patches
parent2b370d2309b46d766764800a3a943de4e8ba10e3 (diff)
mac80211: update ath9k tx fix with changes from upstream
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19043 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches')
-rw-r--r--package/mac80211/patches/540-ath9k_tx_fix.patch14
1 files changed, 13 insertions, 1 deletions
diff --git a/package/mac80211/patches/540-ath9k_tx_fix.patch b/package/mac80211/patches/540-ath9k_tx_fix.patch
index 4cc3effbf..8965e5bba 100644
--- a/package/mac80211/patches/540-ath9k_tx_fix.patch
+++ b/package/mac80211/patches/540-ath9k_tx_fix.patch
@@ -5,7 +5,19 @@
txq->axq_depth--;
- txok = (ds->ds_txstat.ts_status == 0);
-+ txok = !(ds->ds_txstat.ts_status & ATH9K_TXERR_FILT);
++ txok = !(ds->ds_txstat.ts_status & ATH9K_TXERR_MASK);
txq->axq_tx_inprogress = false;
spin_unlock_bh(&txq->axq_lock);
+--- a/drivers/net/wireless/ath/ath9k/mac.h
++++ b/drivers/net/wireless/ath/ath9k/mac.h
+@@ -77,6 +77,9 @@
+ #define ATH9K_TXERR_XTXOP 0x08
+ #define ATH9K_TXERR_TIMER_EXPIRED 0x10
+ #define ATH9K_TX_ACKED 0x20
++#define ATH9K_TXERR_MASK \
++ (ATH9K_TXERR_XRETRY | ATH9K_TXERR_FILT | ATH9K_TXERR_FIFO | \
++ ATH9K_TXERR_XTXOP | ATH9K_TXERR_TIMER_EXPIRED)
+
+ #define ATH9K_TX_BA 0x01
+ #define ATH9K_TX_PWRMGMT 0x02