diff options
author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2012-11-28 04:38:53 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-11-30 13:38:15 -0500 |
commit | de7b7604eae91f00cd587f8541eec11a7fc505aa (patch) | |
tree | a3a2d4455d7cbf504fbe2c1a7d59e5644ad549e1 /drivers/net | |
parent | c175db87411f0e79924a48563d5f595b9a352907 (diff) |
ath9k: Replace WME_NUM_TID with IEEE80211_NUM_TIDS
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/common.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 8 |
3 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index 80bab1b8447a..60bf784e5573 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
@@ -261,7 +261,7 @@ struct ath_atx_tid { | |||
261 | struct ath_node { | 261 | struct ath_node { |
262 | struct ieee80211_sta *sta; /* station struct we're part of */ | 262 | struct ieee80211_sta *sta; /* station struct we're part of */ |
263 | struct ieee80211_vif *vif; /* interface with which we're associated */ | 263 | struct ieee80211_vif *vif; /* interface with which we're associated */ |
264 | struct ath_atx_tid tid[WME_NUM_TID]; | 264 | struct ath_atx_tid tid[IEEE80211_NUM_TIDS]; |
265 | struct ath_atx_ac ac[IEEE80211_NUM_ACS]; | 265 | struct ath_atx_ac ac[IEEE80211_NUM_ACS]; |
266 | int ps_key; | 266 | int ps_key; |
267 | 267 | ||
diff --git a/drivers/net/wireless/ath/ath9k/common.h b/drivers/net/wireless/ath/ath9k/common.h index 76b543900314..5f845beeb18b 100644 --- a/drivers/net/wireless/ath/ath9k/common.h +++ b/drivers/net/wireless/ath/ath9k/common.h | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | /* Common header for Atheros 802.11n base driver cores */ | 24 | /* Common header for Atheros 802.11n base driver cores */ |
25 | 25 | ||
26 | #define WME_NUM_TID 16 | ||
27 | #define WME_BA_BMP_SIZE 64 | 26 | #define WME_BA_BMP_SIZE 64 |
28 | #define WME_MAX_BA WME_BA_BMP_SIZE | 27 | #define WME_MAX_BA WME_BA_BMP_SIZE |
29 | #define ATH_TID_MAX_BUFS (2 * WME_MAX_BA) | 28 | #define ATH_TID_MAX_BUFS (2 * WME_MAX_BA) |
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 34130943f9de..a0a3063dae7b 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c | |||
@@ -1263,7 +1263,7 @@ void ath_tx_aggr_sleep(struct ieee80211_sta *sta, struct ath_softc *sc, | |||
1263 | int tidno; | 1263 | int tidno; |
1264 | 1264 | ||
1265 | for (tidno = 0, tid = &an->tid[tidno]; | 1265 | for (tidno = 0, tid = &an->tid[tidno]; |
1266 | tidno < WME_NUM_TID; tidno++, tid++) { | 1266 | tidno < IEEE80211_NUM_TIDS; tidno++, tid++) { |
1267 | 1267 | ||
1268 | if (!tid->sched) | 1268 | if (!tid->sched) |
1269 | continue; | 1269 | continue; |
@@ -1297,7 +1297,7 @@ void ath_tx_aggr_wakeup(struct ath_softc *sc, struct ath_node *an) | |||
1297 | int tidno; | 1297 | int tidno; |
1298 | 1298 | ||
1299 | for (tidno = 0, tid = &an->tid[tidno]; | 1299 | for (tidno = 0, tid = &an->tid[tidno]; |
1300 | tidno < WME_NUM_TID; tidno++, tid++) { | 1300 | tidno < IEEE80211_NUM_TIDS; tidno++, tid++) { |
1301 | 1301 | ||
1302 | ac = tid->ac; | 1302 | ac = tid->ac; |
1303 | txq = ac->txq; | 1303 | txq = ac->txq; |
@@ -2448,7 +2448,7 @@ void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an) | |||
2448 | int tidno, acno; | 2448 | int tidno, acno; |
2449 | 2449 | ||
2450 | for (tidno = 0, tid = &an->tid[tidno]; | 2450 | for (tidno = 0, tid = &an->tid[tidno]; |
2451 | tidno < WME_NUM_TID; | 2451 | tidno < IEEE80211_NUM_TIDS; |
2452 | tidno++, tid++) { | 2452 | tidno++, tid++) { |
2453 | tid->an = an; | 2453 | tid->an = an; |
2454 | tid->tidno = tidno; | 2454 | tid->tidno = tidno; |
@@ -2481,7 +2481,7 @@ void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an) | |||
2481 | int tidno; | 2481 | int tidno; |
2482 | 2482 | ||
2483 | for (tidno = 0, tid = &an->tid[tidno]; | 2483 | for (tidno = 0, tid = &an->tid[tidno]; |
2484 | tidno < WME_NUM_TID; tidno++, tid++) { | 2484 | tidno < IEEE80211_NUM_TIDS; tidno++, tid++) { |
2485 | 2485 | ||
2486 | ac = tid->ac; | 2486 | ac = tid->ac; |
2487 | txq = ac->txq; | 2487 | txq = ac->txq; |