Merge remote-tracking branch 'sm8250/lineage-20' into lineage-21

* sm8250/lineage-20: nl80211: add WPA3 definition for SAE authentication Change-Id: Id634a63c6793f3cb3f422b25da393e88dcf93864
LineageOS · Dec 15, 2024 · 7b34e18 · 7b34e18
2 parents 22fe06d + f95d094
commit 7b34e18
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
@@ -4395,6 +4395,7 @@ enum nl80211_mfp {
 enum nl80211_wpa_versions {
 	NL80211_WPA_VERSION_1 = 1 << 0,
 	NL80211_WPA_VERSION_2 = 1 << 1,
+	NL80211_WPA_VERSION_3 = 1 << 2,
 };
 
 /**

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
@@ -8568,7 +8568,8 @@ static int nl80211_dump_survey(struct sk_buff *skb, struct netlink_callback *cb)
 static bool nl80211_valid_wpa_versions(u32 wpa_versions)
 {
 	return !(wpa_versions & ~(NL80211_WPA_VERSION_1 |
-				  NL80211_WPA_VERSION_2));
+				  NL80211_WPA_VERSION_2 |
+				  NL80211_WPA_VERSION_3));
 }
 
 static int nl80211_authenticate(struct sk_buff *skb, struct genl_info *info)