Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 731977e9 authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Johannes Berg
Browse files

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: default avatarAmadeusz Sławiński <amadeusz.slawinski@tieto.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 42f82e2e

net/mac80211/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -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

net/mac80211/status.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

net/mac80211/tx.c

+2 −2
Original line number Diff line number Diff line
@@ -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);