aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-01-05 18:37:14 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-01-05 18:37:14 +0000
commit503cf5df8324cdc6ec84a32bf9c01905e618349e (patch)
tree3eb8090f57c404b7b0018e77b8a1604a420ff37b
parentaca9c9c81d73891a0201b02fe438021e647c25e2 (diff)
downloadupstream-503cf5df8324cdc6ec84a32bf9c01905e618349e.tar.gz
upstream-503cf5df8324cdc6ec84a32bf9c01905e618349e.tar.bz2
upstream-503cf5df8324cdc6ec84a32bf9c01905e618349e.zip
mac80211: update ath9k tx fix with changes from upstream
SVN-Revision: 19043
-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 4cc3effbf3..8965e5bba0 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