mac80211: use helper function to access ieee802_1d_to_ac[]

cleanup patch to make use of ieee80211_ac_from_tid() to retrieve ac from
ieee802_1d_to_ac[]

Signed-off-by: Amadeusz Sławiński <amadeusz.slawinski@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index b791c41905640e0352602c38998a9adf8f79b3ab..50ca3828b1242edb74f2835898cbe5f6d1dce975 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1391,7 +1391,7 @@ EXPORT_SYMBOL(ieee80211_sta_pspoll);
 void ieee80211_sta_uapsd_trigger(struct ieee80211_sta *pubsta, u8 tid)
 {
        struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
-       u8 ac = ieee802_1d_to_ac[tid & 7];
+       int ac = ieee80211_ac_from_tid(tid);
 
        /*
         * If this AC is not trigger-enabled do nothing unless the

diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index d6a1bfaa7a817f0511fca16262f2c132ff5432f2..a3af6e1bfd984d3548b3f48dad508028b7958bae 100644 (file)
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -95,7 +95,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
                 */
                if (*p & IEEE80211_QOS_CTL_EOSP)
                        *p &= ~IEEE80211_QOS_CTL_EOSP;
-               ac = ieee802_1d_to_ac[tid & 7];
+               ac = ieee80211_ac_from_tid(tid);
        } else {
                ac = IEEE80211_AC_BE;
        }

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 986de098803de5edaf8211014b6c1e0ebb00ce2c..ba8d7db0a07165e7b33f71caa260f352771d434a 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1414,7 +1414,7 @@ void ieee80211_txq_init(struct ieee80211_sub_if_data *sdata,
                txqi->txq.sta = &sta->sta;
                sta->sta.txq[tid] = &txqi->txq;
                txqi->txq.tid = tid;
-               txqi->txq.ac = ieee802_1d_to_ac[tid & 7];
+               txqi->txq.ac = ieee80211_ac_from_tid(tid);
        } else {
                sdata->vif.txq = &txqi->txq;
                txqi->txq.tid = 0;
@@ -4659,7 +4659,7 @@ void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata,
                                 struct sk_buff *skb, int tid,
                                 enum nl80211_band band)
 {
-       int ac = ieee802_1d_to_ac[tid & 7];
+       int ac = ieee80211_ac_from_tid(tid);
 
        skb_reset_mac_header(skb);
        skb_set_queue_mapping(skb, ac);