Commit d6587602 authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

cfg80211: Parse SAE H2E only membership selector 



This extends the support for drivers that rebuild IEs in the
FW (same as with HT/VHT/HE).

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20201129172929.4012647275f3.I1a93ae71c57ef0b6f58f99d47fce919d19d65ff0@changeid


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

include/linux/ieee80211.h

+1 −0
Original line number Diff line number Diff line
@@ -1261,6 +1261,7 @@ struct ieee80211_mgmt { 
#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_SAE_H2E 123



/* mgmt header + 1 byte category code */

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

include/net/cfg80211.h

+2 −1
Original line number Diff line number Diff line
@@ -1187,6 +1187,7 @@ enum cfg80211_ap_settings_flags { 
 * @vht_required: stations must support VHT

 * @twt_responder: Enable Target Wait Time

 * @he_required: stations must support HE

 * @sae_h2e_required: stations must support direct H2E technique in SAE

 * @flags: flags, as defined in enum cfg80211_ap_settings_flags

 * @he_obss_pd: OBSS Packet Detection settings

 * @he_bss_color: BSS Color settings
@@ -1218,7 +1219,7 @@ struct cfg80211_ap_settings { 
	const struct ieee80211_vht_cap *vht_cap;

	const struct ieee80211_he_cap_elem *he_cap;

	const struct ieee80211_he_operation *he_oper;

	bool ht_required, vht_required, he_required;

	bool ht_required, vht_required, he_required, sae_h2e_required;

	bool twt_responder;

	u32 flags;

	struct ieee80211_he_obss_pd he_obss_pd;

net/wireless/nl80211.c

+2 −0
Original line number Diff line number Diff line
@@ -5017,6 +5017,8 @@ static void nl80211_check_ap_rate_selectors(struct cfg80211_ap_settings *params, 
			params->vht_required = true;

		if (rates[2 + i] == BSS_MEMBERSHIP_SELECTOR_HE_PHY)

			params->he_required = true;

		if (rates[2 + i] == BSS_MEMBERSHIP_SELECTOR_SAE_H2E)

			params->sae_h2e_required = true;

	}

}