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

Commit f438ceb8 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

mac80211: uapsd_queues is in QoS IE order 



The uapsd_queue field is in QoS IE order and not in
IEEE80211_AC_*'s order.
This means that mac80211 would get confused between
BK and BE which is certainly not such a big deal but
needs to be fixed.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f3fe4e93

include/net/cfg80211.h

+2 −1
Original line number Diff line number Diff line
@@ -4574,7 +4574,8 @@ void cfg80211_auth_timeout(struct net_device *dev, const u8 *addr); 
 *	moves to cfg80211 in this call

 * @buf: authentication frame (header + body)

 * @len: length of the frame data

 * @uapsd_queues: bitmap of ACs configured to uapsd. -1 if n/a.

 * @uapsd_queues: bitmap of queues configured for uapsd. Same format

 *	as the AC bitmap in the QoS info field

 *

 * After being asked to associate via cfg80211_ops::assoc() the driver must

 * call either this function or cfg80211_auth_timeout().

include/net/mac80211.h

+2 −1
Original line number Diff line number Diff line
@@ -1745,7 +1745,8 @@ struct ieee80211_sta_rates { 
 * @drv_priv: data area for driver use, will always be aligned to

 *	sizeof(void *), size is determined in hw information.

 * @uapsd_queues: bitmap of queues configured for uapsd. Only valid

 *	if wme is supported.

 *	if wme is supported. The bits order is like in

 *	IEEE80211_WMM_IE_STA_QOSINFO_AC_*.

 * @max_sp: max Service Period. Only valid if wme is supported.

 * @bandwidth: current bandwidth the station can receive with

 * @rx_nss: in HT/VHT, the maximum number of spatial streams the

net/mac80211/ieee80211_i.h

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ struct ieee80211_local; 
#define IEEE80211_DEFAULT_MAX_SP_LEN		\

	IEEE80211_WMM_IE_STA_QOSINFO_SP_ALL



extern const u8 ieee80211_ac_to_qos_mask[IEEE80211_NUM_ACS];



#define IEEE80211_DEAUTH_FRAME_LEN	(24 /* hdr */ + 2 /* reason */)



#define IEEE80211_MAX_NAN_INSTANCE_ID 255

net/mac80211/mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -3193,7 +3193,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, 
		uapsd_queues = 0;

		for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)

			if (sdata->tx_conf[ac].uapsd)

				uapsd_queues |= BIT(ac);

				uapsd_queues |= ieee80211_ac_to_qos_mask[ac];

	}



	cfg80211_rx_assoc_resp(sdata->dev, bss, (u8 *)mgmt, len, uapsd_queues);

net/mac80211/rx.c

+2 −1
Original line number Diff line number Diff line
@@ -1401,7 +1401,8 @@ void ieee80211_sta_uapsd_trigger(struct ieee80211_sta *pubsta, u8 tid) 
	 * enabled queues, but for now we only implement uAPSD w/o

	 * TSPEC changes to the ACs, so they're always the same.

	 */

	if (!(sta->sta.uapsd_queues & BIT(ac)) && tid != IEEE80211_NUM_TIDS)

	if (!(sta->sta.uapsd_queues & ieee80211_ac_to_qos_mask[ac]) &&

	    tid != IEEE80211_NUM_TIDS)

		return;



	/* if we are in a service period, do nothing */