diff options
| author | Rajkumar Manoharan <rmanohar@qca.qualcomm.com> | 2011-08-20 17:22:09 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:35:42 -0800 |
| commit | 1ad894adcc396cb74d1ee7173d013a803c457ad8 (patch) | |
| tree | 27fbb8d4930bb444f8f5536fcb4e70a227730a43 /drivers/net/wireless/ath | |
| parent | 0ada2d28df779a5368b9ca77e1a7088bbabf68d7 (diff) | |
| download | kernel_samsung_smdk4412-1ad894adcc396cb74d1ee7173d013a803c457ad8.zip kernel_samsung_smdk4412-1ad894adcc396cb74d1ee7173d013a803c457ad8.tar.gz kernel_samsung_smdk4412-1ad894adcc396cb74d1ee7173d013a803c457ad8.tar.bz2 | |
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>
Diffstat (limited to 'drivers/net/wireless/ath')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_mac.c | 4 |
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 1f99249..7880dca 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, 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); @@ -267,6 +265,8 @@ static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds, 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); |