Commit 08dbff23 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: skip EHT BSS membership selector 



Skip the EHT BSS membership selector for getting rates.
While at it, add the definitions for GLK and EPS, and
sort the list.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230504134511.828474-9-gregory.greenman@intel.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 2d22be01

include/linux/ieee80211.h

+4 −1
Original line number Diff line number Diff line
@@ -1349,8 +1349,11 @@ struct ieee80211_mgmt { 
/* Supported rates membership selectors */

#define BSS_MEMBERSHIP_SELECTOR_HT_PHY	127

#define BSS_MEMBERSHIP_SELECTOR_VHT_PHY	126

#define BSS_MEMBERSHIP_SELECTOR_HE_PHY	122

#define BSS_MEMBERSHIP_SELECTOR_GLK	125

#define BSS_MEMBERSHIP_SELECTOR_EPS	124

#define BSS_MEMBERSHIP_SELECTOR_SAE_H2E 123

#define BSS_MEMBERSHIP_SELECTOR_HE_PHY	122

#define BSS_MEMBERSHIP_SELECTOR_EHT_PHY	121



/* mgmt header + 1 byte category code */

#define IEEE80211_MIN_ACTION_SIZE offsetof(struct ieee80211_mgmt, u.action.u)

net/mac80211/mlme.c

+3 −2
Original line number Diff line number Diff line
@@ -3902,8 +3902,8 @@ static void ieee80211_get_rates(struct ieee80211_supported_band *sband, 
			*have_higher_than_11mbit = true;



		/*

		 * Skip HT, VHT, HE and SAE H2E only BSS membership selectors

		 * since they're not rates.

		 * Skip HT, VHT, HE, EHT and SAE H2E only BSS membership

		 * selectors since they're not rates.

		 *

		 * Note: Even though the membership selector and the basic

		 *	 rate flag share the same bit, they are not exactly
@@ -3912,6 +3912,7 @@ static void ieee80211_get_rates(struct ieee80211_supported_band *sband, 
		if (supp_rates[i] == (0x80 | BSS_MEMBERSHIP_SELECTOR_HT_PHY) ||

		    supp_rates[i] == (0x80 | BSS_MEMBERSHIP_SELECTOR_VHT_PHY) ||

		    supp_rates[i] == (0x80 | BSS_MEMBERSHIP_SELECTOR_HE_PHY) ||

		    supp_rates[i] == (0x80 | BSS_MEMBERSHIP_SELECTOR_EHT_PHY) ||

		    supp_rates[i] == (0x80 | BSS_MEMBERSHIP_SELECTOR_SAE_H2E))

			continue;