From 68830d8f0c360b00a4f5e558d075c32e7137d5f9 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 11 Jul 2010 12:48:43 +0200 Subject: [PATCH] --- yaml --- r: 203559 b: refs/heads/master c: e5cbef96cf8bf9967605a1b75b115f4b7efa7bc4 h: refs/heads/master i: 203557: 9570b2623c28bdb48497fc21eb3d10d37cf90fd5 203555: 0d8690e86d8256d6464f442fd3c16f48541ad3b2 203551: 37e956e89300122e6dc7fdebd874e6ffc91b4f0c v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/ar9002_mac.c | 1 + trunk/drivers/net/wireless/ath/ath9k/ar9003_mac.h | 3 --- trunk/drivers/net/wireless/ath/ath9k/mac.h | 3 +++ 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6c2f12d6fcf5..5fc7092a16fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cc2f3e881dcda5466c55ffe8dd0a9d1433469cb +refs/heads/master: e5cbef96cf8bf9967605a1b75b115f4b7efa7bc4 diff --git a/trunk/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/trunk/drivers/net/wireless/ath/ath9k/ar9002_mac.c index 2be20d2070c4..50dda394f8be 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/ar9002_mac.c +++ b/trunk/drivers/net/wireless/ath/ath9k/ar9002_mac.c @@ -287,6 +287,7 @@ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds, ts->ts_shortretry = MS(ads->ds_txstatus1, AR_RTSFailCnt); ts->ts_longretry = MS(ads->ds_txstatus1, AR_DataFailCnt); ts->ts_virtcol = MS(ads->ds_txstatus1, AR_VirtRetryCnt); + ts->tid = MS(ads->ds_txstatus9, AR_TxTid); ts->ts_antenna = 0; return 0; diff --git a/trunk/drivers/net/wireless/ath/ath9k/ar9003_mac.h b/trunk/drivers/net/wireless/ath/ath9k/ar9003_mac.h index f76f27d16f77..9f2cea70a840 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/ar9003_mac.h +++ b/trunk/drivers/net/wireless/ath/ath9k/ar9003_mac.h @@ -33,9 +33,6 @@ #define AR_TxDescId_S 16 #define AR_TxPtrChkSum 0x0000ffff -#define AR_TxTid 0xf0000000 -#define AR_TxTid_S 28 - #define AR_LowRxChain 0x00004000 #define AR_Not_Sounding 0x20000000 diff --git a/trunk/drivers/net/wireless/ath/ath9k/mac.h b/trunk/drivers/net/wireless/ath/ath9k/mac.h index 7559fb2b28a5..2633896d3998 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/mac.h +++ b/trunk/drivers/net/wireless/ath/ath9k/mac.h @@ -485,6 +485,9 @@ struct ar5416_desc { #define AR_TxRSSICombined 0xff000000 #define AR_TxRSSICombined_S 24 +#define AR_TxTid 0xf0000000 +#define AR_TxTid_S 28 + #define AR_TxEVM0 ds_txstatus5 #define AR_TxEVM1 ds_txstatus6 #define AR_TxEVM2 ds_txstatus7