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>

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 80bab1b..60bf784 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -261,7 +261,7 @@ struct ath_atx_tid {
 struct ath_node {
        struct ieee80211_sta *sta; /* station struct we're part of */
        struct ieee80211_vif *vif; /* interface with which we're associated */
-       struct ath_atx_tid tid[WME_NUM_TID];
+       struct ath_atx_tid tid[IEEE80211_NUM_TIDS];
        struct ath_atx_ac ac[IEEE80211_NUM_ACS];
        int ps_key;
 

diff --git a/drivers/net/wireless/ath/ath9k/common.h b/drivers/net/wireless/ath/ath9k/common.h
index 76b5439..5f845be 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/common.h
+++ b/drivers/net/wireless/ath/ath9k/common.h
@@ -23,7 +23,6 @@
 
 /* Common header for Atheros 802.11n base driver cores */
 
-#define WME_NUM_TID             16
 #define WME_BA_BMP_SIZE         64
 #define WME_MAX_BA              WME_BA_BMP_SIZE
 #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 3413094..a0a3063 100644 (file)
--- 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,
        int tidno;
 
        for (tidno = 0, tid = &an->tid[tidno];
-            tidno < WME_NUM_TID; tidno++, tid++) {
+            tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {
 
                if (!tid->sched)
                        continue;
@@ -1297,7 +1297,7 @@ void ath_tx_aggr_wakeup(struct ath_softc *sc, struct ath_node *an)
        int tidno;
 
        for (tidno = 0, tid = &an->tid[tidno];
-            tidno < WME_NUM_TID; tidno++, tid++) {
+            tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {
 
                ac = tid->ac;
                txq = ac->txq;
@@ -2448,7 +2448,7 @@ void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an)
        int tidno, acno;
 
        for (tidno = 0, tid = &an->tid[tidno];
-            tidno < WME_NUM_TID;
+            tidno < IEEE80211_NUM_TIDS;
             tidno++, tid++) {
                tid->an        = an;
                tid->tidno     = tidno;
@@ -2481,7 +2481,7 @@ void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an)
        int tidno;
 
        for (tidno = 0, tid = &an->tid[tidno];
-            tidno < WME_NUM_TID; tidno++, tid++) {
+            tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {
 
                ac = tid->ac;
                txq = ac->txq;