Commit a1f2ba04 authored by Sara Sharon's avatar Sara Sharon Committed by Johannes Berg
Browse files

mac80211: add get TID helper 



Extracting the TID from the QOS header is common enough
to justify helper.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 7299d6f7

include/linux/ieee80211.h

+12 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net>

 * Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright (c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright (c) 2018        Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -2501,6 +2502,17 @@ static inline u8 *ieee80211_get_qos_ctl(struct ieee80211_hdr *hdr) 
		return (u8 *)hdr + 24;

}



/**

 * ieee80211_get_tid - get qos TID

 * @hdr: the frame

 */

static inline u8 ieee80211_get_tid(struct ieee80211_hdr *hdr)

{

	u8 *qc = ieee80211_get_qos_ctl(hdr);



	return qc[0] & IEEE80211_QOS_CTL_TID_MASK;

}



/**

 * ieee80211_get_SA - get pointer to SA

 * @hdr: the frame

net/mac80211/iface.c

+1 −2
Original line number Diff line number Diff line
@@ -1324,8 +1324,7 @@ static void ieee80211_iface_work(struct work_struct *work) 
			mutex_lock(&local->sta_mtx);

			sta = sta_info_get_bss(sdata, mgmt->sa);

			if (sta) {

				u16 tid = *ieee80211_get_qos_ctl(hdr) &

						IEEE80211_QOS_CTL_TID_MASK;

				u16 tid = ieee80211_get_tid(hdr);



				__ieee80211_stop_rx_ba_session(

					sta, tid, WLAN_BACK_RECIPIENT,

net/mac80211/michael.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static void michael_mic_hdr(struct michael_mic_ctx *mctx, const u8 *key, 
	da = ieee80211_get_DA(hdr);

	sa = ieee80211_get_SA(hdr);

	if (ieee80211_is_data_qos(hdr->frame_control))

		tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TID_MASK;

		tid = ieee80211_get_tid(hdr);

	else

		tid = 0;

net/mac80211/mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -2151,7 +2151,7 @@ static void ieee80211_sta_tx_wmm_ac_notify(struct ieee80211_sub_if_data *sdata, 
					   u16 tx_time)

{

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	u16 tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TID_MASK;

	u16 tid = ieee80211_get_tid(hdr);

	int ac = ieee80211_ac_from_tid(tid);

	struct ieee80211_sta_tx_tspec *tx_tspec = &ifmgd->tx_tspec[ac];

	unsigned long now = jiffies;

net/mac80211/rc80211_minstrel_ht.c

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ minstrel_aggr_check(struct ieee80211_sta *pubsta, struct sk_buff *skb) 
	if (unlikely(skb->protocol == cpu_to_be16(ETH_P_PAE)))

		return;



	tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TID_MASK;

	tid = ieee80211_get_tid(hdr);

	if (likely(sta->ampdu_mlme.tid_tx[tid]))

		return;