aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath
diff options
context:
space:
mode:
authorRajkumar Manoharan <rmanohar@qca.qualcomm.com>2011-08-20 07:52:09 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-24 14:57:15 -0400
commit2a15b394f8e46dd3e2ab365ab41cfa701d92fa77 (patch)
tree7b19e84dab69a0c5681c131c319671e3fdacc6a2 /drivers/net/wireless/ath
parent52c94f413fdf5011b7e54ae68e0a2cfcb1b311df (diff)
ath9k_hw: Fix descriptor status of TxOpExceeded
Cc: stable@kernel.org Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r--drivers/net/wireless/ath/ath9k/ar9003_mac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
index 81ccce1faff5..8ace36e77399 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -253,8 +253,6 @@ static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,
253 return -EIO; 253 return -EIO;
254 } 254 }
255 255
256 if (status & AR_TxOpExceeded)
257 ts->ts_status |= ATH9K_TXERR_XTXOP;
258 ts->ts_rateindex = MS(status, AR_FinalTxIdx); 256 ts->ts_rateindex = MS(status, AR_FinalTxIdx);
259 ts->ts_seqnum = MS(status, AR_SeqNum); 257 ts->ts_seqnum = MS(status, AR_SeqNum);
260 ts->tid = MS(status, AR_TxTid); 258 ts->tid = MS(status, AR_TxTid);
@@ -264,6 +262,8 @@ static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,
264 ts->ts_status = 0; 262 ts->ts_status = 0;
265 ts->ts_flags = 0; 263 ts->ts_flags = 0;
266 264
265 if (status & AR_TxOpExceeded)
266 ts->ts_status |= ATH9K_TXERR_XTXOP;
267 status = ACCESS_ONCE(ads->status2); 267 status = ACCESS_ONCE(ads->status2);
268 ts->ts_rssi_ctl0 = MS(status, AR_TxRSSIAnt00); 268 ts->ts_rssi_ctl0 = MS(status, AR_TxRSSIAnt00);
269 ts->ts_rssi_ctl1 = MS(status, AR_TxRSSIAnt01); 269 ts->ts_rssi_ctl1 = MS(status, AR_TxRSSIAnt01);