mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

mac80211: update ath9k tx fix with changes from upstream

Browse Source 
SVN-Revision: 19043
This commit is contained in:
Felix Fietkau 2010-01-05 18:37:14 +00:00
parent aca9c9c81d
commit 503cf5df83
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/mac80211/patches/540-ath9k_tx_fix.patch
View File

@ -5,7 +5,19 @@
txq->axq_depth--; txq->axq_depth--;
- txok = (ds->ds_txstat.ts_status == 0); - 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; txq->axq_tx_inprogress = false;
spin_unlock_bh(&txq->axq_lock); 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