Revert "[wpa_supplicant] cumilative patch from commit 3a5d1a7e6"
Revert submission 26533062-Supplicant_merge_June24
Reason for revert: https://b.corp.google.com/issues/349780869
Reverted changes: /q/submissionid:26533062-Supplicant_merge_June24
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:eb83e2a5c5a7873beda5b25580232d1392c42bb2)
Merged-In: I4a7a5b8ccb6b4822353bacc29649587cd5a3cb80
Change-Id: I4a7a5b8ccb6b4822353bacc29649587cd5a3cb80
diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index a6b16c2..57c9997 100644
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -39,7 +39,6 @@
#include "common/wpa_ctrl.h"
#include "common/ptksa_cache.h"
#include "common/hw_features_common.h"
-#include "common/nan_de.h"
#include "crypto/tls.h"
#include "drivers/driver.h"
#include "eapol_auth/eapol_auth_sm.h"
@@ -64,7 +63,6 @@
#include "ap/rrm.h"
#include "ap/dpp_hostapd.h"
#include "ap/dfs.h"
-#include "ap/nan_usd_ap.h"
#include "wps/wps_defs.h"
#include "wps/wps.h"
#include "fst/fst_ctrl_iface.h"
@@ -1437,7 +1435,7 @@
pmk_match = PMK_LEN == pmk_len &&
os_memcmp(psk->psk, pmk, pmk_len) == 0;
sta_match = psk->group == 0 &&
- ether_addr_equal(sta->addr, psk->addr);
+ os_memcmp(sta->addr, psk->addr, ETH_ALEN) == 0;
bss_match = psk->group == 1;
if (pmk_match && (sta_match || bss_match))
@@ -1476,79 +1474,6 @@
}
-#ifdef CONFIG_IEEE80211R_AP
-
-static int hostapd_ctrl_iface_get_rxkhs(struct hostapd_data *hapd,
- char *buf, size_t buflen)
-{
- int ret, start_pos;
- char *pos, *end;
- struct ft_remote_r0kh *r0kh;
- struct ft_remote_r1kh *r1kh;
- struct hostapd_bss_config *conf = hapd->conf;
-
- pos = buf;
- end = buf + buflen;
-
- for (r0kh = conf->r0kh_list; r0kh; r0kh=r0kh->next) {
- start_pos = pos - buf;
- ret = os_snprintf(pos, end - pos, "r0kh=" MACSTR " ",
- MAC2STR(r0kh->addr));
- if (os_snprintf_error(end - pos, ret))
- return start_pos;
- pos += ret;
- if (r0kh->id_len + 1 >= (size_t) (end - pos))
- return start_pos;
- os_memcpy(pos, r0kh->id, r0kh->id_len);
- pos += r0kh->id_len;
- *pos++ = ' ';
- pos += wpa_snprintf_hex(pos, end - pos, r0kh->key,
- sizeof(r0kh->key));
- ret = os_snprintf(pos, end - pos, "\n");
- if (os_snprintf_error(end - pos, ret))
- return start_pos;
- pos += ret;
- }
-
- for (r1kh = conf->r1kh_list; r1kh; r1kh=r1kh->next) {
- start_pos = pos - buf;
- ret = os_snprintf(pos, end - pos, "r1kh=" MACSTR " " MACSTR " ",
- MAC2STR(r1kh->addr), MAC2STR(r1kh->id));
- if (os_snprintf_error(end - pos, ret))
- return start_pos;
- pos += ret;
- pos += wpa_snprintf_hex(pos, end - pos, r1kh->key,
- sizeof(r1kh->key));
- ret = os_snprintf(pos, end - pos, "\n");
- if (os_snprintf_error(end - pos, ret))
- return start_pos;
- pos += ret;
- }
-
- return pos - buf;
-}
-
-
-static int hostapd_ctrl_iface_reload_rxkhs(struct hostapd_data *hapd)
-{
- struct hostapd_bss_config *conf = hapd->conf;
- int err;
-
- hostapd_config_clear_rxkhs(conf);
-
- err = hostapd_config_read_rxkh_file(conf, conf->rxkh_file);
- if (err < 0) {
- wpa_printf(MSG_ERROR, "Reloading RxKHs failed: %d",
- err);
- return -1;
- }
-
- return 0;
-}
-
-#endif /* CONFIG_IEEE80211R_AP */
-
-
#ifdef CONFIG_TESTING_OPTIONS
static int hostapd_ctrl_iface_radar(struct hostapd_data *hapd, char *cmd)
@@ -2085,6 +2010,74 @@
}
+static int hostapd_ctrl_test_alloc_fail(struct hostapd_data *hapd, char *cmd)
+{
+#ifdef WPA_TRACE_BFD
+ char *pos;
+
+ wpa_trace_fail_after = atoi(cmd);
+ pos = os_strchr(cmd, ':');
+ if (pos) {
+ pos++;
+ os_strlcpy(wpa_trace_fail_func, pos,
+ sizeof(wpa_trace_fail_func));
+ } else {
+ wpa_trace_fail_after = 0;
+ }
+
+ return 0;
+#else /* WPA_TRACE_BFD */
+ return -1;
+#endif /* WPA_TRACE_BFD */
+}
+
+
+static int hostapd_ctrl_get_alloc_fail(struct hostapd_data *hapd,
+ char *buf, size_t buflen)
+{
+#ifdef WPA_TRACE_BFD
+ return os_snprintf(buf, buflen, "%u:%s", wpa_trace_fail_after,
+ wpa_trace_fail_func);
+#else /* WPA_TRACE_BFD */
+ return -1;
+#endif /* WPA_TRACE_BFD */
+}
+
+
+static int hostapd_ctrl_test_fail(struct hostapd_data *hapd, char *cmd)
+{
+#ifdef WPA_TRACE_BFD
+ char *pos;
+
+ wpa_trace_test_fail_after = atoi(cmd);
+ pos = os_strchr(cmd, ':');
+ if (pos) {
+ pos++;
+ os_strlcpy(wpa_trace_test_fail_func, pos,
+ sizeof(wpa_trace_test_fail_func));
+ } else {
+ wpa_trace_test_fail_after = 0;
+ }
+
+ return 0;
+#else /* WPA_TRACE_BFD */
+ return -1;
+#endif /* WPA_TRACE_BFD */
+}
+
+
+static int hostapd_ctrl_get_fail(struct hostapd_data *hapd,
+ char *buf, size_t buflen)
+{
+#ifdef WPA_TRACE_BFD
+ return os_snprintf(buf, buflen, "%u:%s", wpa_trace_test_fail_after,
+ wpa_trace_test_fail_func);
+#else /* WPA_TRACE_BFD */
+ return -1;
+#endif /* WPA_TRACE_BFD */
+}
+
+
static int hostapd_ctrl_reset_pn(struct hostapd_data *hapd, const char *cmd)
{
struct sta_info *sta;
@@ -2647,12 +2640,6 @@
if (ret)
return ret;
- settings.link_id = -1;
-#ifdef CONFIG_IEEE80211BE
- if (iface->num_bss && iface->bss[0]->conf->mld_ap)
- settings.link_id = iface->bss[0]->mld_link_id;
-#endif /* CONFIG_IEEE80211BE */
-
ret = hostapd_ctrl_check_freq_params(&settings.freq_params,
settings.punct_bitmap);
if (ret) {
@@ -3462,416 +3449,6 @@
#endif /* ANDROID */
-#ifdef CONFIG_IEEE80211BE
-
-static int hostapd_ctrl_iface_enable_mld(struct hostapd_iface *iface)
-{
- unsigned int i;
-
- if (!iface || !iface->bss[0]->conf->mld_ap) {
- wpa_printf(MSG_ERROR,
- "Trying to enable AP MLD on an interface that is not affiliated with an AP MLD");
- return -1;
- }
-
- for (i = 0; i < iface->interfaces->count; ++i) {
- struct hostapd_iface *h_iface = iface->interfaces->iface[i];
- struct hostapd_data *h_hapd = h_iface->bss[0];
- struct hostapd_bss_config *h_conf = h_hapd->conf;
-
- if (!h_conf->mld_ap ||
- h_conf->mld_id != iface->bss[0]->conf->mld_id)
- continue;
-
- if (hostapd_enable_iface(h_iface)) {
- wpa_printf(MSG_ERROR, "Enabling of AP MLD failed");
- return -1;
- }
- }
- return 0;
-}
-
-
-static void hostapd_disable_iface_bss(struct hostapd_iface *iface)
-{
- unsigned int i;
-
- for (i = 0; i < iface->num_bss; i++)
- hostapd_bss_deinit_no_free(iface->bss[i]);
-}
-
-
-static int hostapd_ctrl_iface_disable_mld(struct hostapd_iface *iface)
-{
- unsigned int i;
- struct hostapd_iface *first_iface = NULL;
-
- if (!iface || !iface->bss[0]->conf->mld_ap) {
- wpa_printf(MSG_ERROR,
- "Trying to disable AP MLD on an interface that is not affiliated with an AP MLD.");
- return -1;
- }
-
- /* First, disable BSSs before stopping beaconing and doing driver
- * deinit so that the broadcast Deauthentication frames go out. */
-
- for (i = 0; i < iface->interfaces->count; ++i) {
- struct hostapd_iface *h_iface = iface->interfaces->iface[i];
- struct hostapd_data *h_hapd = h_iface->bss[0];
- struct hostapd_bss_config *h_conf = h_hapd->conf;
-
- if (!h_conf->mld_ap ||
- h_conf->mld_id != iface->bss[0]->conf->mld_id)
- continue;
-
- if (!h_hapd->mld_first_bss) {
- first_iface = h_iface;
- continue;
- }
- hostapd_disable_iface_bss(iface);
- }
-
- if (first_iface)
- hostapd_disable_iface_bss(first_iface);
-
- /* Then, fully disable interfaces */
-
- for (i = 0; i < iface->interfaces->count; ++i) {
- struct hostapd_iface *h_iface = iface->interfaces->iface[i];
- struct hostapd_data *h_hapd = h_iface->bss[0];
- struct hostapd_bss_config *h_conf = h_hapd->conf;
-
- if (!h_conf->mld_ap ||
- h_conf->mld_id != iface->bss[0]->conf->mld_id ||
- !h_hapd->mld_first_bss)
- continue;
-
- if (hostapd_disable_iface(h_iface)) {
- wpa_printf(MSG_ERROR, "Disabling AP MLD failed");
- return -1;
- }
- }
-
- if (first_iface && hostapd_disable_iface(first_iface)) {
- wpa_printf(MSG_ERROR, "Disabling AP MLD failed");
- return -1;
- }
-
- return 0;
-}
-
-
-#ifdef CONFIG_TESTING_OPTIONS
-static int hostapd_ctrl_iface_link_remove(struct hostapd_data *hapd, char *cmd,
- char *buf, size_t buflen)
-{
- int ret;
- u32 count = atoi(cmd);
-
- if (!count)
- count = 1;
-
- ret = hostapd_link_remove(hapd, count);
- if (ret == 0) {
- ret = os_snprintf(buf, buflen, "%s\n", "OK");
- if (os_snprintf_error(buflen, ret))
- ret = -1;
- else
- ret = 0;
- }
-
- return ret;
-}
-#endif /* CONFIG_TESTING_OPTIONS */
-#endif /* CONFIG_IEEE80211BE */
-
-
-#ifdef CONFIG_NAN_USD
-
-static int hostapd_ctrl_nan_publish(struct hostapd_data *hapd, char *cmd,
- char *buf, size_t buflen)
-{
- char *token, *context = NULL;
- int publish_id;
- struct nan_publish_params params;
- const char *service_name = NULL;
- struct wpabuf *ssi = NULL;
- int ret = -1;
- enum nan_service_protocol_type srv_proto_type = 0;
-
- os_memset(¶ms, 0, sizeof(params));
- /* USD shall use both solicited and unsolicited transmissions */
- params.unsolicited = true;
- params.solicited = true;
- /* USD shall require FSD without GAS */
- params.fsd = true;
-
- while ((token = str_token(cmd, " ", &context))) {
- if (os_strncmp(token, "service_name=", 13) == 0) {
- service_name = token + 13;
- continue;
- }
-
- if (os_strncmp(token, "ttl=", 4) == 0) {
- params.ttl = atoi(token + 4);
- continue;
- }
-
- if (os_strncmp(token, "srv_proto_type=", 15) == 0) {
- srv_proto_type = atoi(token + 15);
- continue;
- }
-
- if (os_strncmp(token, "ssi=", 4) == 0) {
- if (ssi)
- goto fail;
- ssi = wpabuf_parse_bin(token + 4);
- if (!ssi)
- goto fail;
- continue;
- }
-
- if (os_strcmp(token, "solicited=0") == 0) {
- params.solicited = false;
- continue;
- }
-
- if (os_strcmp(token, "unsolicited=0") == 0) {
- params.unsolicited = false;
- continue;
- }
-
- if (os_strcmp(token, "fsd=0") == 0) {
- params.fsd = false;
- continue;
- }
-
- wpa_printf(MSG_INFO, "CTRL: Invalid NAN_PUBLISH parameter: %s",
- token);
- goto fail;
- }
-
- publish_id = hostapd_nan_usd_publish(hapd, service_name, srv_proto_type,
- ssi, ¶ms);
- if (publish_id > 0)
- ret = os_snprintf(buf, buflen, "%d", publish_id);
-fail:
- wpabuf_free(ssi);
- return ret;
-}
-
-
-static int hostapd_ctrl_nan_cancel_publish(struct hostapd_data *hapd,
- char *cmd)
-{
- char *token, *context = NULL;
- int publish_id = 0;
-
- while ((token = str_token(cmd, " ", &context))) {
- if (sscanf(token, "publish_id=%i", &publish_id) == 1)
- continue;
- wpa_printf(MSG_INFO,
- "CTRL: Invalid NAN_CANCEL_PUBLISH parameter: %s",
- token);
- return -1;
- }
-
- if (publish_id <= 0) {
- wpa_printf(MSG_INFO,
- "CTRL: Invalid or missing NAN_CANCEL_PUBLISH publish_id");
- return -1;
- }
-
- hostapd_nan_usd_cancel_publish(hapd, publish_id);
- return 0;
-}
-
-
-static int hostapd_ctrl_nan_update_publish(struct hostapd_data *hapd,
- char *cmd)
-{
- char *token, *context = NULL;
- int publish_id = 0;
- struct wpabuf *ssi = NULL;
- int ret = -1;
-
- while ((token = str_token(cmd, " ", &context))) {
- if (sscanf(token, "publish_id=%i", &publish_id) == 1)
- continue;
- if (os_strncmp(token, "ssi=", 4) == 0) {
- if (ssi)
- goto fail;
- ssi = wpabuf_parse_bin(token + 4);
- if (!ssi)
- goto fail;
- continue;
- }
- wpa_printf(MSG_INFO,
- "CTRL: Invalid NAN_UPDATE_PUBLISH parameter: %s",
- token);
- goto fail;
- }
-
- if (publish_id <= 0) {
- wpa_printf(MSG_INFO,
- "CTRL: Invalid or missing NAN_UPDATE_PUBLISH publish_id");
- goto fail;
- }
-
- ret = hostapd_nan_usd_update_publish(hapd, publish_id, ssi);
-fail:
- wpabuf_free(ssi);
- return ret;
-}
-
-
-static int hostapd_ctrl_nan_subscribe(struct hostapd_data *hapd, char *cmd,
- char *buf, size_t buflen)
-{
- char *token, *context = NULL;
- int subscribe_id;
- struct nan_subscribe_params params;
- const char *service_name = NULL;
- struct wpabuf *ssi = NULL;
- int ret = -1;
- enum nan_service_protocol_type srv_proto_type = 0;
-
- os_memset(¶ms, 0, sizeof(params));
-
- while ((token = str_token(cmd, " ", &context))) {
- if (os_strncmp(token, "service_name=", 13) == 0) {
- service_name = token + 13;
- continue;
- }
-
- if (os_strcmp(token, "active=1") == 0) {
- params.active = true;
- continue;
- }
-
- if (os_strncmp(token, "ttl=", 4) == 0) {
- params.ttl = atoi(token + 4);
- continue;
- }
-
- if (os_strncmp(token, "srv_proto_type=", 15) == 0) {
- srv_proto_type = atoi(token + 15);
- continue;
- }
-
- if (os_strncmp(token, "ssi=", 4) == 0) {
- if (ssi)
- goto fail;
- ssi = wpabuf_parse_bin(token + 4);
- if (!ssi)
- goto fail;
- continue;
- }
-
- wpa_printf(MSG_INFO,
- "CTRL: Invalid NAN_SUBSCRIBE parameter: %s",
- token);
- goto fail;
- }
-
- subscribe_id = hostapd_nan_usd_subscribe(hapd, service_name,
- srv_proto_type, ssi,
- ¶ms);
- if (subscribe_id > 0)
- ret = os_snprintf(buf, buflen, "%d", subscribe_id);
-fail:
- wpabuf_free(ssi);
- return ret;
-}
-
-
-static int hostapd_ctrl_nan_cancel_subscribe(struct hostapd_data *hapd,
- char *cmd)
-{
- char *token, *context = NULL;
- int subscribe_id = 0;
-
- while ((token = str_token(cmd, " ", &context))) {
- if (sscanf(token, "subscribe_id=%i", &subscribe_id) == 1)
- continue;
- wpa_printf(MSG_INFO,
- "CTRL: Invalid NAN_CANCEL_SUBSCRIBE parameter: %s",
- token);
- return -1;
- }
-
- if (subscribe_id <= 0) {
- wpa_printf(MSG_INFO,
- "CTRL: Invalid or missing NAN_CANCEL_SUBSCRIBE subscribe_id");
- return -1;
- }
-
- hostapd_nan_usd_cancel_subscribe(hapd, subscribe_id);
- return 0;
-}
-
-
-static int hostapd_ctrl_nan_transmit(struct hostapd_data *hapd, char *cmd)
-{
- char *token, *context = NULL;
- int handle = 0;
- int req_instance_id = 0;
- struct wpabuf *ssi = NULL;
- u8 peer_addr[ETH_ALEN];
- int ret = -1;
-
- os_memset(peer_addr, 0, ETH_ALEN);
-
- while ((token = str_token(cmd, " ", &context))) {
- if (sscanf(token, "handle=%i", &handle) == 1)
- continue;
-
- if (sscanf(token, "req_instance_id=%i", &req_instance_id) == 1)
- continue;
-
- if (os_strncmp(token, "address=", 8) == 0) {
- if (hwaddr_aton(token + 8, peer_addr) < 0)
- return -1;
- continue;
- }
-
- if (os_strncmp(token, "ssi=", 4) == 0) {
- if (ssi)
- goto fail;
- ssi = wpabuf_parse_bin(token + 4);
- if (!ssi)
- goto fail;
- continue;
- }
-
- wpa_printf(MSG_INFO,
- "CTRL: Invalid NAN_TRANSMIT parameter: %s",
- token);
- goto fail;
- }
-
- if (handle <= 0) {
- wpa_printf(MSG_INFO,
- "CTRL: Invalid or missing NAN_TRANSMIT handle");
- goto fail;
- }
-
- if (is_zero_ether_addr(peer_addr)) {
- wpa_printf(MSG_INFO,
- "CTRL: Invalid or missing NAN_TRANSMIT address");
- goto fail;
- }
-
- ret = hostapd_nan_usd_transmit(hapd, handle, ssi, NULL, peer_addr,
- req_instance_id);
-fail:
- wpabuf_free(ssi);
- return ret;
-}
-
-#endif /* CONFIG_NAN_USD */
-
-
static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
char *buf, char *reply,
int reply_size,
@@ -4056,30 +3633,19 @@
} else if (os_strncmp(buf, "GET ", 4) == 0) {
reply_len = hostapd_ctrl_iface_get(hapd, buf + 4, reply,
reply_size);
- } else if (os_strcmp(buf, "ENABLE") == 0) {
+ } else if (os_strncmp(buf, "ENABLE", 6) == 0) {
if (hostapd_ctrl_iface_enable(hapd->iface))
reply_len = -1;
} else if (os_strcmp(buf, "RELOAD_WPA_PSK") == 0) {
if (hostapd_ctrl_iface_reload_wpa_psk(hapd))
reply_len = -1;
-#ifdef CONFIG_IEEE80211R_AP
- } else if (os_strcmp(buf, "GET_RXKHS") == 0) {
- reply_len = hostapd_ctrl_iface_get_rxkhs(hapd, reply,
- reply_size);
- } else if (os_strcmp(buf, "RELOAD_RXKHS") == 0) {
- if (hostapd_ctrl_iface_reload_rxkhs(hapd))
- reply_len = -1;
-#endif /* CONFIG_IEEE80211R_AP */
} else if (os_strcmp(buf, "RELOAD_BSS") == 0) {
if (hostapd_ctrl_iface_reload_bss(hapd))
reply_len = -1;
- } else if (os_strcmp(buf, "RELOAD_CONFIG") == 0) {
- if (hostapd_reload_config(hapd->iface))
- reply_len = -1;
- } else if (os_strcmp(buf, "RELOAD") == 0) {
+ } else if (os_strncmp(buf, "RELOAD", 6) == 0) {
if (hostapd_ctrl_iface_reload(hapd->iface))
reply_len = -1;
- } else if (os_strcmp(buf, "DISABLE") == 0) {
+ } else if (os_strncmp(buf, "DISABLE", 7) == 0) {
if (hostapd_ctrl_iface_disable(hapd->iface))
reply_len = -1;
} else if (os_strcmp(buf, "UPDATE_BEACON") == 0) {
@@ -4115,15 +3681,16 @@
if (hostapd_ctrl_iface_data_test_frame(hapd, buf + 16) < 0)
reply_len = -1;
} else if (os_strncmp(buf, "TEST_ALLOC_FAIL ", 16) == 0) {
- if (testing_set_fail_pattern(true, buf + 16) < 0)
+ if (hostapd_ctrl_test_alloc_fail(hapd, buf + 16) < 0)
reply_len = -1;
} else if (os_strcmp(buf, "GET_ALLOC_FAIL") == 0) {
- reply_len = testing_get_fail_pattern(true, reply, reply_size);
+ reply_len = hostapd_ctrl_get_alloc_fail(hapd, reply,
+ reply_size);
} else if (os_strncmp(buf, "TEST_FAIL ", 10) == 0) {
- if (testing_set_fail_pattern(false, buf + 10) < 0)
+ if (hostapd_ctrl_test_fail(hapd, buf + 10) < 0)
reply_len = -1;
} else if (os_strcmp(buf, "GET_FAIL") == 0) {
- reply_len = testing_get_fail_pattern(false, reply, reply_size);
+ reply_len = hostapd_ctrl_get_fail(hapd, reply, reply_size);
} else if (os_strncmp(buf, "RESET_PN ", 9) == 0) {
if (hostapd_ctrl_reset_pn(hapd, buf + 9) < 0)
reply_len = -1;
@@ -4416,26 +3983,6 @@
reply_len = -1;
#endif /* CONFIG_DPP3 */
#endif /* CONFIG_DPP */
-#ifdef CONFIG_NAN_USD
- } else if (os_strncmp(buf, "NAN_PUBLISH ", 12) == 0) {
- reply_len = hostapd_ctrl_nan_publish(hapd, buf + 12, reply,
- reply_size);
- } else if (os_strncmp(buf, "NAN_CANCEL_PUBLISH ", 19) == 0) {
- if (hostapd_ctrl_nan_cancel_publish(hapd, buf + 19) < 0)
- reply_len = -1;
- } else if (os_strncmp(buf, "NAN_UPDATE_PUBLISH ", 19) == 0) {
- if (hostapd_ctrl_nan_update_publish(hapd, buf + 19) < 0)
- reply_len = -1;
- } else if (os_strncmp(buf, "NAN_SUBSCRIBE ", 14) == 0) {
- reply_len = hostapd_ctrl_nan_subscribe(hapd, buf + 14, reply,
- reply_size);
- } else if (os_strncmp(buf, "NAN_CANCEL_SUBSCRIBE ", 21) == 0) {
- if (hostapd_ctrl_nan_cancel_subscribe(hapd, buf + 21) < 0)
- reply_len = -1;
- } else if (os_strncmp(buf, "NAN_TRANSMIT ", 13) == 0) {
- if (hostapd_ctrl_nan_transmit(hapd, buf + 13) < 0)
- reply_len = -1;
-#endif /* CONFIG_NAN_USD */
#ifdef RADIUS_SERVER
} else if (os_strncmp(buf, "DAC_REQUEST ", 12) == 0) {
if (radius_server_dac_request(hapd->radius_srv, buf + 12) < 0)
@@ -4453,20 +4000,6 @@
reply_len = hostapd_ctrl_iface_driver_cmd(hapd, buf + 7, reply,
reply_size);
#endif /* ANDROID */
-#ifdef CONFIG_IEEE80211BE
- } else if (os_strcmp(buf, "ENABLE_MLD") == 0) {
- if (hostapd_ctrl_iface_enable_mld(hapd->iface))
- reply_len = -1;
- } else if (os_strcmp(buf, "DISABLE_MLD") == 0) {
- if (hostapd_ctrl_iface_disable_mld(hapd->iface))
- reply_len = -1;
-#ifdef CONFIG_TESTING_OPTIONS
- } else if (os_strncmp(buf, "LINK_REMOVE ", 12) == 0) {
- if (hostapd_ctrl_iface_link_remove(hapd, buf + 12,
- reply, reply_size))
- reply_len = -1;
-#endif /* CONFIG_TESTING_OPTIONS */
-#endif /* CONFIG_IEEE80211BE */
} else {
os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
reply_len = 16;
@@ -4958,7 +4491,6 @@
#ifdef CONFIG_DPP
dpp_global_clear(interfaces->dpp);
#ifdef CONFIG_DPP3
- interfaces->dpp_pb_bi = NULL;
{
int i;