netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] mac80211: use helper function to access ieee802_1d_to_ac[]
@ 2017-01-24 15:42 Amadeusz Sławiński
  2017-01-24 15:42 ` [PATCH 2/2] mac80211: use accessor functions to set sta->_flags Amadeusz Sławiński
  2017-01-26  8:51 ` [PATCH 1/2] mac80211: use helper function to access ieee802_1d_to_ac[] Johannes Berg
  0 siblings, 2 replies; 7+ messages in thread
From: Amadeusz Sławiński @ 2017-01-24 15:42 UTC (permalink / raw)
  To: linux-wireless, Johannes Berg
  Cc: David S. Miller, netdev, linux-kernel,
	Amadeusz Sławiński

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>
---
 net/mac80211/rx.c     | 2 +-
 net/mac80211/status.c | 2 +-
 net/mac80211/tx.c     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 3e289a6..cf8ed1c 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1391,7 +1391,7 @@ void ieee80211_sta_pspoll(struct ieee80211_sta *pubsta)
 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 ddf71c6..dd48de0 100644
--- 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 0d8b716..009eb36 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1410,7 +1410,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;
@@ -4542,7 +4542,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);
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-01-29 13:52 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-24 15:42 [PATCH 1/2] mac80211: use helper function to access ieee802_1d_to_ac[] Amadeusz Sławiński
2017-01-24 15:42 ` [PATCH 2/2] mac80211: use accessor functions to set sta->_flags Amadeusz Sławiński
2017-01-24 15:44   ` Johannes Berg
2017-01-25  8:55     ` Amadeusz Slawinski
     [not found]       ` <CA+db6Z1OtO4_93KN-YoEaVg79zY5BgX2u0S+8FGVdkWav0iB2g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-01-25  9:17         ` Johannes Berg
2017-01-29 13:45   ` [mac80211] 4a6736b0fd: WARNING:at_net/mac80211/sta_info.h:#sta_info_move_state[mac80211] kernel test robot
2017-01-26  8:51 ` [PATCH 1/2] mac80211: use helper function to access ieee802_1d_to_ac[] Johannes Berg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).