ath9k: fix a small bug in the handling of a few tx descriptor flags

SVN-Revision: 23553
14 years ago · d9b732a591
parent db6aaa7bcf
commit d9b732a591
1 changed files with 25 additions and 0 deletions
--- a/package/mac80211/patches/550-ath9k_xretry_fix.patch
+++ b/package/mac80211/patches/550-ath9k_xretry_fix.patch
@ -0,0 +1,25 @@
+--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
+@@ -237,13 +237,15 @@ static int ar9002_hw_proc_txdesc(struct 
+ 	status = ACCESS_ONCE(ads->ds_txstatus1);
+ 	if (status & AR_FrmXmitOK)
+ 		ts->ts_status |= ATH9K_TX_ACKED;
+-	if (status & AR_ExcessiveRetries)
+-		ts->ts_status |= ATH9K_TXERR_XRETRY;
+-	if (status & AR_Filtered)
+-		ts->ts_status |= ATH9K_TXERR_FILT;
+-	if (status & AR_FIFOUnderrun) {
+-		ts->ts_status |= ATH9K_TXERR_FIFO;
+-		ath9k_hw_updatetxtriglevel(ah, true);
+	else {
+		if (status & AR_ExcessiveRetries)
+			ts->ts_status |= ATH9K_TXERR_XRETRY;
+		if (status & AR_Filtered)
+			ts->ts_status |= ATH9K_TXERR_FILT;
+		if (status & AR_FIFOUnderrun) {
+			ts->ts_status |= ATH9K_TXERR_FIFO;
+			ath9k_hw_updatetxtriglevel(ah, true);
+		}
+ 	}
+ 	if (status & AR_TxTimerExpired)
+ 		ts->ts_status |= ATH9K_TXERR_TIMER_EXPIRED;