diff options
author | Felix Fietkau <nbd@openwrt.org> | 2010-07-11 06:48:43 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-07-12 16:05:38 -0400 |
commit | e5cbef96cf8bf9967605a1b75b115f4b7efa7bc4 (patch) | |
tree | 127179637f125158d2a3c801293854cc761fa6fd | |
parent | 9cc2f3e881dcda5466c55ffe8dd0a9d1433469cb (diff) |
ath9k_hw: report the TID in the tx status on AR5008-AR9002
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9002_mac.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_mac.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c index 2be20d2070c4..50dda394f8be 100644 --- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c +++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c | |||
@@ -287,6 +287,7 @@ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds, | |||
287 | ts->ts_shortretry = MS(ads->ds_txstatus1, AR_RTSFailCnt); | 287 | ts->ts_shortretry = MS(ads->ds_txstatus1, AR_RTSFailCnt); |
288 | ts->ts_longretry = MS(ads->ds_txstatus1, AR_DataFailCnt); | 288 | ts->ts_longretry = MS(ads->ds_txstatus1, AR_DataFailCnt); |
289 | ts->ts_virtcol = MS(ads->ds_txstatus1, AR_VirtRetryCnt); | 289 | ts->ts_virtcol = MS(ads->ds_txstatus1, AR_VirtRetryCnt); |
290 | ts->tid = MS(ads->ds_txstatus9, AR_TxTid); | ||
290 | ts->ts_antenna = 0; | 291 | ts->ts_antenna = 0; |
291 | 292 | ||
292 | return 0; | 293 | return 0; |
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.h b/drivers/net/wireless/ath/ath9k/ar9003_mac.h index f76f27d16f77..9f2cea70a840 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.h +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.h | |||
@@ -33,9 +33,6 @@ | |||
33 | #define AR_TxDescId_S 16 | 33 | #define AR_TxDescId_S 16 |
34 | #define AR_TxPtrChkSum 0x0000ffff | 34 | #define AR_TxPtrChkSum 0x0000ffff |
35 | 35 | ||
36 | #define AR_TxTid 0xf0000000 | ||
37 | #define AR_TxTid_S 28 | ||
38 | |||
39 | #define AR_LowRxChain 0x00004000 | 36 | #define AR_LowRxChain 0x00004000 |
40 | 37 | ||
41 | #define AR_Not_Sounding 0x20000000 | 38 | #define AR_Not_Sounding 0x20000000 |
diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h index 7559fb2b28a5..2633896d3998 100644 --- a/drivers/net/wireless/ath/ath9k/mac.h +++ b/drivers/net/wireless/ath/ath9k/mac.h | |||
@@ -485,6 +485,9 @@ struct ar5416_desc { | |||
485 | #define AR_TxRSSICombined 0xff000000 | 485 | #define AR_TxRSSICombined 0xff000000 |
486 | #define AR_TxRSSICombined_S 24 | 486 | #define AR_TxRSSICombined_S 24 |
487 | 487 | ||
488 | #define AR_TxTid 0xf0000000 | ||
489 | #define AR_TxTid_S 28 | ||
490 | |||
488 | #define AR_TxEVM0 ds_txstatus5 | 491 | #define AR_TxEVM0 ds_txstatus5 |
489 | #define AR_TxEVM1 ds_txstatus6 | 492 | #define AR_TxEVM1 ds_txstatus6 |
490 | #define AR_TxEVM2 ds_txstatus7 | 493 | #define AR_TxEVM2 ds_txstatus7 |