Revert "[wpa_supplicant] cumilative patch from commit 4b755c967"
Revert submission 26533062-Supplicant_merge_June24
Reason for revert: https://b.corp.google.com/issues/349780869
Reverted changes: /q/submissionid:26533062-Supplicant_merge_June24
Change-Id: I6c9b7a4323fa7edde47617da6c1e0d8f6e6d5101
diff --git a/src/ap/ieee802_1x.c b/src/ap/ieee802_1x.c
index 8e98b65..f13c60a 100644
--- a/src/ap/ieee802_1x.c
+++ b/src/ap/ieee802_1x.c
@@ -172,7 +172,8 @@
struct hostapd_data *tmp_hapd =
hapd->iface->interfaces->iface[i]->bss[0];
- if (!hostapd_is_ml_partner(hapd, tmp_hapd))
+ if (!tmp_hapd->conf->mld_ap ||
+ hapd->conf->mld_id != tmp_hapd->conf->mld_id)
continue;
for (tmp_sta = tmp_hapd->sta_list; tmp_sta;
@@ -2539,20 +2540,13 @@
struct eapol_auth_config conf;
struct eapol_auth_cb cb;
-#ifdef CONFIG_IEEE80211BE
- if (!hostapd_mld_is_first_bss(hapd)) {
- struct hostapd_data *first;
-
+ if (hapd->mld_first_bss) {
wpa_printf(MSG_DEBUG,
"MLD: Using IEEE 802.1X state machine of the first BSS");
- first = hostapd_mld_get_first_bss(hapd);
- if (!first)
- return -1;
- hapd->eapol_auth = first->eapol_auth;
+ hapd->eapol_auth = hapd->mld_first_bss->eapol_auth;
return 0;
}
-#endif /* CONFIG_IEEE80211BE */
dl_list_init(&hapd->erp_keys);
@@ -2638,15 +2632,13 @@
void ieee802_1x_deinit(struct hostapd_data *hapd)
{
-#ifdef CONFIG_IEEE80211BE
- if (!hostapd_mld_is_first_bss(hapd)) {
+ if (hapd->mld_first_bss) {
wpa_printf(MSG_DEBUG,
"MLD: Deinit IEEE 802.1X state machine of a non-first BSS");
hapd->eapol_auth = NULL;
return;
}
-#endif /* CONFIG_IEEE80211BE */
#ifdef CONFIG_WEP
eloop_cancel_timeout(ieee802_1x_rekey, hapd, NULL);