| From 2a15b394f8e46dd3e2ab365ab41cfa701d92fa77 Mon Sep 17 00:00:00 2001 |
| From: Rajkumar Manoharan <rmanohar@qca.qualcomm.com> |
| Date: Sat, 20 Aug 2011 17:22:09 +0530 |
| Subject: ath9k_hw: Fix descriptor status of TxOpExceeded |
| |
| From: Rajkumar Manoharan <rmanohar@qca.qualcomm.com> |
| |
| 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> |
| |
| --- |
| drivers/net/wireless/ath/ath9k/ar9003_mac.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- 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 |
| return -EIO; |
| } |
| |
| - if (status & AR_TxOpExceeded) |
| - ts->ts_status |= ATH9K_TXERR_XTXOP; |
| ts->ts_rateindex = MS(status, AR_FinalTxIdx); |
| ts->ts_seqnum = MS(status, AR_SeqNum); |
| ts->tid = MS(status, AR_TxTid); |
| @@ -264,6 +262,8 @@ static int ar9003_hw_proc_txdesc(struct |
| ts->ts_status = 0; |
| ts->ts_flags = 0; |
| |
| + if (status & AR_TxOpExceeded) |
| + ts->ts_status |= ATH9K_TXERR_XTXOP; |
| status = ACCESS_ONCE(ads->status2); |
| ts->ts_rssi_ctl0 = MS(status, AR_TxRSSIAnt00); |
| ts->ts_rssi_ctl1 = MS(status, AR_TxRSSIAnt01); |
