Do not set allowed_key_mgmts on BRCM devices
Do not add additional key managements in allowed_key_mgmts
field in BRCM solutions. This is to avoid sending the AKM
combinations which are not properly handled in driver.
Bug: 257347048
Test: Manual - connect to WPA2 AP and WPA3 AP.
Change-Id: Ia95fc14b5e3041cb077fde4713f36c1a9f81fbcf
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index be9f6e4..56dd5b9 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -2031,10 +2031,6 @@
wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_DENY_PTK0_REKEY, 0);
}
- if (wpa_key_mgmt_cross_akm(wpa_s->key_mgmt) &&
- !(wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME))
- wpas_update_allowed_key_mgmt(wpa_s, ssid);
-
#ifdef CONFIG_DRIVER_NL80211_BRCM
if ((wpa_s->key_mgmt & WPA_KEY_MGMT_CROSS_AKM_ROAM) &&
IS_CROSS_AKM_ROAM_KEY_MGMT(ssid->key_mgmt) &&
@@ -2044,6 +2040,10 @@
wpa_dbg(wpa_s, MSG_INFO,
"WPA: Updating to KEY_MGMT SAE+PSK for seamless roaming");
}
+#else
+ if (wpa_key_mgmt_cross_akm(wpa_s->key_mgmt) &&
+ !(wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME))
+ wpas_update_allowed_key_mgmt(wpa_s, ssid);
#endif /* CONFIG_DRIVER_NL80211_BRCM */
return 0;