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/authsrv.c b/src/ap/authsrv.c
index 6ed4d06..1488dcc 100644
--- a/src/ap/authsrv.c
+++ b/src/ap/authsrv.c
@@ -107,20 +107,13 @@
struct radius_server_conf srv;
struct hostapd_bss_config *conf = hapd->conf;
-#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 RADIUS server of the first BSS");
- first = hostapd_mld_get_first_bss(hapd);
- if (!first)
- return -1;
- hapd->radius_srv = first->radius_srv;
+ hapd->radius_srv = hapd->mld_first_bss->radius_srv;
return 0;
}
-#endif /* CONFIG_IEEE80211BE */
os_memset(&srv, 0, sizeof(srv));
srv.client_file = conf->radius_server_clients;
@@ -256,25 +249,18 @@
int authsrv_init(struct hostapd_data *hapd)
{
-#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 auth_serv of the first BSS");
- first = hostapd_mld_get_first_bss(hapd);
- if (!first)
- return -1;
#ifdef EAP_TLS_FUNCS
- hapd->ssl_ctx = first->ssl_ctx;
+ hapd->ssl_ctx = hapd->mld_first_bss->ssl_ctx;
#endif /* EAP_TLS_FUNCS */
- hapd->eap_cfg = first->eap_cfg;
+ hapd->eap_cfg = hapd->mld_first_bss->eap_cfg;
#ifdef EAP_SIM_DB
- hapd->eap_sim_db_priv = first->eap_sim_db_priv;
+ hapd->eap_sim_db_priv = hapd->mld_first_bss->eap_sim_db_priv;
#endif /* EAP_SIM_DB */
return 0;
}
-#endif /* CONFIG_IEEE80211BE */
#ifdef EAP_TLS_FUNCS
if (hapd->conf->eap_server &&
@@ -390,8 +376,7 @@
void authsrv_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 auth_serv of a non-first BSS");
@@ -405,7 +390,6 @@
#endif /* EAP_TLS_FUNCS */
return;
}
-#endif /* CONFIG_IEEE80211BE */
#ifdef RADIUS_SERVER
radius_server_deinit(hapd->radius_srv);