commit b43c2e5115c3e6780717639c0e754c061255c0e3
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jan 17 02:28:32 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jan 17 02:28:32 2024 +0000
tree 8d826f8f1539a0f0363a8e62c1aca0410b8ab014
parent 48ed5d523e63d5e9d001f6a4f5c7d9e1c9fcf261
parent f99885cc672a583a51144dbb24b9bcc14350a37c

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25904822'] into 24Q2-release.

Change-Id: I4bf7a6fb8bfdc1144072cf84dd84127489fb86dd

src/drivers/driver_nl80211.c

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index fede740..c906b33 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -6889,14 +6889,8 @@
 
 		if (params->wpa_proto & WPA_PROTO_WPA)
 			ver |= NL80211_WPA_VERSION_1;
-		if (params->wpa_proto & WPA_PROTO_RSN) {
-#if !defined(CONFIG_DRIVER_NL80211_BRCM) && !defined(CONFIG_DRIVER_NL80211_SYNA)
-			if (wpa_key_mgmt_sae(params->key_mgmt_suite))
-				ver |= NL80211_WPA_VERSION_3;
-			else
-#endif
-				ver |= NL80211_WPA_VERSION_2;
-		}
+		if (params->wpa_proto & WPA_PROTO_RSN)
+			ver |= NL80211_WPA_VERSION_2;
 
 		wpa_printf(MSG_DEBUG, "  * WPA Versions 0x%x", ver);
 		if (nla_put_u32(msg, NL80211_ATTR_WPA_VERSIONS, ver))