projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
71339c0
)
mac80211: update ath9k tx fix with changes from upstream
author
Felix Fietkau
<nbd@openwrt.org>
Tue, 5 Jan 2010 18:37:14 +0000
(18:37 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Tue, 5 Jan 2010 18:37:14 +0000
(18:37 +0000)
SVN-Revision: 19043
package/mac80211/patches/540-ath9k_tx_fix.patch
patch
|
blob
|
history
diff --git
a/package/mac80211/patches/540-ath9k_tx_fix.patch
b/package/mac80211/patches/540-ath9k_tx_fix.patch
index 4cc3effbf30e5c7f5deea7a2d3a1c6b048863344..8965e5bba020e42e6c3213a0289e8b04fa20ec26 100644
(file)
--- 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);
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);
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