mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 22:06:31 +02:00
mac80211: update ath9k tx fix with changes from upstream
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19043 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
2b370d2309
commit
c09034e99c
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user