aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRajkumar Manoharan <rmanohar@qca.qualcomm.com>2011-08-20 07:52:09 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-11 12:35:42 -0500
commit1ad894adcc396cb74d1ee7173d013a803c457ad8 (patch)
tree27fbb8d4930bb444f8f5536fcb4e70a227730a43
parent0ada2d28df779a5368b9ca77e1a7088bbabf68d7 (diff)
ath9k_hw: Fix descriptor status of TxOpExceeded
commit 2a15b394f8e46dd3e2ab365ab41cfa701d92fa77 upstream. Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-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 1f992497186..7880dca026c 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -255,8 +255,6 @@ static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,
255 return -EIO; 255 return -EIO;
256 } 256 }
257 257
258 if (status & AR_TxOpExceeded)
259 ts->ts_status |= ATH9K_TXERR_XTXOP;
260 ts->ts_rateindex = MS(status, AR_FinalTxIdx); 258 ts->ts_rateindex = MS(status, AR_FinalTxIdx);
261 ts->ts_seqnum = MS(status, AR_SeqNum); 259 ts->ts_seqnum = MS(status, AR_SeqNum);
262 ts->tid = MS(status, AR_TxTid); 260 ts->tid = MS(status, AR_TxTid);
@@ -267,6 +265,8 @@ static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,
267 ts->ts_status = 0; 265 ts->ts_status = 0;
268 ts->ts_flags = 0; 266 ts->ts_flags = 0;
269 267
268 if (status & AR_TxOpExceeded)
269 ts->ts_status |= ATH9K_TXERR_XTXOP;
270 status = ACCESS_ONCE(ads->status2); 270 status = ACCESS_ONCE(ads->status2);
271 ts->ts_rssi_ctl0 = MS(status, AR_TxRSSIAnt00); 271 ts->ts_rssi_ctl0 = MS(status, AR_TxRSSIAnt00);
272 ts->ts_rssi_ctl1 = MS(status, AR_TxRSSIAnt01); 272 ts->ts_rssi_ctl1 = MS(status, AR_TxRSSIAnt01);