Merge "[Bugfix][API-1075]modify wpa_supplicant ver 10_202_10 form branch No-connman" into MR3.0-merge
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/COPYING b/src/lynq/packages/thirdpart/lynq-wg870/COPYING
index 7ca3030..5d0115c 100755
--- a/src/lynq/packages/thirdpart/lynq-wg870/COPYING
+++ b/src/lynq/packages/thirdpart/lynq-wg870/COPYING
@@ -1,7 +1,7 @@
 wpa_supplicant and hostapd
 --------------------------
 
-Copyright (c) 2002-2022, Jouni Malinen <j@w1.fi> and contributors
+Copyright (c) 2002-2019, Jouni Malinen <j@w1.fi> and contributors
 All Rights Reserved.
 
 
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/README b/src/lynq/packages/thirdpart/lynq-wg870/README
index 1470c4f..a9f8069 100755
--- a/src/lynq/packages/thirdpart/lynq-wg870/README
+++ b/src/lynq/packages/thirdpart/lynq-wg870/README
@@ -1,7 +1,7 @@
 wpa_supplicant and hostapd
 --------------------------
 
-Copyright (c) 2002-2022, Jouni Malinen <j@w1.fi> and contributors
+Copyright (c) 2002-2019, Jouni Malinen <j@w1.fi> and contributors
 All Rights Reserved.
 
 These programs are licensed under the BSD license (the one with
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/conf/wpa_supplicant.conf b/src/lynq/packages/thirdpart/lynq-wg870/conf/wpa_supplicant.conf
index c288e9b..833ae20 100755
--- a/src/lynq/packages/thirdpart/lynq-wg870/conf/wpa_supplicant.conf
+++ b/src/lynq/packages/thirdpart/lynq-wg870/conf/wpa_supplicant.conf
@@ -10,4 +10,4 @@
 hs20=1
 interworking=1
 sae_groups=19
-sae_pwe=2
\ No newline at end of file
+sae_pwe=2
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/hostapd/README b/src/lynq/packages/thirdpart/lynq-wg870/hostapd/README
index 739c964..1f30d7e 100755
--- a/src/lynq/packages/thirdpart/lynq-wg870/hostapd/README
+++ b/src/lynq/packages/thirdpart/lynq-wg870/hostapd/README
@@ -2,7 +2,7 @@
 	  Authenticator and RADIUS authentication server
 ================================================================
 
-Copyright (c) 2002-2022, Jouni Malinen <j@w1.fi> and contributors
+Copyright (c) 2002-2019, Jouni Malinen <j@w1.fi> and contributors
 All Rights Reserved.
 
 This program is licensed under the BSD license (the one with
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/src/ap/hostapd.c b/src/lynq/packages/thirdpart/lynq-wg870/src/ap/hostapd.c
index 07e975a..bf2874d 100755
--- a/src/lynq/packages/thirdpart/lynq-wg870/src/ap/hostapd.c
+++ b/src/lynq/packages/thirdpart/lynq-wg870/src/ap/hostapd.c
@@ -2216,9 +2216,8 @@
 		 * If freq is DFS, and DFS is offloaded to the driver, then wait
 		 * for CAC to complete.
 		 */
-		//wpa_printf(MSG_DEBUG, "%s: Wait for CAC to complete", __func__);
-		wpa_printf(MSG_DEBUG, "IFX: don't need wait for CAC to complete");
-		//return res_dfs_offload;
+		wpa_printf(MSG_DEBUG, "%s: Wait for CAC to complete", __func__);
+		return res_dfs_offload;
 	}
 
 #ifdef NEED_AP_MLME
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/src/ap/hostapd.c.orig b/src/lynq/packages/thirdpart/lynq-wg870/src/ap/hostapd.c.orig
deleted file mode 100755
index bf2874d..0000000
--- a/src/lynq/packages/thirdpart/lynq-wg870/src/ap/hostapd.c.orig
+++ /dev/null
@@ -1,3830 +0,0 @@
-/*
- * hostapd / Initialization and configuration
- * Copyright (c) 2002-2021, Jouni Malinen <j@w1.fi>
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-#include "utils/includes.h"
-#ifdef CONFIG_SQLITE
-#include <sqlite3.h>
-#endif /* CONFIG_SQLITE */
-
-#include "utils/common.h"
-#include "utils/eloop.h"
-#include "utils/crc32.h"
-#include "common/ieee802_11_defs.h"
-#include "common/wpa_ctrl.h"
-#include "common/hw_features_common.h"
-#include "radius/radius_client.h"
-#include "radius/radius_das.h"
-#include "eap_server/tncs.h"
-#include "eapol_auth/eapol_auth_sm.h"
-#include "eapol_auth/eapol_auth_sm_i.h"
-#include "fst/fst.h"
-#include "hostapd.h"
-#include "authsrv.h"
-#include "sta_info.h"
-#include "accounting.h"
-#include "ap_list.h"
-#include "beacon.h"
-#include "ieee802_1x.h"
-#include "ieee802_11_auth.h"
-#include "vlan_init.h"
-#include "wpa_auth.h"
-#include "wps_hostapd.h"
-#include "dpp_hostapd.h"
-#include "gas_query_ap.h"
-#include "hw_features.h"
-#include "wpa_auth_glue.h"
-#include "ap_drv_ops.h"
-#include "ap_config.h"
-#include "p2p_hostapd.h"
-#include "gas_serv.h"
-#include "dfs.h"
-#include "ieee802_11.h"
-#include "bss_load.h"
-#include "x_snoop.h"
-#include "dhcp_snoop.h"
-#include "ndisc_snoop.h"
-#include "neighbor_db.h"
-#include "rrm.h"
-#include "fils_hlp.h"
-#include "acs.h"
-#include "hs20.h"
-#include "airtime_policy.h"
-#include "wpa_auth_kay.h"
-
-
-static int hostapd_flush_old_stations(struct hostapd_data *hapd, u16 reason);
-#ifdef CONFIG_WEP
-static int hostapd_setup_encryption(char *iface, struct hostapd_data *hapd);
-static int hostapd_broadcast_wep_clear(struct hostapd_data *hapd);
-#endif /* CONFIG_WEP */
-static int setup_interface2(struct hostapd_iface *iface);
-static void channel_list_update_timeout(void *eloop_ctx, void *timeout_ctx);
-static void hostapd_interface_setup_failure_handler(void *eloop_ctx,
-						    void *timeout_ctx);
-
-
-int hostapd_for_each_interface(struct hapd_interfaces *interfaces,
-			       int (*cb)(struct hostapd_iface *iface,
-					 void *ctx), void *ctx)
-{
-	size_t i;
-	int ret;
-
-	for (i = 0; i < interfaces->count; i++) {
-		if (!interfaces->iface[i])
-			continue;
-		ret = cb(interfaces->iface[i], ctx);
-		if (ret)
-			return ret;
-	}
-
-	return 0;
-}
-
-
-void hostapd_reconfig_encryption(struct hostapd_data *hapd)
-{
-	if (hapd->wpa_auth)
-		return;
-
-	hostapd_set_privacy(hapd, 0);
-#ifdef CONFIG_WEP
-	hostapd_setup_encryption(hapd->conf->iface, hapd);
-#endif /* CONFIG_WEP */
-}
-
-
-static void hostapd_reload_bss(struct hostapd_data *hapd)
-{
-	struct hostapd_ssid *ssid;
-
-	if (!hapd->started)
-		return;
-
-	if (hapd->conf->wmm_enabled < 0)
-		hapd->conf->wmm_enabled = hapd->iconf->ieee80211n |
-			hapd->iconf->ieee80211ax;
-
-#ifndef CONFIG_NO_RADIUS
-	radius_client_reconfig(hapd->radius, hapd->conf->radius);
-#endif /* CONFIG_NO_RADIUS */
-
-	ssid = &hapd->conf->ssid;
-	if (!ssid->wpa_psk_set && ssid->wpa_psk && !ssid->wpa_psk->next &&
-	    ssid->wpa_passphrase_set && ssid->wpa_passphrase) {
-		/*
-		 * Force PSK to be derived again since SSID or passphrase may
-		 * have changed.
-		 */
-		hostapd_config_clear_wpa_psk(&hapd->conf->ssid.wpa_psk);
-	}
-	if (hostapd_setup_wpa_psk(hapd->conf)) {
-		wpa_printf(MSG_ERROR, "Failed to re-configure WPA PSK "
-			   "after reloading configuration");
-	}
-
-	if (hapd->conf->ieee802_1x || hapd->conf->wpa)
-		hostapd_set_drv_ieee8021x(hapd, hapd->conf->iface, 1);
-	else
-		hostapd_set_drv_ieee8021x(hapd, hapd->conf->iface, 0);
-
-	if ((hapd->conf->wpa || hapd->conf->osen) && hapd->wpa_auth == NULL) {
-		hostapd_setup_wpa(hapd);
-		if (hapd->wpa_auth)
-			wpa_init_keys(hapd->wpa_auth);
-	} else if (hapd->conf->wpa) {
-		const u8 *wpa_ie;
-		size_t wpa_ie_len;
-		hostapd_reconfig_wpa(hapd);
-		wpa_ie = wpa_auth_get_wpa_ie(hapd->wpa_auth, &wpa_ie_len);
-		if (hostapd_set_generic_elem(hapd, wpa_ie, wpa_ie_len))
-			wpa_printf(MSG_ERROR, "Failed to configure WPA IE for "
-				   "the kernel driver.");
-	} else if (hapd->wpa_auth) {
-		wpa_deinit(hapd->wpa_auth);
-		hapd->wpa_auth = NULL;
-		hostapd_set_privacy(hapd, 0);
-#ifdef CONFIG_WEP
-		hostapd_setup_encryption(hapd->conf->iface, hapd);
-#endif /* CONFIG_WEP */
-		hostapd_set_generic_elem(hapd, (u8 *) "", 0);
-	}
-
-	ieee802_11_set_beacon(hapd);
-	hostapd_update_wps(hapd);
-
-	if (hapd->conf->ssid.ssid_set &&
-	    hostapd_set_ssid(hapd, hapd->conf->ssid.ssid,
-			     hapd->conf->ssid.ssid_len)) {
-		wpa_printf(MSG_ERROR, "Could not set SSID for kernel driver");
-		/* try to continue */
-	}
-	wpa_printf(MSG_DEBUG, "Reconfigured interface %s", hapd->conf->iface);
-}
-
-
-static void hostapd_clear_old(struct hostapd_iface *iface)
-{
-	size_t j;
-
-	/*
-	 * Deauthenticate all stations since the new configuration may not
-	 * allow them to use the BSS anymore.
-	 */
-	for (j = 0; j < iface->num_bss; j++) {
-		hostapd_flush_old_stations(iface->bss[j],
-					   WLAN_REASON_PREV_AUTH_NOT_VALID);
-#ifdef CONFIG_WEP
-		hostapd_broadcast_wep_clear(iface->bss[j]);
-#endif /* CONFIG_WEP */
-
-#ifndef CONFIG_NO_RADIUS
-		/* TODO: update dynamic data based on changed configuration
-		 * items (e.g., open/close sockets, etc.) */
-		radius_client_flush(iface->bss[j]->radius, 0);
-#endif /* CONFIG_NO_RADIUS */
-	}
-}
-
-
-static int hostapd_iface_conf_changed(struct hostapd_config *newconf,
-				      struct hostapd_config *oldconf)
-{
-	size_t i;
-
-	if (newconf->num_bss != oldconf->num_bss)
-		return 1;
-
-	for (i = 0; i < newconf->num_bss; i++) {
-		if (os_strcmp(newconf->bss[i]->iface,
-			      oldconf->bss[i]->iface) != 0)
-			return 1;
-	}
-
-	return 0;
-}
-
-
-int hostapd_reload_config(struct hostapd_iface *iface)
-{
-	struct hapd_interfaces *interfaces = iface->interfaces;
-	struct hostapd_data *hapd = iface->bss[0];
-	struct hostapd_config *newconf, *oldconf;
-	size_t j;
-
-	if (iface->config_fname == NULL) {
-		/* Only in-memory config in use - assume it has been updated */
-		hostapd_clear_old(iface);
-		for (j = 0; j < iface->num_bss; j++)
-			hostapd_reload_bss(iface->bss[j]);
-		return 0;
-	}
-
-	if (iface->interfaces == NULL ||
-	    iface->interfaces->config_read_cb == NULL)
-		return -1;
-	newconf = iface->interfaces->config_read_cb(iface->config_fname);
-	if (newconf == NULL)
-		return -1;
-
-	hostapd_clear_old(iface);
-
-	oldconf = hapd->iconf;
-	if (hostapd_iface_conf_changed(newconf, oldconf)) {
-		char *fname;
-		int res;
-
-		wpa_printf(MSG_DEBUG,
-			   "Configuration changes include interface/BSS modification - force full disable+enable sequence");
-		fname = os_strdup(iface->config_fname);
-		if (!fname) {
-			hostapd_config_free(newconf);
-			return -1;
-		}
-		hostapd_remove_iface(interfaces, hapd->conf->iface);
-		iface = hostapd_init(interfaces, fname);
-		os_free(fname);
-		hostapd_config_free(newconf);
-		if (!iface) {
-			wpa_printf(MSG_ERROR,
-				   "Failed to initialize interface on config reload");
-			return -1;
-		}
-		iface->interfaces = interfaces;
-		interfaces->iface[interfaces->count] = iface;
-		interfaces->count++;
-		res = hostapd_enable_iface(iface);
-		if (res < 0)
-			wpa_printf(MSG_ERROR,
-				   "Failed to enable interface on config reload");
-		return res;
-	}
-	iface->conf = newconf;
-
-	for (j = 0; j < iface->num_bss; j++) {
-		hapd = iface->bss[j];
-		hapd->iconf = newconf;
-		hapd->iconf->channel = oldconf->channel;
-		hapd->iconf->acs = oldconf->acs;
-		hapd->iconf->secondary_channel = oldconf->secondary_channel;
-		hapd->iconf->ieee80211n = oldconf->ieee80211n;
-		hapd->iconf->ieee80211ac = oldconf->ieee80211ac;
-		hapd->iconf->ht_capab = oldconf->ht_capab;
-		hapd->iconf->vht_capab = oldconf->vht_capab;
-		hostapd_set_oper_chwidth(hapd->iconf,
-					 hostapd_get_oper_chwidth(oldconf));
-		hostapd_set_oper_centr_freq_seg0_idx(
-			hapd->iconf,
-			hostapd_get_oper_centr_freq_seg0_idx(oldconf));
-		hostapd_set_oper_centr_freq_seg1_idx(
-			hapd->iconf,
-			hostapd_get_oper_centr_freq_seg1_idx(oldconf));
-		hapd->conf = newconf->bss[j];
-		hostapd_reload_bss(hapd);
-	}
-
-	hostapd_config_free(oldconf);
-
-
-	return 0;
-}
-
-
-#ifdef CONFIG_WEP
-
-static void hostapd_broadcast_key_clear_iface(struct hostapd_data *hapd,
-					      const char *ifname)
-{
-	int i;
-
-	if (!ifname || !hapd->drv_priv)
-		return;
-	for (i = 0; i < NUM_WEP_KEYS; i++) {
-		if (hostapd_drv_set_key(ifname, hapd, WPA_ALG_NONE, NULL, i, 0,
-					0, NULL, 0, NULL, 0, KEY_FLAG_GROUP)) {
-			wpa_printf(MSG_DEBUG, "Failed to clear default "
-				   "encryption keys (ifname=%s keyidx=%d)",
-				   ifname, i);
-		}
-	}
-	if (hapd->conf->ieee80211w) {
-		for (i = NUM_WEP_KEYS; i < NUM_WEP_KEYS + 2; i++) {
-			if (hostapd_drv_set_key(ifname, hapd, WPA_ALG_NONE,
-						NULL, i, 0, 0, NULL,
-						0, NULL, 0, KEY_FLAG_GROUP)) {
-				wpa_printf(MSG_DEBUG, "Failed to clear "
-					   "default mgmt encryption keys "
-					   "(ifname=%s keyidx=%d)", ifname, i);
-			}
-		}
-	}
-}
-
-
-static int hostapd_broadcast_wep_clear(struct hostapd_data *hapd)
-{
-	hostapd_broadcast_key_clear_iface(hapd, hapd->conf->iface);
-	return 0;
-}
-
-
-static int hostapd_broadcast_wep_set(struct hostapd_data *hapd)
-{
-	int errors = 0, idx;
-	struct hostapd_ssid *ssid = &hapd->conf->ssid;
-
-	idx = ssid->wep.idx;
-	if (ssid->wep.default_len && ssid->wep.key[idx] &&
-	    hostapd_drv_set_key(hapd->conf->iface,
-				hapd, WPA_ALG_WEP, broadcast_ether_addr, idx, 0,
-				1, NULL, 0, ssid->wep.key[idx],
-				ssid->wep.len[idx],
-				KEY_FLAG_GROUP_RX_TX_DEFAULT)) {
-		wpa_printf(MSG_WARNING, "Could not set WEP encryption.");
-		errors++;
-	}
-
-	return errors;
-}
-
-#endif /* CONFIG_WEP */
-
-
-void hostapd_free_hapd_data(struct hostapd_data *hapd)
-{
-	os_free(hapd->probereq_cb);
-	hapd->probereq_cb = NULL;
-	hapd->num_probereq_cb = 0;
-
-#ifdef CONFIG_P2P
-	wpabuf_free(hapd->p2p_beacon_ie);
-	hapd->p2p_beacon_ie = NULL;
-	wpabuf_free(hapd->p2p_probe_resp_ie);
-	hapd->p2p_probe_resp_ie = NULL;
-#endif /* CONFIG_P2P */
-
-	if (!hapd->started) {
-		wpa_printf(MSG_ERROR, "%s: Interface %s wasn't started",
-			   __func__, hapd->conf ? hapd->conf->iface : "N/A");
-		return;
-	}
-	hapd->started = 0;
-	hapd->beacon_set_done = 0;
-
-	wpa_printf(MSG_DEBUG, "%s(%s)", __func__, hapd->conf->iface);
-	accounting_deinit(hapd);
-	hostapd_deinit_wpa(hapd);
-	vlan_deinit(hapd);
-	hostapd_acl_deinit(hapd);
-#ifndef CONFIG_NO_RADIUS
-	radius_client_deinit(hapd->radius);
-	hapd->radius = NULL;
-	radius_das_deinit(hapd->radius_das);
-	hapd->radius_das = NULL;
-#endif /* CONFIG_NO_RADIUS */
-
-	hostapd_deinit_wps(hapd);
-	ieee802_1x_dealloc_kay_sm_hapd(hapd);
-#ifdef CONFIG_DPP
-	hostapd_dpp_deinit(hapd);
-	gas_query_ap_deinit(hapd->gas);
-	hapd->gas = NULL;
-#endif /* CONFIG_DPP */
-
-	authsrv_deinit(hapd);
-
-	if (hapd->interface_added) {
-		hapd->interface_added = 0;
-		if (hostapd_if_remove(hapd, WPA_IF_AP_BSS, hapd->conf->iface)) {
-			wpa_printf(MSG_WARNING,
-				   "Failed to remove BSS interface %s",
-				   hapd->conf->iface);
-			hapd->interface_added = 1;
-		} else {
-			/*
-			 * Since this was a dynamically added interface, the
-			 * driver wrapper may have removed its internal instance
-			 * and hapd->drv_priv is not valid anymore.
-			 */
-			hapd->drv_priv = NULL;
-		}
-	}
-
-	wpabuf_free(hapd->time_adv);
-	hapd->time_adv = NULL;
-
-#ifdef CONFIG_INTERWORKING
-	gas_serv_deinit(hapd);
-#endif /* CONFIG_INTERWORKING */
-
-	bss_load_update_deinit(hapd);
-	ndisc_snoop_deinit(hapd);
-	dhcp_snoop_deinit(hapd);
-	x_snoop_deinit(hapd);
-
-#ifdef CONFIG_SQLITE
-	bin_clear_free(hapd->tmp_eap_user.identity,
-		       hapd->tmp_eap_user.identity_len);
-	bin_clear_free(hapd->tmp_eap_user.password,
-		       hapd->tmp_eap_user.password_len);
-	os_memset(&hapd->tmp_eap_user, 0, sizeof(hapd->tmp_eap_user));
-#endif /* CONFIG_SQLITE */
-
-#ifdef CONFIG_BRCM_VENDOR_IE
-	for (i = 0; i < MAX_VENDOR_IES; i++ ) {
-		wpabuf_free(hapd->vendor_ie[i]);
-		hapd->vendor_ie[i] = NULL;
-	}
-	wpabuf_free(hapd->vendor_ies);
-	hapd->vendor_ies = NULL;
-#endif /* CONFIG_BRCM_VENDOR_IE */
-#ifdef CONFIG_MESH
-	wpabuf_free(hapd->mesh_pending_auth);
-	hapd->mesh_pending_auth = NULL;
-	/* handling setup failure is already done */
-	hapd->setup_complete_cb = NULL;
-#endif /* CONFIG_MESH */
-
-	hostapd_clean_rrm(hapd);
-	fils_hlp_deinit(hapd);
-
-#ifdef CONFIG_OCV
-	eloop_cancel_timeout(hostapd_ocv_check_csa_sa_query, hapd, NULL);
-#endif /* CONFIG_OCV */
-
-#ifdef CONFIG_SAE
-	{
-		struct hostapd_sae_commit_queue *q;
-
-		while ((q = dl_list_first(&hapd->sae_commit_queue,
-					  struct hostapd_sae_commit_queue,
-					  list))) {
-			dl_list_del(&q->list);
-			os_free(q);
-		}
-	}
-	eloop_cancel_timeout(auth_sae_process_commit, hapd, NULL);
-#endif /* CONFIG_SAE */
-}
-
-
-/**
- * hostapd_cleanup - Per-BSS cleanup (deinitialization)
- * @hapd: Pointer to BSS data
- *
- * This function is used to free all per-BSS data structures and resources.
- * Most of the modules that are initialized in hostapd_setup_bss() are
- * deinitialized here.
- */
-static void hostapd_cleanup(struct hostapd_data *hapd)
-{
-	wpa_printf(MSG_DEBUG, "%s(hapd=%p (%s))", __func__, hapd,
-		   hapd->conf ? hapd->conf->iface : "N/A");
-	if (hapd->iface->interfaces &&
-	    hapd->iface->interfaces->ctrl_iface_deinit) {
-		wpa_msg(hapd->msg_ctx, MSG_INFO, WPA_EVENT_TERMINATING);
-		hapd->iface->interfaces->ctrl_iface_deinit(hapd);
-	}
-	hostapd_free_hapd_data(hapd);
-}
-
-
-static void sta_track_deinit(struct hostapd_iface *iface)
-{
-	struct hostapd_sta_info *info;
-
-	if (!iface->num_sta_seen)
-		return;
-
-	while ((info = dl_list_first(&iface->sta_seen, struct hostapd_sta_info,
-				     list))) {
-		dl_list_del(&info->list);
-		iface->num_sta_seen--;
-		sta_track_del(info);
-	}
-}
-
-
-void hostapd_cleanup_iface_partial(struct hostapd_iface *iface)
-{
-	wpa_printf(MSG_DEBUG, "%s(%p)", __func__, iface);
-#ifdef NEED_AP_MLME
-	hostapd_stop_setup_timers(iface);
-#endif /* NEED_AP_MLME */
-	if (iface->current_mode)
-		acs_cleanup(iface);
-	hostapd_free_hw_features(iface->hw_features, iface->num_hw_features);
-	iface->hw_features = NULL;
-	iface->current_mode = NULL;
-	os_free(iface->current_rates);
-	iface->current_rates = NULL;
-	os_free(iface->basic_rates);
-	iface->basic_rates = NULL;
-	ap_list_deinit(iface);
-	sta_track_deinit(iface);
-	airtime_policy_update_deinit(iface);
-}
-
-
-/**
- * hostapd_cleanup_iface - Complete per-interface cleanup
- * @iface: Pointer to interface data
- *
- * This function is called after per-BSS data structures are deinitialized
- * with hostapd_cleanup().
- */
-static void hostapd_cleanup_iface(struct hostapd_iface *iface)
-{
-	wpa_printf(MSG_DEBUG, "%s(%p)", __func__, iface);
-	eloop_cancel_timeout(channel_list_update_timeout, iface, NULL);
-	eloop_cancel_timeout(hostapd_interface_setup_failure_handler, iface,
-			     NULL);
-
-	hostapd_cleanup_iface_partial(iface);
-	hostapd_config_free(iface->conf);
-	iface->conf = NULL;
-
-	os_free(iface->config_fname);
-	os_free(iface->bss);
-	wpa_printf(MSG_DEBUG, "%s: free iface=%p", __func__, iface);
-	os_free(iface);
-}
-
-
-#ifdef CONFIG_WEP
-
-static void hostapd_clear_wep(struct hostapd_data *hapd)
-{
-	if (hapd->drv_priv && !hapd->iface->driver_ap_teardown && hapd->conf) {
-		hostapd_set_privacy(hapd, 0);
-		hostapd_broadcast_wep_clear(hapd);
-	}
-}
-
-
-static int hostapd_setup_encryption(char *iface, struct hostapd_data *hapd)
-{
-	int i;
-
-	hostapd_broadcast_wep_set(hapd);
-
-	if (hapd->conf->ssid.wep.default_len) {
-		hostapd_set_privacy(hapd, 1);
-		return 0;
-	}
-
-	/*
-	 * When IEEE 802.1X is not enabled, the driver may need to know how to
-	 * set authentication algorithms for static WEP.
-	 */
-	hostapd_drv_set_authmode(hapd, hapd->conf->auth_algs);
-
-	for (i = 0; i < 4; i++) {
-		if (hapd->conf->ssid.wep.key[i] &&
-		    hostapd_drv_set_key(iface, hapd, WPA_ALG_WEP, NULL, i, 0,
-					i == hapd->conf->ssid.wep.idx, NULL, 0,
-					hapd->conf->ssid.wep.key[i],
-					hapd->conf->ssid.wep.len[i],
-					i == hapd->conf->ssid.wep.idx ?
-					KEY_FLAG_GROUP_RX_TX_DEFAULT :
-					KEY_FLAG_GROUP_RX_TX)) {
-			wpa_printf(MSG_WARNING, "Could not set WEP "
-				   "encryption.");
-			return -1;
-		}
-		if (hapd->conf->ssid.wep.key[i] &&
-		    i == hapd->conf->ssid.wep.idx)
-			hostapd_set_privacy(hapd, 1);
-	}
-
-	return 0;
-}
-
-#endif /* CONFIG_WEP */
-
-
-static int hostapd_flush_old_stations(struct hostapd_data *hapd, u16 reason)
-{
-	int ret = 0;
-	u8 addr[ETH_ALEN];
-
-	if (hostapd_drv_none(hapd) || hapd->drv_priv == NULL)
-		return 0;
-
-	if (!hapd->iface->driver_ap_teardown) {
-		wpa_dbg(hapd->msg_ctx, MSG_DEBUG,
-			"Flushing old station entries");
-
-		if (hostapd_flush(hapd)) {
-			wpa_msg(hapd->msg_ctx, MSG_WARNING,
-				"Could not connect to kernel driver");
-			ret = -1;
-		}
-	}
-	if (hapd->conf && hapd->conf->broadcast_deauth) {
-		wpa_dbg(hapd->msg_ctx, MSG_DEBUG,
-			"Deauthenticate all stations");
-		os_memset(addr, 0xff, ETH_ALEN);
-		hostapd_drv_sta_deauth(hapd, addr, reason);
-	}
-	hostapd_free_stas(hapd);
-
-	return ret;
-}
-
-
-void hostapd_bss_deinit_no_free(struct hostapd_data *hapd)
-{
-	hostapd_free_stas(hapd);
-	hostapd_flush_old_stations(hapd, WLAN_REASON_DEAUTH_LEAVING);
-#ifdef CONFIG_WEP
-	hostapd_clear_wep(hapd);
-#endif /* CONFIG_WEP */
-}
-
-
-/**
- * hostapd_validate_bssid_configuration - Validate BSSID configuration
- * @iface: Pointer to interface data
- * Returns: 0 on success, -1 on failure
- *
- * This function is used to validate that the configured BSSIDs are valid.
- */
-static int hostapd_validate_bssid_configuration(struct hostapd_iface *iface)
-{
-	u8 mask[ETH_ALEN] = { 0 };
-	struct hostapd_data *hapd = iface->bss[0];
-	unsigned int i = iface->conf->num_bss, bits = 0, j;
-	int auto_addr = 0;
-
-	if (hostapd_drv_none(hapd))
-		return 0;
-
-	if (iface->conf->use_driver_iface_addr)
-		return 0;
-
-	/* Generate BSSID mask that is large enough to cover the BSSIDs. */
-
-	/* Determine the bits necessary to cover the number of BSSIDs. */
-	for (i--; i; i >>= 1)
-		bits++;
-
-	/* Determine the bits necessary to any configured BSSIDs,
-	   if they are higher than the number of BSSIDs. */
-	for (j = 0; j < iface->conf->num_bss; j++) {
-		if (is_zero_ether_addr(iface->conf->bss[j]->bssid)) {
-			if (j)
-				auto_addr++;
-			continue;
-		}
-
-		for (i = 0; i < ETH_ALEN; i++) {
-			mask[i] |=
-				iface->conf->bss[j]->bssid[i] ^
-				hapd->own_addr[i];
-		}
-	}
-
-	if (!auto_addr)
-		goto skip_mask_ext;
-
-	for (i = 0; i < ETH_ALEN && mask[i] == 0; i++)
-		;
-	j = 0;
-	if (i < ETH_ALEN) {
-		j = (5 - i) * 8;
-
-		while (mask[i] != 0) {
-			mask[i] >>= 1;
-			j++;
-		}
-	}
-
-	if (bits < j)
-		bits = j;
-
-	if (bits > 40) {
-		wpa_printf(MSG_ERROR, "Too many bits in the BSSID mask (%u)",
-			   bits);
-		return -1;
-	}
-
-	os_memset(mask, 0xff, ETH_ALEN);
-	j = bits / 8;
-	for (i = 5; i > 5 - j; i--)
-		mask[i] = 0;
-	j = bits % 8;
-	while (j) {
-		j--;
-		mask[i] <<= 1;
-	}
-
-skip_mask_ext:
-	wpa_printf(MSG_DEBUG, "BSS count %lu, BSSID mask " MACSTR " (%d bits)",
-		   (unsigned long) iface->conf->num_bss, MAC2STR(mask), bits);
-
-	if (!auto_addr)
-		return 0;
-
-	for (i = 0; i < ETH_ALEN; i++) {
-		if ((hapd->own_addr[i] & mask[i]) != hapd->own_addr[i]) {
-			wpa_printf(MSG_ERROR, "Invalid BSSID mask " MACSTR
-				   " for start address " MACSTR ".",
-				   MAC2STR(mask), MAC2STR(hapd->own_addr));
-			wpa_printf(MSG_ERROR, "Start address must be the "
-				   "first address in the block (i.e., addr "
-				   "AND mask == addr).");
-			return -1;
-		}
-	}
-
-	return 0;
-}
-
-
-static int mac_in_conf(struct hostapd_config *conf, const void *a)
-{
-	size_t i;
-
-	for (i = 0; i < conf->num_bss; i++) {
-		if (hostapd_mac_comp(conf->bss[i]->bssid, a) == 0) {
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-
-#ifndef CONFIG_NO_RADIUS
-
-static int hostapd_das_nas_mismatch(struct hostapd_data *hapd,
-				    struct radius_das_attrs *attr)
-{
-	if (attr->nas_identifier &&
-	    (!hapd->conf->nas_identifier ||
-	     os_strlen(hapd->conf->nas_identifier) !=
-	     attr->nas_identifier_len ||
-	     os_memcmp(hapd->conf->nas_identifier, attr->nas_identifier,
-		       attr->nas_identifier_len) != 0)) {
-		wpa_printf(MSG_DEBUG, "RADIUS DAS: NAS-Identifier mismatch");
-		return 1;
-	}
-
-	if (attr->nas_ip_addr &&
-	    (hapd->conf->own_ip_addr.af != AF_INET ||
-	     os_memcmp(&hapd->conf->own_ip_addr.u.v4, attr->nas_ip_addr, 4) !=
-	     0)) {
-		wpa_printf(MSG_DEBUG, "RADIUS DAS: NAS-IP-Address mismatch");
-		return 1;
-	}
-
-#ifdef CONFIG_IPV6
-	if (attr->nas_ipv6_addr &&
-	    (hapd->conf->own_ip_addr.af != AF_INET6 ||
-	     os_memcmp(&hapd->conf->own_ip_addr.u.v6, attr->nas_ipv6_addr, 16)
-	     != 0)) {
-		wpa_printf(MSG_DEBUG, "RADIUS DAS: NAS-IPv6-Address mismatch");
-		return 1;
-	}
-#endif /* CONFIG_IPV6 */
-
-	return 0;
-}
-
-
-static struct sta_info * hostapd_das_find_sta(struct hostapd_data *hapd,
-					      struct radius_das_attrs *attr,
-					      int *multi)
-{
-	struct sta_info *selected, *sta;
-	char buf[128];
-	int num_attr = 0;
-	int count;
-
-	*multi = 0;
-
-	for (sta = hapd->sta_list; sta; sta = sta->next)
-		sta->radius_das_match = 1;
-
-	if (attr->sta_addr) {
-		num_attr++;
-		sta = ap_get_sta(hapd, attr->sta_addr);
-		if (!sta) {
-			wpa_printf(MSG_DEBUG,
-				   "RADIUS DAS: No Calling-Station-Id match");
-			return NULL;
-		}
-
-		selected = sta;
-		for (sta = hapd->sta_list; sta; sta = sta->next) {
-			if (sta != selected)
-				sta->radius_das_match = 0;
-		}
-		wpa_printf(MSG_DEBUG, "RADIUS DAS: Calling-Station-Id match");
-	}
-
-	if (attr->acct_session_id) {
-		num_attr++;
-		if (attr->acct_session_id_len != 16) {
-			wpa_printf(MSG_DEBUG,
-				   "RADIUS DAS: Acct-Session-Id cannot match");
-			return NULL;
-		}
-		count = 0;
-
-		for (sta = hapd->sta_list; sta; sta = sta->next) {
-			if (!sta->radius_das_match)
-				continue;
-			os_snprintf(buf, sizeof(buf), "%016llX",
-				    (unsigned long long) sta->acct_session_id);
-			if (os_memcmp(attr->acct_session_id, buf, 16) != 0)
-				sta->radius_das_match = 0;
-			else
-				count++;
-		}
-
-		if (count == 0) {
-			wpa_printf(MSG_DEBUG,
-				   "RADIUS DAS: No matches remaining after Acct-Session-Id check");
-			return NULL;
-		}
-		wpa_printf(MSG_DEBUG, "RADIUS DAS: Acct-Session-Id match");
-	}
-
-	if (attr->acct_multi_session_id) {
-		num_attr++;
-		if (attr->acct_multi_session_id_len != 16) {
-			wpa_printf(MSG_DEBUG,
-				   "RADIUS DAS: Acct-Multi-Session-Id cannot match");
-			return NULL;
-		}
-		count = 0;
-
-		for (sta = hapd->sta_list; sta; sta = sta->next) {
-			if (!sta->radius_das_match)
-				continue;
-			if (!sta->eapol_sm ||
-			    !sta->eapol_sm->acct_multi_session_id) {
-				sta->radius_das_match = 0;
-				continue;
-			}
-			os_snprintf(buf, sizeof(buf), "%016llX",
-				    (unsigned long long)
-				    sta->eapol_sm->acct_multi_session_id);
-			if (os_memcmp(attr->acct_multi_session_id, buf, 16) !=
-			    0)
-				sta->radius_das_match = 0;
-			else
-				count++;
-		}
-
-		if (count == 0) {
-			wpa_printf(MSG_DEBUG,
-				   "RADIUS DAS: No matches remaining after Acct-Multi-Session-Id check");
-			return NULL;
-		}
-		wpa_printf(MSG_DEBUG,
-			   "RADIUS DAS: Acct-Multi-Session-Id match");
-	}
-
-	if (attr->cui) {
-		num_attr++;
-		count = 0;
-
-		for (sta = hapd->sta_list; sta; sta = sta->next) {
-			struct wpabuf *cui;
-
-			if (!sta->radius_das_match)
-				continue;
-			cui = ieee802_1x_get_radius_cui(sta->eapol_sm);
-			if (!cui || wpabuf_len(cui) != attr->cui_len ||
-			    os_memcmp(wpabuf_head(cui), attr->cui,
-				      attr->cui_len) != 0)
-				sta->radius_das_match = 0;
-			else
-				count++;
-		}
-
-		if (count == 0) {
-			wpa_printf(MSG_DEBUG,
-				   "RADIUS DAS: No matches remaining after Chargeable-User-Identity check");
-			return NULL;
-		}
-		wpa_printf(MSG_DEBUG,
-			   "RADIUS DAS: Chargeable-User-Identity match");
-	}
-
-	if (attr->user_name) {
-		num_attr++;
-		count = 0;
-
-		for (sta = hapd->sta_list; sta; sta = sta->next) {
-			u8 *identity;
-			size_t identity_len;
-
-			if (!sta->radius_das_match)
-				continue;
-			identity = ieee802_1x_get_identity(sta->eapol_sm,
-							   &identity_len);
-			if (!identity ||
-			    identity_len != attr->user_name_len ||
-			    os_memcmp(identity, attr->user_name, identity_len)
-			    != 0)
-				sta->radius_das_match = 0;
-			else
-				count++;
-		}
-
-		if (count == 0) {
-			wpa_printf(MSG_DEBUG,
-				   "RADIUS DAS: No matches remaining after User-Name check");
-			return NULL;
-		}
-		wpa_printf(MSG_DEBUG,
-			   "RADIUS DAS: User-Name match");
-	}
-
-	if (num_attr == 0) {
-		/*
-		 * In theory, we could match all current associations, but it
-		 * seems safer to just reject requests that do not include any
-		 * session identification attributes.
-		 */
-		wpa_printf(MSG_DEBUG,
-			   "RADIUS DAS: No session identification attributes included");
-		return NULL;
-	}
-
-	selected = NULL;
-	for (sta = hapd->sta_list; sta; sta = sta->next) {
-		if (sta->radius_das_match) {
-			if (selected) {
-				*multi = 1;
-				return NULL;
-			}
-			selected = sta;
-		}
-	}
-
-	return selected;
-}
-
-
-static int hostapd_das_disconnect_pmksa(struct hostapd_data *hapd,
-					struct radius_das_attrs *attr)
-{
-	if (!hapd->wpa_auth)
-		return -1;
-	return wpa_auth_radius_das_disconnect_pmksa(hapd->wpa_auth, attr);
-}
-
-
-static enum radius_das_res
-hostapd_das_disconnect(void *ctx, struct radius_das_attrs *attr)
-{
-	struct hostapd_data *hapd = ctx;
-	struct sta_info *sta;
-	int multi;
-
-	if (hostapd_das_nas_mismatch(hapd, attr))
-		return RADIUS_DAS_NAS_MISMATCH;
-
-	sta = hostapd_das_find_sta(hapd, attr, &multi);
-	if (sta == NULL) {
-		if (multi) {
-			wpa_printf(MSG_DEBUG,
-				   "RADIUS DAS: Multiple sessions match - not supported");
-			return RADIUS_DAS_MULTI_SESSION_MATCH;
-		}
-		if (hostapd_das_disconnect_pmksa(hapd, attr) == 0) {
-			wpa_printf(MSG_DEBUG,
-				   "RADIUS DAS: PMKSA cache entry matched");
-			return RADIUS_DAS_SUCCESS;
-		}
-		wpa_printf(MSG_DEBUG, "RADIUS DAS: No matching session found");
-		return RADIUS_DAS_SESSION_NOT_FOUND;
-	}
-
-	wpa_printf(MSG_DEBUG, "RADIUS DAS: Found a matching session " MACSTR
-		   " - disconnecting", MAC2STR(sta->addr));
-	wpa_auth_pmksa_remove(hapd->wpa_auth, sta->addr);
-
-	hostapd_drv_sta_deauth(hapd, sta->addr,
-			       WLAN_REASON_PREV_AUTH_NOT_VALID);
-	ap_sta_deauthenticate(hapd, sta, WLAN_REASON_PREV_AUTH_NOT_VALID);
-
-	return RADIUS_DAS_SUCCESS;
-}
-
-
-#ifdef CONFIG_HS20
-static enum radius_das_res
-hostapd_das_coa(void *ctx, struct radius_das_attrs *attr)
-{
-	struct hostapd_data *hapd = ctx;
-	struct sta_info *sta;
-	int multi;
-
-	if (hostapd_das_nas_mismatch(hapd, attr))
-		return RADIUS_DAS_NAS_MISMATCH;
-
-	sta = hostapd_das_find_sta(hapd, attr, &multi);
-	if (!sta) {
-		if (multi) {
-			wpa_printf(MSG_DEBUG,
-				   "RADIUS DAS: Multiple sessions match - not supported");
-			return RADIUS_DAS_MULTI_SESSION_MATCH;
-		}
-		wpa_printf(MSG_DEBUG, "RADIUS DAS: No matching session found");
-		return RADIUS_DAS_SESSION_NOT_FOUND;
-	}
-
-	wpa_printf(MSG_DEBUG, "RADIUS DAS: Found a matching session " MACSTR
-		   " - CoA", MAC2STR(sta->addr));
-
-	if (attr->hs20_t_c_filtering) {
-		if (attr->hs20_t_c_filtering[0] & BIT(0)) {
-			wpa_printf(MSG_DEBUG,
-				   "HS 2.0: Unexpected Terms and Conditions filtering required in CoA-Request");
-			return RADIUS_DAS_COA_FAILED;
-		}
-
-		hs20_t_c_filtering(hapd, sta, 0);
-	}
-
-	return RADIUS_DAS_SUCCESS;
-}
-#else /* CONFIG_HS20 */
-#define hostapd_das_coa NULL
-#endif /* CONFIG_HS20 */
-
-
-#ifdef CONFIG_SQLITE
-
-static int db_table_exists(sqlite3 *db, const char *name)
-{
-	char cmd[128];
-
-	os_snprintf(cmd, sizeof(cmd), "SELECT 1 FROM %s;", name);
-	return sqlite3_exec(db, cmd, NULL, NULL, NULL) == SQLITE_OK;
-}
-
-
-static int db_table_create_radius_attributes(sqlite3 *db)
-{
-	char *err = NULL;
-	const char *sql =
-		"CREATE TABLE radius_attributes("
-		" id INTEGER PRIMARY KEY,"
-		" sta TEXT,"
-		" reqtype TEXT,"
-		" attr TEXT"
-		");"
-		"CREATE INDEX idx_sta_reqtype ON radius_attributes(sta,reqtype);";
-
-	wpa_printf(MSG_DEBUG,
-		   "Adding database table for RADIUS attribute information");
-	if (sqlite3_exec(db, sql, NULL, NULL, &err) != SQLITE_OK) {
-		wpa_printf(MSG_ERROR, "SQLite error: %s", err);
-		sqlite3_free(err);
-		return -1;
-	}
-
-	return 0;
-}
-
-#endif /* CONFIG_SQLITE */
-
-#endif /* CONFIG_NO_RADIUS */
-
-
-/**
- * hostapd_setup_bss - Per-BSS setup (initialization)
- * @hapd: Pointer to BSS data
- * @first: Whether this BSS is the first BSS of an interface; -1 = not first,
- *	but interface may exist
- *
- * This function is used to initialize all per-BSS data structures and
- * resources. This gets called in a loop for each BSS when an interface is
- * initialized. Most of the modules that are initialized here will be
- * deinitialized in hostapd_cleanup().
- */
-static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
-{
-	struct hostapd_bss_config *conf = hapd->conf;
-	u8 ssid[SSID_MAX_LEN + 1];
-	int ssid_len, set_ssid;
-	char force_ifname[IFNAMSIZ];
-	u8 if_addr[ETH_ALEN];
-	int flush_old_stations = 1;
-
-	wpa_printf(MSG_DEBUG, "%s(hapd=%p (%s), first=%d)",
-		   __func__, hapd, conf->iface, first);
-
-#ifdef EAP_SERVER_TNC
-	if (conf->tnc && tncs_global_init() < 0) {
-		wpa_printf(MSG_ERROR, "Failed to initialize TNCS");
-		return -1;
-	}
-#endif /* EAP_SERVER_TNC */
-
-	if (hapd->started) {
-		wpa_printf(MSG_ERROR, "%s: Interface %s was already started",
-			   __func__, conf->iface);
-		return -1;
-	}
-	hapd->started = 1;
-
-	if (!first || first == -1) {
-		u8 *addr = hapd->own_addr;
-
-		if (!is_zero_ether_addr(conf->bssid)) {
-			/* Allocate the configured BSSID. */
-			os_memcpy(hapd->own_addr, conf->bssid, ETH_ALEN);
-
-			if (hostapd_mac_comp(hapd->own_addr,
-					     hapd->iface->bss[0]->own_addr) ==
-			    0) {
-				wpa_printf(MSG_ERROR, "BSS '%s' may not have "
-					   "BSSID set to the MAC address of "
-					   "the radio", conf->iface);
-				return -1;
-			}
-		} else if (hapd->iconf->use_driver_iface_addr) {
-			addr = NULL;
-		} else {
-			/* Allocate the next available BSSID. */
-			do {
-				inc_byte_array(hapd->own_addr, ETH_ALEN);
-			} while (mac_in_conf(hapd->iconf, hapd->own_addr));
-		}
-
-		hapd->interface_added = 1;
-		if (hostapd_if_add(hapd->iface->bss[0], WPA_IF_AP_BSS,
-				   conf->iface, addr, hapd,
-				   &hapd->drv_priv, force_ifname, if_addr,
-				   conf->bridge[0] ? conf->bridge : NULL,
-				   first == -1)) {
-			wpa_printf(MSG_ERROR, "Failed to add BSS (BSSID="
-				   MACSTR ")", MAC2STR(hapd->own_addr));
-			hapd->interface_added = 0;
-			return -1;
-		}
-
-		if (!addr)
-			os_memcpy(hapd->own_addr, if_addr, ETH_ALEN);
-	}
-
-	if (conf->wmm_enabled < 0)
-		conf->wmm_enabled = hapd->iconf->ieee80211n |
-			hapd->iconf->ieee80211ax;
-
-#ifdef CONFIG_IEEE80211R_AP
-	if (is_zero_ether_addr(conf->r1_key_holder))
-		os_memcpy(conf->r1_key_holder, hapd->own_addr, ETH_ALEN);
-#endif /* CONFIG_IEEE80211R_AP */
-
-#ifdef CONFIG_MESH
-	if ((hapd->conf->mesh & MESH_ENABLED) && hapd->iface->mconf == NULL)
-		flush_old_stations = 0;
-#endif /* CONFIG_MESH */
-
-	if (flush_old_stations)
-		hostapd_flush(hapd);
-	hostapd_set_privacy(hapd, 0);
-
-#ifdef CONFIG_WEP
-	if (!hostapd_drv_nl80211(hapd))
-		hostapd_broadcast_wep_clear(hapd);
-	if (hostapd_setup_encryption(conf->iface, hapd))
-		return -1;
-#endif /* CONFIG_WEP */
-
-	/*
-	 * Fetch the SSID from the system and use it or,
-	 * if one was specified in the config file, verify they
-	 * match.
-	 */
-	ssid_len = hostapd_get_ssid(hapd, ssid, sizeof(ssid));
-	if (ssid_len < 0) {
-		wpa_printf(MSG_ERROR, "Could not read SSID from system");
-		return -1;
-	}
-	if (conf->ssid.ssid_set) {
-		/*
-		 * If SSID is specified in the config file and it differs
-		 * from what is being used then force installation of the
-		 * new SSID.
-		 */
-		set_ssid = (conf->ssid.ssid_len != (size_t) ssid_len ||
-			    os_memcmp(conf->ssid.ssid, ssid, ssid_len) != 0);
-	} else {
-		/*
-		 * No SSID in the config file; just use the one we got
-		 * from the system.
-		 */
-		set_ssid = 0;
-		conf->ssid.ssid_len = ssid_len;
-		os_memcpy(conf->ssid.ssid, ssid, conf->ssid.ssid_len);
-	}
-
-	/*
-	 * Short SSID calculation is identical to FCS and it is defined in
-	 * IEEE P802.11-REVmd/D3.0, 9.4.2.170.3 (Calculating the Short-SSID).
-	 */
-	conf->ssid.short_ssid = crc32(conf->ssid.ssid, conf->ssid.ssid_len);
-
-	if (!hostapd_drv_none(hapd)) {
-		wpa_printf(MSG_DEBUG, "Using interface %s with hwaddr " MACSTR
-			   " and ssid \"%s\"",
-			   conf->iface, MAC2STR(hapd->own_addr),
-			   wpa_ssid_txt(conf->ssid.ssid, conf->ssid.ssid_len));
-	}
-
-	if (hostapd_setup_wpa_psk(conf)) {
-		wpa_printf(MSG_ERROR, "WPA-PSK setup failed.");
-		return -1;
-	}
-
-	/* Set SSID for the kernel driver (to be used in beacon and probe
-	 * response frames) */
-	if (set_ssid && hostapd_set_ssid(hapd, conf->ssid.ssid,
-					 conf->ssid.ssid_len)) {
-		wpa_printf(MSG_ERROR, "Could not set SSID for kernel driver");
-		return -1;
-	}
-
-	if (wpa_debug_level <= MSG_MSGDUMP)
-		conf->radius->msg_dumps = 1;
-#ifndef CONFIG_NO_RADIUS
-
-#ifdef CONFIG_SQLITE
-	if (conf->radius_req_attr_sqlite) {
-		if (sqlite3_open(conf->radius_req_attr_sqlite,
-				 &hapd->rad_attr_db)) {
-			wpa_printf(MSG_ERROR, "Could not open SQLite file '%s'",
-				   conf->radius_req_attr_sqlite);
-			return -1;
-		}
-
-		wpa_printf(MSG_DEBUG, "Opening RADIUS attribute database: %s",
-			   conf->radius_req_attr_sqlite);
-		if (!db_table_exists(hapd->rad_attr_db, "radius_attributes") &&
-		    db_table_create_radius_attributes(hapd->rad_attr_db) < 0)
-			return -1;
-	}
-#endif /* CONFIG_SQLITE */
-
-	hapd->radius = radius_client_init(hapd, conf->radius);
-	if (hapd->radius == NULL) {
-		wpa_printf(MSG_ERROR, "RADIUS client initialization failed.");
-		return -1;
-	}
-
-	if (conf->radius_das_port) {
-		struct radius_das_conf das_conf;
-		os_memset(&das_conf, 0, sizeof(das_conf));
-		das_conf.port = conf->radius_das_port;
-		das_conf.shared_secret = conf->radius_das_shared_secret;
-		das_conf.shared_secret_len =
-			conf->radius_das_shared_secret_len;
-		das_conf.client_addr = &conf->radius_das_client_addr;
-		das_conf.time_window = conf->radius_das_time_window;
-		das_conf.require_event_timestamp =
-			conf->radius_das_require_event_timestamp;
-		das_conf.require_message_authenticator =
-			conf->radius_das_require_message_authenticator;
-		das_conf.ctx = hapd;
-		das_conf.disconnect = hostapd_das_disconnect;
-		das_conf.coa = hostapd_das_coa;
-		hapd->radius_das = radius_das_init(&das_conf);
-		if (hapd->radius_das == NULL) {
-			wpa_printf(MSG_ERROR, "RADIUS DAS initialization "
-				   "failed.");
-			return -1;
-		}
-	}
-#endif /* CONFIG_NO_RADIUS */
-
-	if (hostapd_acl_init(hapd)) {
-		wpa_printf(MSG_ERROR, "ACL initialization failed.");
-		return -1;
-	}
-	if (hostapd_init_wps(hapd, conf))
-		return -1;
-
-#ifdef CONFIG_DPP
-	hapd->gas = gas_query_ap_init(hapd, hapd->msg_ctx);
-	if (!hapd->gas)
-		return -1;
-	if (hostapd_dpp_init(hapd))
-		return -1;
-#endif /* CONFIG_DPP */
-
-	if (authsrv_init(hapd) < 0)
-		return -1;
-
-	if (ieee802_1x_init(hapd)) {
-		wpa_printf(MSG_ERROR, "IEEE 802.1X initialization failed.");
-		return -1;
-	}
-
-	if ((conf->wpa || conf->osen) && hostapd_setup_wpa(hapd))
-		return -1;
-
-	if (accounting_init(hapd)) {
-		wpa_printf(MSG_ERROR, "Accounting initialization failed.");
-		return -1;
-	}
-
-#ifdef CONFIG_INTERWORKING
-	if (gas_serv_init(hapd)) {
-		wpa_printf(MSG_ERROR, "GAS server initialization failed");
-		return -1;
-	}
-
-	if (conf->qos_map_set_len &&
-	    hostapd_drv_set_qos_map(hapd, conf->qos_map_set,
-				    conf->qos_map_set_len)) {
-		wpa_printf(MSG_ERROR, "Failed to initialize QoS Map");
-		return -1;
-	}
-#endif /* CONFIG_INTERWORKING */
-
-	if (conf->bss_load_update_period && bss_load_update_init(hapd)) {
-		wpa_printf(MSG_ERROR, "BSS Load initialization failed");
-		return -1;
-	}
-
-	if (conf->proxy_arp) {
-		if (x_snoop_init(hapd)) {
-			wpa_printf(MSG_ERROR,
-				   "Generic snooping infrastructure initialization failed");
-			return -1;
-		}
-
-		if (dhcp_snoop_init(hapd)) {
-			wpa_printf(MSG_ERROR,
-				   "DHCP snooping initialization failed");
-			return -1;
-		}
-
-		if (ndisc_snoop_init(hapd)) {
-			wpa_printf(MSG_ERROR,
-				   "Neighbor Discovery snooping initialization failed");
-			return -1;
-		}
-	}
-
-	if (!hostapd_drv_none(hapd) && vlan_init(hapd)) {
-		wpa_printf(MSG_ERROR, "VLAN initialization failed.");
-		return -1;
-	}
-
-	if (!conf->start_disabled && ieee802_11_set_beacon(hapd) < 0)
-		return -1;
-
-	if (flush_old_stations && !conf->start_disabled &&
-	    conf->broadcast_deauth) {
-		u8 addr[ETH_ALEN];
-
-		/* Should any previously associated STA not have noticed that
-		 * the AP had stopped and restarted, send one more
-		 * deauthentication notification now that the AP is ready to
-		 * operate. */
-		wpa_dbg(hapd->msg_ctx, MSG_DEBUG,
-			"Deauthenticate all stations at BSS start");
-		os_memset(addr, 0xff, ETH_ALEN);
-		hostapd_drv_sta_deauth(hapd, addr,
-				       WLAN_REASON_PREV_AUTH_NOT_VALID);
-	}
-
-	if (hapd->wpa_auth && wpa_init_keys(hapd->wpa_auth) < 0)
-		return -1;
-
-	if (hapd->driver && hapd->driver->set_operstate)
-		hapd->driver->set_operstate(hapd->drv_priv, 1);
-
-	return 0;
-}
-
-
-static void hostapd_tx_queue_params(struct hostapd_iface *iface)
-{
-	struct hostapd_data *hapd = iface->bss[0];
-	int i;
-	struct hostapd_tx_queue_params *p;
-
-#ifdef CONFIG_MESH
-	if ((hapd->conf->mesh & MESH_ENABLED) && iface->mconf == NULL)
-		return;
-#endif /* CONFIG_MESH */
-
-	for (i = 0; i < NUM_TX_QUEUES; i++) {
-		p = &iface->conf->tx_queue[i];
-
-		if (hostapd_set_tx_queue_params(hapd, i, p->aifs, p->cwmin,
-						p->cwmax, p->burst)) {
-			wpa_printf(MSG_DEBUG, "Failed to set TX queue "
-				   "parameters for queue %d.", i);
-			/* Continue anyway */
-		}
-	}
-}
-
-
-static int hostapd_set_acl_list(struct hostapd_data *hapd,
-				struct mac_acl_entry *mac_acl,
-				int n_entries, u8 accept_acl)
-{
-	struct hostapd_acl_params *acl_params;
-	int i, err;
-
-	acl_params = os_zalloc(sizeof(*acl_params) +
-			       (n_entries * sizeof(acl_params->mac_acl[0])));
-	if (!acl_params)
-		return -ENOMEM;
-
-	for (i = 0; i < n_entries; i++)
-		os_memcpy(acl_params->mac_acl[i].addr, mac_acl[i].addr,
-			  ETH_ALEN);
-
-	acl_params->acl_policy = accept_acl;
-	acl_params->num_mac_acl = n_entries;
-
-	err = hostapd_drv_set_acl(hapd, acl_params);
-
-	os_free(acl_params);
-
-	return err;
-}
-
-
-static void hostapd_set_acl(struct hostapd_data *hapd)
-{
-	struct hostapd_config *conf = hapd->iconf;
-	int err;
-	u8 accept_acl;
-
-	if (hapd->iface->drv_max_acl_mac_addrs == 0)
-		return;
-
-	if (conf->bss[0]->macaddr_acl == DENY_UNLESS_ACCEPTED) {
-		accept_acl = 1;
-		err = hostapd_set_acl_list(hapd, conf->bss[0]->accept_mac,
-					   conf->bss[0]->num_accept_mac,
-					   accept_acl);
-		if (err) {
-			wpa_printf(MSG_DEBUG, "Failed to set accept acl");
-			return;
-		}
-	} else if (conf->bss[0]->macaddr_acl == ACCEPT_UNLESS_DENIED) {
-		accept_acl = 0;
-		err = hostapd_set_acl_list(hapd, conf->bss[0]->deny_mac,
-					   conf->bss[0]->num_deny_mac,
-					   accept_acl);
-		if (err) {
-			wpa_printf(MSG_DEBUG, "Failed to set deny acl");
-			return;
-		}
-	}
-}
-
-
-static int start_ctrl_iface_bss(struct hostapd_data *hapd)
-{
-	if (!hapd->iface->interfaces ||
-	    !hapd->iface->interfaces->ctrl_iface_init)
-		return 0;
-
-	if (hapd->iface->interfaces->ctrl_iface_init(hapd)) {
-		wpa_printf(MSG_ERROR,
-			   "Failed to setup control interface for %s",
-			   hapd->conf->iface);
-		return -1;
-	}
-
-	return 0;
-}
-
-
-static int start_ctrl_iface(struct hostapd_iface *iface)
-{
-	size_t i;
-
-	if (!iface->interfaces || !iface->interfaces->ctrl_iface_init)
-		return 0;
-
-	for (i = 0; i < iface->num_bss; i++) {
-		struct hostapd_data *hapd = iface->bss[i];
-		if (iface->interfaces->ctrl_iface_init(hapd)) {
-			wpa_printf(MSG_ERROR,
-				   "Failed to setup control interface for %s",
-				   hapd->conf->iface);
-			return -1;
-		}
-	}
-
-	return 0;
-}
-
-
-static void channel_list_update_timeout(void *eloop_ctx, void *timeout_ctx)
-{
-	struct hostapd_iface *iface = eloop_ctx;
-
-	if (!iface->wait_channel_update) {
-		wpa_printf(MSG_INFO, "Channel list update timeout, but interface was not waiting for it");
-		return;
-	}
-
-	/*
-	 * It is possible that the existing channel list is acceptable, so try
-	 * to proceed.
-	 */
-	wpa_printf(MSG_DEBUG, "Channel list update timeout - try to continue anyway");
-	setup_interface2(iface);
-}
-
-
-void hostapd_channel_list_updated(struct hostapd_iface *iface, int initiator)
-{
-	if (!iface->wait_channel_update || initiator != REGDOM_SET_BY_USER)
-		return;
-
-	wpa_printf(MSG_DEBUG, "Channel list updated - continue setup");
-	eloop_cancel_timeout(channel_list_update_timeout, iface, NULL);
-	setup_interface2(iface);
-}
-
-
-static int setup_interface(struct hostapd_iface *iface)
-{
-	struct hostapd_data *hapd = iface->bss[0];
-	size_t i;
-
-	/*
-	 * It is possible that setup_interface() is called after the interface
-	 * was disabled etc., in which case driver_ap_teardown is possibly set
-	 * to 1. Clear it here so any other key/station deletion, which is not
-	 * part of a teardown flow, would also call the relevant driver
-	 * callbacks.
-	 */
-	iface->driver_ap_teardown = 0;
-
-	if (!iface->phy[0]) {
-		const char *phy = hostapd_drv_get_radio_name(hapd);
-		if (phy) {
-			wpa_printf(MSG_DEBUG, "phy: %s", phy);
-			os_strlcpy(iface->phy, phy, sizeof(iface->phy));
-		}
-	}
-
-	/*
-	 * Make sure that all BSSes get configured with a pointer to the same
-	 * driver interface.
-	 */
-	for (i = 1; i < iface->num_bss; i++) {
-		iface->bss[i]->driver = hapd->driver;
-		iface->bss[i]->drv_priv = hapd->drv_priv;
-	}
-
-	if (hostapd_validate_bssid_configuration(iface))
-		return -1;
-
-	/*
-	 * Initialize control interfaces early to allow external monitoring of
-	 * channel setup operations that may take considerable amount of time
-	 * especially for DFS cases.
-	 */
-	if (start_ctrl_iface(iface))
-		return -1;
-
-	if (hapd->iconf->country[0] && hapd->iconf->country[1]) {
-		char country[4], previous_country[4];
-
-		hostapd_set_state(iface, HAPD_IFACE_COUNTRY_UPDATE);
-		if (hostapd_get_country(hapd, previous_country) < 0)
-			previous_country[0] = '\0';
-
-		os_memcpy(country, hapd->iconf->country, 3);
-		country[3] = '\0';
-		if (hostapd_set_country(hapd, country) < 0) {
-			wpa_printf(MSG_ERROR, "Failed to set country code");
-			return -1;
-		}
-
-		wpa_printf(MSG_DEBUG, "Previous country code %s, new country code %s",
-			   previous_country, country);
-
-		if (os_strncmp(previous_country, country, 2) != 0) {
-			wpa_printf(MSG_DEBUG, "Continue interface setup after channel list update");
-			iface->wait_channel_update = 1;
-			eloop_register_timeout(5, 0,
-					       channel_list_update_timeout,
-					       iface, NULL);
-			return 0;
-		}
-	}
-
-	return setup_interface2(iface);
-}
-
-
-static int configured_fixed_chan_to_freq(struct hostapd_iface *iface)
-{
-	int freq, i, j;
-
-	if (!iface->conf->channel)
-		return 0;
-	if (iface->conf->op_class) {
-		freq = ieee80211_chan_to_freq(NULL, iface->conf->op_class,
-					      iface->conf->channel);
-		if (freq < 0) {
-			wpa_printf(MSG_INFO,
-				   "Could not convert op_class %u channel %u to operating frequency",
-				   iface->conf->op_class, iface->conf->channel);
-			return -1;
-		}
-		iface->freq = freq;
-		return 0;
-	}
-
-	/* Old configurations using only 2.4/5/60 GHz bands may not specify the
-	 * op_class parameter. Select a matching channel from the configured
-	 * mode using the channel parameter for these cases.
-	 */
-	for (j = 0; j < iface->num_hw_features; j++) {
-		struct hostapd_hw_modes *mode = &iface->hw_features[j];
-
-		if (iface->conf->hw_mode != HOSTAPD_MODE_IEEE80211ANY &&
-		    iface->conf->hw_mode != mode->mode)
-			continue;
-		for (i = 0; i < mode->num_channels; i++) {
-			struct hostapd_channel_data *chan = &mode->channels[i];
-
-			if (chan->chan == iface->conf->channel &&
-			    !is_6ghz_freq(chan->freq)) {
-				iface->freq = chan->freq;
-				return 0;
-			}
-		}
-	}
-
-	wpa_printf(MSG_INFO, "Could not determine operating frequency");
-	return -1;
-}
-
-#ifndef CONFIG_ACS
-#ifdef CONFIG_BRCM_AUTOMOTIVE
-void bcm_private_acs(struct hostapd_iface *iface)
-{
-        char cmd[1024];
-        char reply[1024];
-        char *p = cmd;
-        struct hostapd_data *hapd;
-
-        hapd = iface->bss[0];
-        if (hapd == NULL) {
-                wpa_printf(MSG_ERROR, "Failed to get good channel hapd is null");
-                return;
-        }
-
-        memset(cmd, 0, sizeof(cmd));
-        memset(reply, 0, sizeof(reply));
-
-        memcpy(p, "HAPD_AUTO_CHANNEL", 17);
-        p += 17;
-
-        if ((iface->conf->hw_mode == HOSTAPD_MODE_IEEE80211G)
-                        ||  (iface->conf->hw_mode == HOSTAPD_MODE_IEEE80211B)) {
-                memcpy(p, " band=2g", 8);
-        }
-        else {
-                memcpy(p, " band=5g", 8);
-        }
-
-        wpa_printf(MSG_DEBUG, "cmd %s", cmd);
-
-        if (!hapd->driver->driver_cmd)
-                return ;
-
-        if (hapd->driver->driver_cmd(hapd->drv_priv, cmd, reply, sizeof(reply)) <= 0) {
-                wpa_printf(MSG_ERROR, "Failed to get good channel");
-                return;
-        }
-
-        iface->conf->channel = atoi(reply);
-        wpa_printf(MSG_DEBUG, "Channel selected by private ACS = %d", iface->conf->channel);
-        return ;
-}
-#endif
-#endif
-
-static void hostapd_set_6ghz_sec_chan(struct hostapd_iface *iface)
-{
-	int bw, seg0;
-
-	if (!is_6ghz_op_class(iface->conf->op_class))
-		return;
-
-	seg0 = hostapd_get_oper_centr_freq_seg0_idx(iface->conf);
-	bw = center_idx_to_bw_6ghz(seg0);
-	/* Assign the secondary channel if absent in config for
-	 * bandwidths > 20 MHz */
-	if (bw > 20 && !iface->conf->secondary_channel) {
-		if (((iface->conf->channel - 1) / 4) % 2)
-			iface->conf->secondary_channel = -1;
-		else
-			iface->conf->secondary_channel = 1;
-	}
-}
-
-
-static int setup_interface2(struct hostapd_iface *iface)
-{
-	iface->wait_channel_update = 0;
-
-	if (hostapd_get_hw_features(iface)) {
-		/* Not all drivers support this yet, so continue without hw
-		 * feature data. */
-	} else {
-#ifndef CONFIG_ACS
-#ifdef CONFIG_BRCM_AUTOMOTIVE
-                if(!iface->conf->channel)
-                        bcm_private_acs(iface);
-#endif
-#endif
-		int ret;
-
-		ret = configured_fixed_chan_to_freq(iface);
-		if (ret < 0)
-			goto fail;
-
-		if (iface->conf->op_class) {
-			int ch_width;
-
-			ch_width = op_class_to_ch_width(iface->conf->op_class);
-			hostapd_set_oper_chwidth(iface->conf, ch_width);
-			hostapd_set_6ghz_sec_chan(iface);
-		}
-
-		ret = hostapd_select_hw_mode(iface);
-		if (ret < 0) {
-			wpa_printf(MSG_ERROR, "Could not select hw_mode and "
-				   "channel. (%d)", ret);
-			goto fail;
-		}
-		if (ret == 1) {
-			wpa_printf(MSG_DEBUG, "Interface initialization will be completed in a callback (ACS)");
-			return 0;
-		}
-		ret = hostapd_check_edmg_capab(iface);
-		if (ret < 0)
-			goto fail;
-		ret = hostapd_check_he_6ghz_capab(iface);
-		if (ret < 0)
-			goto fail;
-		ret = hostapd_check_ht_capab(iface);
-		if (ret < 0)
-			goto fail;
-		if (ret == 1) {
-			wpa_printf(MSG_DEBUG, "Interface initialization will "
-				   "be completed in a callback");
-			return 0;
-		}
-
-		if (iface->conf->ieee80211h)
-			wpa_printf(MSG_DEBUG, "DFS support is enabled");
-	}
-	return hostapd_setup_interface_complete(iface, 0);
-
-fail:
-	hostapd_set_state(iface, HAPD_IFACE_DISABLED);
-	wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, AP_EVENT_DISABLED);
-	if (iface->interfaces && iface->interfaces->terminate_on_error)
-		eloop_terminate();
-	return -1;
-}
-
-
-#ifdef CONFIG_FST
-
-static const u8 * fst_hostapd_get_bssid_cb(void *ctx)
-{
-	struct hostapd_data *hapd = ctx;
-
-	return hapd->own_addr;
-}
-
-
-static void fst_hostapd_get_channel_info_cb(void *ctx,
-					    enum hostapd_hw_mode *hw_mode,
-					    u8 *channel)
-{
-	struct hostapd_data *hapd = ctx;
-
-	*hw_mode = ieee80211_freq_to_chan(hapd->iface->freq, channel);
-}
-
-
-static void fst_hostapd_set_ies_cb(void *ctx, const struct wpabuf *fst_ies)
-{
-	struct hostapd_data *hapd = ctx;
-
-	if (hapd->iface->fst_ies != fst_ies) {
-		hapd->iface->fst_ies = fst_ies;
-		if (ieee802_11_set_beacon(hapd))
-			wpa_printf(MSG_WARNING, "FST: Cannot set beacon");
-	}
-}
-
-
-static int fst_hostapd_send_action_cb(void *ctx, const u8 *da,
-				      struct wpabuf *buf)
-{
-	struct hostapd_data *hapd = ctx;
-
-	return hostapd_drv_send_action(hapd, hapd->iface->freq, 0, da,
-				       wpabuf_head(buf), wpabuf_len(buf));
-}
-
-
-static const struct wpabuf * fst_hostapd_get_mb_ie_cb(void *ctx, const u8 *addr)
-{
-	struct hostapd_data *hapd = ctx;
-	struct sta_info *sta = ap_get_sta(hapd, addr);
-
-	return sta ? sta->mb_ies : NULL;
-}
-
-
-static void fst_hostapd_update_mb_ie_cb(void *ctx, const u8 *addr,
-					const u8 *buf, size_t size)
-{
-	struct hostapd_data *hapd = ctx;
-	struct sta_info *sta = ap_get_sta(hapd, addr);
-
-	if (sta) {
-		struct mb_ies_info info;
-
-		if (!mb_ies_info_by_ies(&info, buf, size)) {
-			wpabuf_free(sta->mb_ies);
-			sta->mb_ies = mb_ies_by_info(&info);
-		}
-	}
-}
-
-
-static const u8 * fst_hostapd_get_sta(struct fst_get_peer_ctx **get_ctx,
-				      bool mb_only)
-{
-	struct sta_info *s = (struct sta_info *) *get_ctx;
-
-	if (mb_only) {
-		for (; s && !s->mb_ies; s = s->next)
-			;
-	}
-
-	if (s) {
-		*get_ctx = (struct fst_get_peer_ctx *) s->next;
-
-		return s->addr;
-	}
-
-	*get_ctx = NULL;
-	return NULL;
-}
-
-
-static const u8 * fst_hostapd_get_peer_first(void *ctx,
-					     struct fst_get_peer_ctx **get_ctx,
-					     bool mb_only)
-{
-	struct hostapd_data *hapd = ctx;
-
-	*get_ctx = (struct fst_get_peer_ctx *) hapd->sta_list;
-
-	return fst_hostapd_get_sta(get_ctx, mb_only);
-}
-
-
-static const u8 * fst_hostapd_get_peer_next(void *ctx,
-					    struct fst_get_peer_ctx **get_ctx,
-					    bool mb_only)
-{
-	return fst_hostapd_get_sta(get_ctx, mb_only);
-}
-
-
-void fst_hostapd_fill_iface_obj(struct hostapd_data *hapd,
-				struct fst_wpa_obj *iface_obj)
-{
-	iface_obj->ctx = hapd;
-	iface_obj->get_bssid = fst_hostapd_get_bssid_cb;
-	iface_obj->get_channel_info = fst_hostapd_get_channel_info_cb;
-	iface_obj->set_ies = fst_hostapd_set_ies_cb;
-	iface_obj->send_action = fst_hostapd_send_action_cb;
-	iface_obj->get_mb_ie = fst_hostapd_get_mb_ie_cb;
-	iface_obj->update_mb_ie = fst_hostapd_update_mb_ie_cb;
-	iface_obj->get_peer_first = fst_hostapd_get_peer_first;
-	iface_obj->get_peer_next = fst_hostapd_get_peer_next;
-}
-
-#endif /* CONFIG_FST */
-
-#ifdef CONFIG_OWE
-
-static int hostapd_owe_iface_iter(struct hostapd_iface *iface, void *ctx)
-{
-	struct hostapd_data *hapd = ctx;
-	size_t i;
-
-	for (i = 0; i < iface->num_bss; i++) {
-		struct hostapd_data *bss = iface->bss[i];
-
-		if (os_strcmp(hapd->conf->owe_transition_ifname,
-			      bss->conf->iface) != 0)
-			continue;
-
-		wpa_printf(MSG_DEBUG,
-			   "OWE: ifname=%s found transition mode ifname=%s BSSID "
-			   MACSTR " SSID %s",
-			   hapd->conf->iface, bss->conf->iface,
-			   MAC2STR(bss->own_addr),
-			   wpa_ssid_txt(bss->conf->ssid.ssid,
-					bss->conf->ssid.ssid_len));
-		if (!bss->conf->ssid.ssid_set || !bss->conf->ssid.ssid_len ||
-		    is_zero_ether_addr(bss->own_addr))
-			continue;
-
-		os_memcpy(hapd->conf->owe_transition_bssid, bss->own_addr,
-			  ETH_ALEN);
-		os_memcpy(hapd->conf->owe_transition_ssid,
-			  bss->conf->ssid.ssid, bss->conf->ssid.ssid_len);
-		hapd->conf->owe_transition_ssid_len = bss->conf->ssid.ssid_len;
-		wpa_printf(MSG_DEBUG,
-			   "OWE: Copied transition mode information");
-		return 1;
-	}
-
-	return 0;
-}
-
-
-int hostapd_owe_trans_get_info(struct hostapd_data *hapd)
-{
-	if (hapd->conf->owe_transition_ssid_len > 0 &&
-	    !is_zero_ether_addr(hapd->conf->owe_transition_bssid))
-		return 0;
-
-	/* Find transition mode SSID/BSSID information from a BSS operated by
-	 * this hostapd instance. */
-	if (!hapd->iface->interfaces ||
-	    !hapd->iface->interfaces->for_each_interface)
-		return hostapd_owe_iface_iter(hapd->iface, hapd);
-	else
-		return hapd->iface->interfaces->for_each_interface(
-			hapd->iface->interfaces, hostapd_owe_iface_iter, hapd);
-}
-
-
-static int hostapd_owe_iface_iter2(struct hostapd_iface *iface, void *ctx)
-{
-	size_t i;
-
-	for (i = 0; i < iface->num_bss; i++) {
-		struct hostapd_data *bss = iface->bss[i];
-		int res;
-
-		if (!bss->conf->owe_transition_ifname[0])
-			continue;
-		if (bss->iface->state != HAPD_IFACE_ENABLED) {
-			wpa_printf(MSG_DEBUG,
-				   "OWE: Interface %s state %s - defer beacon update",
-				   bss->conf->iface,
-				   hostapd_state_text(bss->iface->state));
-			continue;
-		}
-		res = hostapd_owe_trans_get_info(bss);
-		if (res == 0)
-			continue;
-		wpa_printf(MSG_DEBUG,
-			   "OWE: Matching transition mode interface enabled - update beacon data for %s",
-			   bss->conf->iface);
-		ieee802_11_set_beacon(bss);
-	}
-
-	return 0;
-}
-
-#endif /* CONFIG_OWE */
-
-
-static void hostapd_owe_update_trans(struct hostapd_iface *iface)
-{
-#ifdef CONFIG_OWE
-	/* Check whether the enabled BSS can complete OWE transition mode
-	 * configuration for any pending interface. */
-	if (!iface->interfaces ||
-	    !iface->interfaces->for_each_interface)
-		hostapd_owe_iface_iter2(iface, NULL);
-	else
-		iface->interfaces->for_each_interface(
-			iface->interfaces, hostapd_owe_iface_iter2, NULL);
-#endif /* CONFIG_OWE */
-}
-
-
-static void hostapd_interface_setup_failure_handler(void *eloop_ctx,
-						    void *timeout_ctx)
-{
-	struct hostapd_iface *iface = eloop_ctx;
-	struct hostapd_data *hapd;
-
-	if (iface->num_bss < 1 || !iface->bss || !iface->bss[0])
-		return;
-	hapd = iface->bss[0];
-	if (hapd->setup_complete_cb)
-		hapd->setup_complete_cb(hapd->setup_complete_cb_ctx);
-}
-
-
-static int hostapd_setup_interface_complete_sync(struct hostapd_iface *iface,
-						 int err)
-{
-	struct hostapd_data *hapd = iface->bss[0];
-	size_t j;
-	u8 *prev_addr;
-	int delay_apply_cfg = 0;
-	int res_dfs_offload = 0;
-
-	if (err)
-		goto fail;
-
-	wpa_printf(MSG_DEBUG, "Completing interface initialization");
-	if (iface->freq) {
-#ifdef NEED_AP_MLME
-		int res;
-#endif /* NEED_AP_MLME */
-
-		wpa_printf(MSG_DEBUG, "Mode: %s  Channel: %d  "
-			   "Frequency: %d MHz",
-			   hostapd_hw_mode_txt(iface->conf->hw_mode),
-			   iface->conf->channel, iface->freq);
-
-#ifdef NEED_AP_MLME
-		/* Handle DFS only if it is not offloaded to the driver */
-		if (!(iface->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD)) {
-			/* Check DFS */
-			res = hostapd_handle_dfs(iface);
-			if (res <= 0) {
-				if (res < 0)
-					goto fail;
-				return res;
-			}
-		} else {
-			/* If DFS is offloaded to the driver */
-			res_dfs_offload = hostapd_handle_dfs_offload(iface);
-			if (res_dfs_offload <= 0) {
-				if (res_dfs_offload < 0)
-					goto fail;
-			} else {
-				wpa_printf(MSG_DEBUG,
-					   "Proceed with AP/channel setup");
-				/*
-				 * If this is a DFS channel, move to completing
-				 * AP setup.
-				 */
-				if (res_dfs_offload == 1)
-					goto dfs_offload;
-				/* Otherwise fall through. */
-			}
-		}
-#endif /* NEED_AP_MLME */
-
-#ifdef CONFIG_MESH
-		if (iface->mconf != NULL) {
-			wpa_printf(MSG_DEBUG,
-				   "%s: Mesh configuration will be applied while joining the mesh network",
-				   iface->bss[0]->conf->iface);
-			delay_apply_cfg = 1;
-		}
-#endif /* CONFIG_MESH */
-
-		if (!delay_apply_cfg &&
-		    hostapd_set_freq(hapd, hapd->iconf->hw_mode, iface->freq,
-				     hapd->iconf->channel,
-				     hapd->iconf->enable_edmg,
-				     hapd->iconf->edmg_channel,
-				     hapd->iconf->ieee80211n,
-				     hapd->iconf->ieee80211ac,
-				     hapd->iconf->ieee80211ax,
-				     hapd->iconf->secondary_channel,
-				     hostapd_get_oper_chwidth(hapd->iconf),
-				     hostapd_get_oper_centr_freq_seg0_idx(
-					     hapd->iconf),
-				     hostapd_get_oper_centr_freq_seg1_idx(
-					     hapd->iconf))) {
-			wpa_printf(MSG_ERROR, "Could not set channel for "
-				   "kernel driver");
-			goto fail;
-		}
-	}
-
-	if (iface->current_mode) {
-		if (hostapd_prepare_rates(iface, iface->current_mode)) {
-			wpa_printf(MSG_ERROR, "Failed to prepare rates "
-				   "table.");
-			hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
-				       HOSTAPD_LEVEL_WARNING,
-				       "Failed to prepare rates table.");
-			goto fail;
-		}
-	}
-
-	if (hapd->iconf->rts_threshold >= -1 &&
-	    hostapd_set_rts(hapd, hapd->iconf->rts_threshold) &&
-	    hapd->iconf->rts_threshold >= -1) {
-		wpa_printf(MSG_ERROR, "Could not set RTS threshold for "
-			   "kernel driver");
-		goto fail;
-	}
-
-	if (hapd->iconf->fragm_threshold >= -1 &&
-	    hostapd_set_frag(hapd, hapd->iconf->fragm_threshold) &&
-	    hapd->iconf->fragm_threshold != -1) {
-		wpa_printf(MSG_ERROR, "Could not set fragmentation threshold "
-			   "for kernel driver");
-		goto fail;
-	}
-
-	prev_addr = hapd->own_addr;
-
-	for (j = 0; j < iface->num_bss; j++) {
-		hapd = iface->bss[j];
-		if (j)
-			os_memcpy(hapd->own_addr, prev_addr, ETH_ALEN);
-		if (hostapd_setup_bss(hapd, j == 0)) {
-			for (;;) {
-				hapd = iface->bss[j];
-				hostapd_bss_deinit_no_free(hapd);
-				hostapd_free_hapd_data(hapd);
-				if (j == 0)
-					break;
-				j--;
-			}
-			goto fail;
-		}
-		if (is_zero_ether_addr(hapd->conf->bssid))
-			prev_addr = hapd->own_addr;
-	}
-	hapd = iface->bss[0];
-
-	hostapd_tx_queue_params(iface);
-
-	ap_list_init(iface);
-
-	hostapd_set_acl(hapd);
-
-	if (hostapd_driver_commit(hapd) < 0) {
-		wpa_printf(MSG_ERROR, "%s: Failed to commit driver "
-			   "configuration", __func__);
-		goto fail;
-	}
-
-	/*
-	 * WPS UPnP module can be initialized only when the "upnp_iface" is up.
-	 * If "interface" and "upnp_iface" are the same (e.g., non-bridge
-	 * mode), the interface is up only after driver_commit, so initialize
-	 * WPS after driver_commit.
-	 */
-	for (j = 0; j < iface->num_bss; j++) {
-		if (hostapd_init_wps_complete(iface->bss[j]))
-			goto fail;
-	}
-
-	if ((iface->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD) &&
-	    !res_dfs_offload) {
-		/*
-		 * If freq is DFS, and DFS is offloaded to the driver, then wait
-		 * for CAC to complete.
-		 */
-		wpa_printf(MSG_DEBUG, "%s: Wait for CAC to complete", __func__);
-		return res_dfs_offload;
-	}
-
-#ifdef NEED_AP_MLME
-dfs_offload:
-#endif /* NEED_AP_MLME */
-
-#ifdef CONFIG_FST
-	if (hapd->iconf->fst_cfg.group_id[0]) {
-		struct fst_wpa_obj iface_obj;
-
-		fst_hostapd_fill_iface_obj(hapd, &iface_obj);
-		iface->fst = fst_attach(hapd->conf->iface, hapd->own_addr,
-					&iface_obj, &hapd->iconf->fst_cfg);
-		if (!iface->fst) {
-			wpa_printf(MSG_ERROR, "Could not attach to FST %s",
-				   hapd->iconf->fst_cfg.group_id);
-			goto fail;
-		}
-	}
-#endif /* CONFIG_FST */
-
-	hostapd_set_state(iface, HAPD_IFACE_ENABLED);
-	hostapd_owe_update_trans(iface);
-	airtime_policy_update_init(iface);
-	wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, AP_EVENT_ENABLED);
-	if (hapd->setup_complete_cb)
-		hapd->setup_complete_cb(hapd->setup_complete_cb_ctx);
-
-#ifdef CONFIG_MESH
-	if (delay_apply_cfg && !iface->mconf) {
-		wpa_printf(MSG_ERROR, "Error while completing mesh init");
-		goto fail;
-	}
-#endif /* CONFIG_MESH */
-
-	wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
-		   iface->bss[0]->conf->iface);
-	if (iface->interfaces && iface->interfaces->terminate_on_error > 0)
-		iface->interfaces->terminate_on_error--;
-
-	for (j = 0; j < iface->num_bss; j++)
-		hostapd_neighbor_set_own_report(iface->bss[j]);
-
-	return 0;
-
-fail:
-	wpa_printf(MSG_ERROR, "Interface initialization failed");
-	hostapd_set_state(iface, HAPD_IFACE_DISABLED);
-	wpa_msg(hapd->msg_ctx, MSG_INFO, AP_EVENT_DISABLED);
-#ifdef CONFIG_FST
-	if (iface->fst) {
-		fst_detach(iface->fst);
-		iface->fst = NULL;
-	}
-#endif /* CONFIG_FST */
-
-	if (iface->interfaces && iface->interfaces->terminate_on_error) {
-		eloop_terminate();
-	} else if (hapd->setup_complete_cb) {
-		/*
-		 * Calling hapd->setup_complete_cb directly may cause iface
-		 * deinitialization which may be accessed later by the caller.
-		 */
-		eloop_register_timeout(0, 0,
-				       hostapd_interface_setup_failure_handler,
-				       iface, NULL);
-	}
-
-	return -1;
-}
-
-
-/**
- * hostapd_setup_interface_complete - Complete interface setup
- *
- * This function is called when previous steps in the interface setup has been
- * completed. This can also start operations, e.g., DFS, that will require
- * additional processing before interface is ready to be enabled. Such
- * operations will call this function from eloop callbacks when finished.
- */
-int hostapd_setup_interface_complete(struct hostapd_iface *iface, int err)
-{
-	struct hapd_interfaces *interfaces = iface->interfaces;
-	struct hostapd_data *hapd = iface->bss[0];
-	unsigned int i;
-	int not_ready_in_sync_ifaces = 0;
-
-	if (!iface->need_to_start_in_sync)
-		return hostapd_setup_interface_complete_sync(iface, err);
-
-	if (err) {
-		wpa_printf(MSG_ERROR, "Interface initialization failed");
-		hostapd_set_state(iface, HAPD_IFACE_DISABLED);
-		iface->need_to_start_in_sync = 0;
-		wpa_msg(hapd->msg_ctx, MSG_INFO, AP_EVENT_DISABLED);
-		if (interfaces && interfaces->terminate_on_error)
-			eloop_terminate();
-		return -1;
-	}
-
-	if (iface->ready_to_start_in_sync) {
-		/* Already in ready and waiting. should never happpen */
-		return 0;
-	}
-
-	for (i = 0; i < interfaces->count; i++) {
-		if (interfaces->iface[i]->need_to_start_in_sync &&
-		    !interfaces->iface[i]->ready_to_start_in_sync)
-			not_ready_in_sync_ifaces++;
-	}
-
-	/*
-	 * Check if this is the last interface, if yes then start all the other
-	 * waiting interfaces. If not, add this interface to the waiting list.
-	 */
-	if (not_ready_in_sync_ifaces > 1 && iface->state == HAPD_IFACE_DFS) {
-		/*
-		 * If this interface went through CAC, do not synchronize, just
-		 * start immediately.
-		 */
-		iface->need_to_start_in_sync = 0;
-		wpa_printf(MSG_INFO,
-			   "%s: Finished CAC - bypass sync and start interface",
-			   iface->bss[0]->conf->iface);
-		return hostapd_setup_interface_complete_sync(iface, err);
-	}
-
-	if (not_ready_in_sync_ifaces > 1) {
-		/* need to wait as there are other interfaces still coming up */
-		iface->ready_to_start_in_sync = 1;
-		wpa_printf(MSG_INFO,
-			   "%s: Interface waiting to sync with other interfaces",
-			   iface->bss[0]->conf->iface);
-		return 0;
-	}
-
-	wpa_printf(MSG_INFO,
-		   "%s: Last interface to sync - starting all interfaces",
-		   iface->bss[0]->conf->iface);
-	iface->need_to_start_in_sync = 0;
-	hostapd_setup_interface_complete_sync(iface, err);
-	for (i = 0; i < interfaces->count; i++) {
-		if (interfaces->iface[i]->need_to_start_in_sync &&
-		    interfaces->iface[i]->ready_to_start_in_sync) {
-			hostapd_setup_interface_complete_sync(
-				interfaces->iface[i], 0);
-			/* Only once the interfaces are sync started */
-			interfaces->iface[i]->need_to_start_in_sync = 0;
-		}
-	}
-
-	return 0;
-}
-
-
-/**
- * hostapd_setup_interface - Setup of an interface
- * @iface: Pointer to interface data.
- * Returns: 0 on success, -1 on failure
- *
- * Initializes the driver interface, validates the configuration,
- * and sets driver parameters based on the configuration.
- * Flushes old stations, sets the channel, encryption,
- * beacons, and WDS links based on the configuration.
- *
- * If interface setup requires more time, e.g., to perform HT co-ex scans, ACS,
- * or DFS operations, this function returns 0 before such operations have been
- * completed. The pending operations are registered into eloop and will be
- * completed from eloop callbacks. Those callbacks end up calling
- * hostapd_setup_interface_complete() once setup has been completed.
- */
-int hostapd_setup_interface(struct hostapd_iface *iface)
-{
-	int ret;
-
-	if (!iface->conf)
-		return -1;
-	ret = setup_interface(iface);
-	if (ret) {
-		wpa_printf(MSG_ERROR, "%s: Unable to setup interface.",
-			   iface->conf->bss[0]->iface);
-		return -1;
-	}
-
-	return 0;
-}
-
-
-/**
- * hostapd_alloc_bss_data - Allocate and initialize per-BSS data
- * @hapd_iface: Pointer to interface data
- * @conf: Pointer to per-interface configuration
- * @bss: Pointer to per-BSS configuration for this BSS
- * Returns: Pointer to allocated BSS data
- *
- * This function is used to allocate per-BSS data structure. This data will be
- * freed after hostapd_cleanup() is called for it during interface
- * deinitialization.
- */
-struct hostapd_data *
-hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
-		       struct hostapd_config *conf,
-		       struct hostapd_bss_config *bss)
-{
-	struct hostapd_data *hapd;
-
-	hapd = os_zalloc(sizeof(*hapd));
-	if (hapd == NULL)
-		return NULL;
-
-	hapd->new_assoc_sta_cb = hostapd_new_assoc_sta;
-	hapd->iconf = conf;
-	hapd->conf = bss;
-	hapd->iface = hapd_iface;
-	if (conf)
-		hapd->driver = conf->driver;
-	hapd->ctrl_sock = -1;
-	dl_list_init(&hapd->ctrl_dst);
-	dl_list_init(&hapd->nr_db);
-	hapd->dhcp_sock = -1;
-#ifdef CONFIG_IEEE80211R_AP
-	dl_list_init(&hapd->l2_queue);
-	dl_list_init(&hapd->l2_oui_queue);
-#endif /* CONFIG_IEEE80211R_AP */
-#ifdef CONFIG_SAE
-	dl_list_init(&hapd->sae_commit_queue);
-#endif /* CONFIG_SAE */
-
-	return hapd;
-}
-
-
-static void hostapd_bss_deinit(struct hostapd_data *hapd)
-{
-	if (!hapd)
-		return;
-	wpa_printf(MSG_DEBUG, "%s: deinit bss %s", __func__,
-		   hapd->conf ? hapd->conf->iface : "N/A");
-	hostapd_bss_deinit_no_free(hapd);
-	wpa_msg(hapd->msg_ctx, MSG_INFO, AP_EVENT_DISABLED);
-#ifdef CONFIG_SQLITE
-	if (hapd->rad_attr_db) {
-		sqlite3_close(hapd->rad_attr_db);
-		hapd->rad_attr_db = NULL;
-	}
-#endif /* CONFIG_SQLITE */
-	hostapd_cleanup(hapd);
-}
-
-
-void hostapd_interface_deinit(struct hostapd_iface *iface)
-{
-	int j;
-
-	wpa_printf(MSG_DEBUG, "%s(%p)", __func__, iface);
-	if (iface == NULL)
-		return;
-
-	hostapd_set_state(iface, HAPD_IFACE_DISABLED);
-
-	eloop_cancel_timeout(channel_list_update_timeout, iface, NULL);
-	iface->wait_channel_update = 0;
-
-#ifdef CONFIG_FST
-	if (iface->fst) {
-		fst_detach(iface->fst);
-		iface->fst = NULL;
-	}
-#endif /* CONFIG_FST */
-
-	for (j = (int) iface->num_bss - 1; j >= 0; j--) {
-		if (!iface->bss)
-			break;
-		hostapd_bss_deinit(iface->bss[j]);
-	}
-
-#ifdef NEED_AP_MLME
-	hostapd_stop_setup_timers(iface);
-	eloop_cancel_timeout(ap_ht2040_timeout, iface, NULL);
-#endif /* NEED_AP_MLME */
-}
-
-
-void hostapd_interface_free(struct hostapd_iface *iface)
-{
-	size_t j;
-	wpa_printf(MSG_DEBUG, "%s(%p)", __func__, iface);
-	for (j = 0; j < iface->num_bss; j++) {
-		if (!iface->bss)
-			break;
-		wpa_printf(MSG_DEBUG, "%s: free hapd %p",
-			   __func__, iface->bss[j]);
-		os_free(iface->bss[j]);
-	}
-	hostapd_cleanup_iface(iface);
-}
-
-
-struct hostapd_iface * hostapd_alloc_iface(void)
-{
-	struct hostapd_iface *hapd_iface;
-
-	hapd_iface = os_zalloc(sizeof(*hapd_iface));
-	if (!hapd_iface)
-		return NULL;
-
-	dl_list_init(&hapd_iface->sta_seen);
-
-	return hapd_iface;
-}
-
-
-/**
- * hostapd_init - Allocate and initialize per-interface data
- * @config_file: Path to the configuration file
- * Returns: Pointer to the allocated interface data or %NULL on failure
- *
- * This function is used to allocate main data structures for per-interface
- * data. The allocated data buffer will be freed by calling
- * hostapd_cleanup_iface().
- */
-struct hostapd_iface * hostapd_init(struct hapd_interfaces *interfaces,
-				    const char *config_file)
-{
-	struct hostapd_iface *hapd_iface = NULL;
-	struct hostapd_config *conf = NULL;
-	struct hostapd_data *hapd;
-	size_t i;
-
-	hapd_iface = hostapd_alloc_iface();
-	if (hapd_iface == NULL)
-		goto fail;
-
-	hapd_iface->config_fname = os_strdup(config_file);
-	if (hapd_iface->config_fname == NULL)
-		goto fail;
-
-	conf = interfaces->config_read_cb(hapd_iface->config_fname);
-	if (conf == NULL)
-		goto fail;
-	hapd_iface->conf = conf;
-
-	hapd_iface->num_bss = conf->num_bss;
-	hapd_iface->bss = os_calloc(conf->num_bss,
-				    sizeof(struct hostapd_data *));
-	if (hapd_iface->bss == NULL)
-		goto fail;
-
-	for (i = 0; i < conf->num_bss; i++) {
-		hapd = hapd_iface->bss[i] =
-			hostapd_alloc_bss_data(hapd_iface, conf,
-					       conf->bss[i]);
-		if (hapd == NULL)
-			goto fail;
-		hapd->msg_ctx = hapd;
-	}
-
-	return hapd_iface;
-
-fail:
-	wpa_printf(MSG_ERROR, "Failed to set up interface with %s",
-		   config_file);
-	if (conf)
-		hostapd_config_free(conf);
-	if (hapd_iface) {
-		os_free(hapd_iface->config_fname);
-		os_free(hapd_iface->bss);
-		wpa_printf(MSG_DEBUG, "%s: free iface %p",
-			   __func__, hapd_iface);
-		os_free(hapd_iface);
-	}
-	return NULL;
-}
-
-
-static int ifname_in_use(struct hapd_interfaces *interfaces, const char *ifname)
-{
-	size_t i, j;
-
-	for (i = 0; i < interfaces->count; i++) {
-		struct hostapd_iface *iface = interfaces->iface[i];
-		for (j = 0; j < iface->num_bss; j++) {
-			struct hostapd_data *hapd = iface->bss[j];
-			if (os_strcmp(ifname, hapd->conf->iface) == 0)
-				return 1;
-		}
-	}
-
-	return 0;
-}
-
-
-/**
- * hostapd_interface_init_bss - Read configuration file and init BSS data
- *
- * This function is used to parse configuration file for a BSS. This BSS is
- * added to an existing interface sharing the same radio (if any) or a new
- * interface is created if this is the first interface on a radio. This
- * allocate memory for the BSS. No actual driver operations are started.
- *
- * This is similar to hostapd_interface_init(), but for a case where the
- * configuration is used to add a single BSS instead of all BSSes for a radio.
- */
-struct hostapd_iface *
-hostapd_interface_init_bss(struct hapd_interfaces *interfaces, const char *phy,
-			   const char *config_fname, int debug)
-{
-	struct hostapd_iface *new_iface = NULL, *iface = NULL;
-	struct hostapd_data *hapd;
-	int k;
-	size_t i, bss_idx;
-
-	if (!phy || !*phy)
-		return NULL;
-
-	for (i = 0; i < interfaces->count; i++) {
-		if (os_strcmp(interfaces->iface[i]->phy, phy) == 0) {
-			iface = interfaces->iface[i];
-			break;
-		}
-	}
-
-	wpa_printf(MSG_INFO, "Configuration file: %s (phy %s)%s",
-		   config_fname, phy, iface ? "" : " --> new PHY");
-	if (iface) {
-		struct hostapd_config *conf;
-		struct hostapd_bss_config **tmp_conf;
-		struct hostapd_data **tmp_bss;
-		struct hostapd_bss_config *bss;
-		const char *ifname;
-
-		/* Add new BSS to existing iface */
-		conf = interfaces->config_read_cb(config_fname);
-		if (conf == NULL)
-			return NULL;
-		if (conf->num_bss > 1) {
-			wpa_printf(MSG_ERROR, "Multiple BSSes specified in BSS-config");
-			hostapd_config_free(conf);
-			return NULL;
-		}
-
-		ifname = conf->bss[0]->iface;
-		if (ifname[0] != '\0' && ifname_in_use(interfaces, ifname)) {
-			wpa_printf(MSG_ERROR,
-				   "Interface name %s already in use", ifname);
-			hostapd_config_free(conf);
-			return NULL;
-		}
-
-		tmp_conf = os_realloc_array(
-			iface->conf->bss, iface->conf->num_bss + 1,
-			sizeof(struct hostapd_bss_config *));
-		tmp_bss = os_realloc_array(iface->bss, iface->num_bss + 1,
-					   sizeof(struct hostapd_data *));
-		if (tmp_bss)
-			iface->bss = tmp_bss;
-		if (tmp_conf) {
-			iface->conf->bss = tmp_conf;
-			iface->conf->last_bss = tmp_conf[0];
-		}
-		if (tmp_bss == NULL || tmp_conf == NULL) {
-			hostapd_config_free(conf);
-			return NULL;
-		}
-		bss = iface->conf->bss[iface->conf->num_bss] = conf->bss[0];
-		iface->conf->num_bss++;
-
-		hapd = hostapd_alloc_bss_data(iface, iface->conf, bss);
-		if (hapd == NULL) {
-			iface->conf->num_bss--;
-			hostapd_config_free(conf);
-			return NULL;
-		}
-		iface->conf->last_bss = bss;
-		iface->bss[iface->num_bss] = hapd;
-		hapd->msg_ctx = hapd;
-
-		bss_idx = iface->num_bss++;
-		conf->num_bss--;
-		conf->bss[0] = NULL;
-		hostapd_config_free(conf);
-	} else {
-		/* Add a new iface with the first BSS */
-		new_iface = iface = hostapd_init(interfaces, config_fname);
-		if (!iface)
-			return NULL;
-		os_strlcpy(iface->phy, phy, sizeof(iface->phy));
-		iface->interfaces = interfaces;
-		bss_idx = 0;
-	}
-
-	for (k = 0; k < debug; k++) {
-		if (iface->bss[bss_idx]->conf->logger_stdout_level > 0)
-			iface->bss[bss_idx]->conf->logger_stdout_level--;
-	}
-
-	if (iface->conf->bss[bss_idx]->iface[0] == '\0' &&
-	    !hostapd_drv_none(iface->bss[bss_idx])) {
-		wpa_printf(MSG_ERROR, "Interface name not specified in %s",
-			   config_fname);
-		if (new_iface)
-			hostapd_interface_deinit_free(new_iface);
-		return NULL;
-	}
-
-	return iface;
-}
-
-
-void hostapd_interface_deinit_free(struct hostapd_iface *iface)
-{
-	const struct wpa_driver_ops *driver;
-	void *drv_priv;
-
-	wpa_printf(MSG_DEBUG, "%s(%p)", __func__, iface);
-	if (iface == NULL)
-		return;
-	wpa_printf(MSG_DEBUG, "%s: num_bss=%u conf->num_bss=%u",
-		   __func__, (unsigned int) iface->num_bss,
-		   (unsigned int) iface->conf->num_bss);
-	driver = iface->bss[0]->driver;
-	drv_priv = iface->bss[0]->drv_priv;
-	hostapd_interface_deinit(iface);
-	wpa_printf(MSG_DEBUG, "%s: driver=%p drv_priv=%p -> hapd_deinit",
-		   __func__, driver, drv_priv);
-	if (driver && driver->hapd_deinit && drv_priv) {
-		driver->hapd_deinit(drv_priv);
-		iface->bss[0]->drv_priv = NULL;
-	}
-	hostapd_interface_free(iface);
-}
-
-
-static void hostapd_deinit_driver(const struct wpa_driver_ops *driver,
-				  void *drv_priv,
-				  struct hostapd_iface *hapd_iface)
-{
-	size_t j;
-
-	wpa_printf(MSG_DEBUG, "%s: driver=%p drv_priv=%p -> hapd_deinit",
-		   __func__, driver, drv_priv);
-	if (driver && driver->hapd_deinit && drv_priv) {
-		driver->hapd_deinit(drv_priv);
-		for (j = 0; j < hapd_iface->num_bss; j++) {
-			wpa_printf(MSG_DEBUG, "%s:bss[%d]->drv_priv=%p",
-				   __func__, (int) j,
-				   hapd_iface->bss[j]->drv_priv);
-			if (hapd_iface->bss[j]->drv_priv == drv_priv) {
-				hapd_iface->bss[j]->drv_priv = NULL;
-				hapd_iface->extended_capa = NULL;
-				hapd_iface->extended_capa_mask = NULL;
-				hapd_iface->extended_capa_len = 0;
-			}
-		}
-	}
-}
-
-
-int hostapd_enable_iface(struct hostapd_iface *hapd_iface)
-{
-	size_t j;
-
-	if (!hapd_iface)
-		return -1;
-
-	if (hapd_iface->enable_iface_cb)
-		return hapd_iface->enable_iface_cb(hapd_iface);
-
-	if (hapd_iface->bss[0]->drv_priv != NULL) {
-		wpa_printf(MSG_ERROR, "Interface %s already enabled",
-			   hapd_iface->conf->bss[0]->iface);
-		return -1;
-	}
-
-	wpa_printf(MSG_DEBUG, "Enable interface %s",
-		   hapd_iface->conf->bss[0]->iface);
-
-	for (j = 0; j < hapd_iface->num_bss; j++)
-		hostapd_set_security_params(hapd_iface->conf->bss[j], 1);
-	if (hostapd_config_check(hapd_iface->conf, 1) < 0) {
-		wpa_printf(MSG_INFO, "Invalid configuration - cannot enable");
-		return -1;
-	}
-
-	if (hapd_iface->interfaces == NULL ||
-	    hapd_iface->interfaces->driver_init == NULL ||
-	    hapd_iface->interfaces->driver_init(hapd_iface))
-		return -1;
-
-	if (hostapd_setup_interface(hapd_iface)) {
-		hostapd_deinit_driver(hapd_iface->bss[0]->driver,
-				      hapd_iface->bss[0]->drv_priv,
-				      hapd_iface);
-		return -1;
-	}
-
-	return 0;
-}
-
-
-int hostapd_reload_iface(struct hostapd_iface *hapd_iface)
-{
-	size_t j;
-
-	wpa_printf(MSG_DEBUG, "Reload interface %s",
-		   hapd_iface->conf->bss[0]->iface);
-	for (j = 0; j < hapd_iface->num_bss; j++)
-		hostapd_set_security_params(hapd_iface->conf->bss[j], 1);
-	if (hostapd_config_check(hapd_iface->conf, 1) < 0) {
-		wpa_printf(MSG_ERROR, "Updated configuration is invalid");
-		return -1;
-	}
-	hostapd_clear_old(hapd_iface);
-	for (j = 0; j < hapd_iface->num_bss; j++)
-		hostapd_reload_bss(hapd_iface->bss[j]);
-
-	return 0;
-}
-
-
-int hostapd_disable_iface(struct hostapd_iface *hapd_iface)
-{
-	size_t j;
-	const struct wpa_driver_ops *driver;
-	void *drv_priv;
-
-	if (hapd_iface == NULL)
-		return -1;
-
-	if (hapd_iface->disable_iface_cb)
-		return hapd_iface->disable_iface_cb(hapd_iface);
-
-	if (hapd_iface->bss[0]->drv_priv == NULL) {
-		wpa_printf(MSG_INFO, "Interface %s already disabled",
-			   hapd_iface->conf->bss[0]->iface);
-		return -1;
-	}
-
-	wpa_msg(hapd_iface->bss[0]->msg_ctx, MSG_INFO, AP_EVENT_DISABLED);
-	driver = hapd_iface->bss[0]->driver;
-	drv_priv = hapd_iface->bss[0]->drv_priv;
-
-	hapd_iface->driver_ap_teardown =
-		!!(hapd_iface->drv_flags &
-		   WPA_DRIVER_FLAGS_AP_TEARDOWN_SUPPORT);
-
-#ifdef NEED_AP_MLME
-	for (j = 0; j < hapd_iface->num_bss; j++)
-		hostapd_cleanup_cs_params(hapd_iface->bss[j]);
-#endif /* NEED_AP_MLME */
-
-	/* same as hostapd_interface_deinit without deinitializing ctrl-iface */
-	for (j = 0; j < hapd_iface->num_bss; j++) {
-		struct hostapd_data *hapd = hapd_iface->bss[j];
-		hostapd_bss_deinit_no_free(hapd);
-		hostapd_free_hapd_data(hapd);
-	}
-
-	hostapd_deinit_driver(driver, drv_priv, hapd_iface);
-
-	/* From hostapd_cleanup_iface: These were initialized in
-	 * hostapd_setup_interface and hostapd_setup_interface_complete
-	 */
-	hostapd_cleanup_iface_partial(hapd_iface);
-
-	wpa_printf(MSG_DEBUG, "Interface %s disabled",
-		   hapd_iface->bss[0]->conf->iface);
-	hostapd_set_state(hapd_iface, HAPD_IFACE_DISABLED);
-	return 0;
-}
-
-
-static struct hostapd_iface *
-hostapd_iface_alloc(struct hapd_interfaces *interfaces)
-{
-	struct hostapd_iface **iface, *hapd_iface;
-
-	iface = os_realloc_array(interfaces->iface, interfaces->count + 1,
-				 sizeof(struct hostapd_iface *));
-	if (iface == NULL)
-		return NULL;
-	interfaces->iface = iface;
-	hapd_iface = interfaces->iface[interfaces->count] =
-		hostapd_alloc_iface();
-	if (hapd_iface == NULL) {
-		wpa_printf(MSG_ERROR, "%s: Failed to allocate memory for "
-			   "the interface", __func__);
-		return NULL;
-	}
-	interfaces->count++;
-	hapd_iface->interfaces = interfaces;
-
-	return hapd_iface;
-}
-
-
-static struct hostapd_config *
-hostapd_config_alloc(struct hapd_interfaces *interfaces, const char *ifname,
-		     const char *ctrl_iface, const char *driver)
-{
-	struct hostapd_bss_config *bss;
-	struct hostapd_config *conf;
-
-	/* Allocates memory for bss and conf */
-	conf = hostapd_config_defaults();
-	if (conf == NULL) {
-		 wpa_printf(MSG_ERROR, "%s: Failed to allocate memory for "
-				"configuration", __func__);
-		 return NULL;
-	}
-
-	if (driver) {
-		int j;
-
-		for (j = 0; wpa_drivers[j]; j++) {
-			if (os_strcmp(driver, wpa_drivers[j]->name) == 0) {
-				conf->driver = wpa_drivers[j];
-				goto skip;
-			}
-		}
-
-		wpa_printf(MSG_ERROR,
-			   "Invalid/unknown driver '%s' - registering the default driver",
-			   driver);
-	}
-
-	conf->driver = wpa_drivers[0];
-	if (conf->driver == NULL) {
-		wpa_printf(MSG_ERROR, "No driver wrappers registered!");
-		hostapd_config_free(conf);
-		return NULL;
-	}
-
-skip:
-	bss = conf->last_bss = conf->bss[0];
-
-	os_strlcpy(bss->iface, ifname, sizeof(bss->iface));
-	bss->ctrl_interface = os_strdup(ctrl_iface);
-	if (bss->ctrl_interface == NULL) {
-		hostapd_config_free(conf);
-		return NULL;
-	}
-
-	/* Reading configuration file skipped, will be done in SET!
-	 * From reading the configuration till the end has to be done in
-	 * SET
-	 */
-	return conf;
-}
-
-
-static int hostapd_data_alloc(struct hostapd_iface *hapd_iface,
-			      struct hostapd_config *conf)
-{
-	size_t i;
-	struct hostapd_data *hapd;
-
-	hapd_iface->bss = os_calloc(conf->num_bss,
-				    sizeof(struct hostapd_data *));
-	if (hapd_iface->bss == NULL)
-		return -1;
-
-	for (i = 0; i < conf->num_bss; i++) {
-		hapd = hapd_iface->bss[i] =
-			hostapd_alloc_bss_data(hapd_iface, conf, conf->bss[i]);
-		if (hapd == NULL) {
-			while (i > 0) {
-				i--;
-				os_free(hapd_iface->bss[i]);
-				hapd_iface->bss[i] = NULL;
-			}
-			os_free(hapd_iface->bss);
-			hapd_iface->bss = NULL;
-			return -1;
-		}
-		hapd->msg_ctx = hapd;
-	}
-
-	hapd_iface->conf = conf;
-	hapd_iface->num_bss = conf->num_bss;
-
-	return 0;
-}
-
-
-int hostapd_add_iface(struct hapd_interfaces *interfaces, char *buf)
-{
-	struct hostapd_config *conf = NULL;
-	struct hostapd_iface *hapd_iface = NULL, *new_iface = NULL;
-	struct hostapd_data *hapd;
-	char *ptr;
-	size_t i, j;
-	const char *conf_file = NULL, *phy_name = NULL;
-
-	if (os_strncmp(buf, "bss_config=", 11) == 0) {
-		char *pos;
-		phy_name = buf + 11;
-		pos = os_strchr(phy_name, ':');
-		if (!pos)
-			return -1;
-		*pos++ = '\0';
-		conf_file = pos;
-		if (!os_strlen(conf_file))
-			return -1;
-
-		hapd_iface = hostapd_interface_init_bss(interfaces, phy_name,
-							conf_file, 0);
-		if (!hapd_iface)
-			return -1;
-		for (j = 0; j < interfaces->count; j++) {
-			if (interfaces->iface[j] == hapd_iface)
-				break;
-		}
-		if (j == interfaces->count) {
-			struct hostapd_iface **tmp;
-			tmp = os_realloc_array(interfaces->iface,
-					       interfaces->count + 1,
-					       sizeof(struct hostapd_iface *));
-			if (!tmp) {
-				hostapd_interface_deinit_free(hapd_iface);
-				return -1;
-			}
-			interfaces->iface = tmp;
-			interfaces->iface[interfaces->count++] = hapd_iface;
-			new_iface = hapd_iface;
-		}
-
-		if (new_iface) {
-			if (interfaces->driver_init(hapd_iface))
-				goto fail;
-
-			if (hostapd_setup_interface(hapd_iface)) {
-				hostapd_deinit_driver(
-					hapd_iface->bss[0]->driver,
-					hapd_iface->bss[0]->drv_priv,
-					hapd_iface);
-				goto fail;
-			}
-		} else {
-			/* Assign new BSS with bss[0]'s driver info */
-			hapd = hapd_iface->bss[hapd_iface->num_bss - 1];
-			hapd->driver = hapd_iface->bss[0]->driver;
-			hapd->drv_priv = hapd_iface->bss[0]->drv_priv;
-			os_memcpy(hapd->own_addr, hapd_iface->bss[0]->own_addr,
-				  ETH_ALEN);
-
-			if (start_ctrl_iface_bss(hapd) < 0 ||
-			    (hapd_iface->state == HAPD_IFACE_ENABLED &&
-			     hostapd_setup_bss(hapd, -1))) {
-				hostapd_cleanup(hapd);
-				hapd_iface->bss[hapd_iface->num_bss - 1] = NULL;
-				hapd_iface->conf->num_bss--;
-				hapd_iface->num_bss--;
-				wpa_printf(MSG_DEBUG, "%s: free hapd %p %s",
-					   __func__, hapd, hapd->conf->iface);
-				hostapd_config_free_bss(hapd->conf);
-				hapd->conf = NULL;
-				os_free(hapd);
-				return -1;
-			}
-		}
-		hostapd_owe_update_trans(hapd_iface);
-		return 0;
-	}
-
-	ptr = os_strchr(buf, ' ');
-	if (ptr == NULL)
-		return -1;
-	*ptr++ = '\0';
-
-	if (os_strncmp(ptr, "config=", 7) == 0)
-		conf_file = ptr + 7;
-
-	for (i = 0; i < interfaces->count; i++) {
-		if (!os_strcmp(interfaces->iface[i]->conf->bss[0]->iface,
-			       buf)) {
-			wpa_printf(MSG_INFO, "Cannot add interface - it "
-				   "already exists");
-			return -1;
-		}
-	}
-
-	hapd_iface = hostapd_iface_alloc(interfaces);
-	if (hapd_iface == NULL) {
-		wpa_printf(MSG_ERROR, "%s: Failed to allocate memory "
-			   "for interface", __func__);
-		goto fail;
-	}
-	new_iface = hapd_iface;
-
-	if (conf_file && interfaces->config_read_cb) {
-		conf = interfaces->config_read_cb(conf_file);
-		if (conf && conf->bss)
-			os_strlcpy(conf->bss[0]->iface, buf,
-				   sizeof(conf->bss[0]->iface));
-	} else {
-		char *driver = os_strchr(ptr, ' ');
-
-		if (driver)
-			*driver++ = '\0';
-		conf = hostapd_config_alloc(interfaces, buf, ptr, driver);
-	}
-
-	if (conf == NULL || conf->bss == NULL) {
-		wpa_printf(MSG_ERROR, "%s: Failed to allocate memory "
-			   "for configuration", __func__);
-		goto fail;
-	}
-
-	if (hostapd_data_alloc(hapd_iface, conf) < 0) {
-		wpa_printf(MSG_ERROR, "%s: Failed to allocate memory "
-			   "for hostapd", __func__);
-		goto fail;
-	}
-	conf = NULL;
-
-	if (start_ctrl_iface(hapd_iface) < 0)
-		goto fail;
-
-	wpa_printf(MSG_INFO, "Add interface '%s'",
-		   hapd_iface->conf->bss[0]->iface);
-
-	return 0;
-
-fail:
-	if (conf)
-		hostapd_config_free(conf);
-	if (hapd_iface) {
-		if (hapd_iface->bss) {
-			for (i = 0; i < hapd_iface->num_bss; i++) {
-				hapd = hapd_iface->bss[i];
-				if (!hapd)
-					continue;
-				if (hapd_iface->interfaces &&
-				    hapd_iface->interfaces->ctrl_iface_deinit)
-					hapd_iface->interfaces->
-						ctrl_iface_deinit(hapd);
-				wpa_printf(MSG_DEBUG, "%s: free hapd %p (%s)",
-					   __func__, hapd_iface->bss[i],
-					   hapd->conf->iface);
-				hostapd_cleanup(hapd);
-				os_free(hapd);
-				hapd_iface->bss[i] = NULL;
-			}
-			os_free(hapd_iface->bss);
-			hapd_iface->bss = NULL;
-		}
-		if (new_iface) {
-			interfaces->count--;
-			interfaces->iface[interfaces->count] = NULL;
-		}
-		hostapd_cleanup_iface(hapd_iface);
-	}
-	return -1;
-}
-
-
-static int hostapd_remove_bss(struct hostapd_iface *iface, unsigned int idx)
-{
-	size_t i;
-
-	wpa_printf(MSG_INFO, "Remove BSS '%s'", iface->conf->bss[idx]->iface);
-
-	/* Remove hostapd_data only if it has already been initialized */
-	if (idx < iface->num_bss) {
-		struct hostapd_data *hapd = iface->bss[idx];
-
-		hostapd_bss_deinit(hapd);
-		wpa_printf(MSG_DEBUG, "%s: free hapd %p (%s)",
-			   __func__, hapd, hapd->conf->iface);
-		hostapd_config_free_bss(hapd->conf);
-		hapd->conf = NULL;
-		os_free(hapd);
-
-		iface->num_bss--;
-
-		for (i = idx; i < iface->num_bss; i++)
-			iface->bss[i] = iface->bss[i + 1];
-	} else {
-		hostapd_config_free_bss(iface->conf->bss[idx]);
-		iface->conf->bss[idx] = NULL;
-	}
-
-	iface->conf->num_bss--;
-	for (i = idx; i < iface->conf->num_bss; i++)
-		iface->conf->bss[i] = iface->conf->bss[i + 1];
-
-	return 0;
-}
-
-
-int hostapd_remove_iface(struct hapd_interfaces *interfaces, char *buf)
-{
-	struct hostapd_iface *hapd_iface;
-	size_t i, j, k = 0;
-
-	for (i = 0; i < interfaces->count; i++) {
-		hapd_iface = interfaces->iface[i];
-		if (hapd_iface == NULL)
-			return -1;
-		if (!os_strcmp(hapd_iface->conf->bss[0]->iface, buf)) {
-			wpa_printf(MSG_INFO, "Remove interface '%s'", buf);
-			hapd_iface->driver_ap_teardown =
-				!!(hapd_iface->drv_flags &
-				   WPA_DRIVER_FLAGS_AP_TEARDOWN_SUPPORT);
-
-			hostapd_interface_deinit_free(hapd_iface);
-			k = i;
-			while (k < (interfaces->count - 1)) {
-				interfaces->iface[k] =
-					interfaces->iface[k + 1];
-				k++;
-			}
-			interfaces->count--;
-			return 0;
-		}
-
-		for (j = 0; j < hapd_iface->conf->num_bss; j++) {
-			if (!os_strcmp(hapd_iface->conf->bss[j]->iface, buf)) {
-				hapd_iface->driver_ap_teardown =
-					!(hapd_iface->drv_flags &
-					  WPA_DRIVER_FLAGS_AP_TEARDOWN_SUPPORT);
-				return hostapd_remove_bss(hapd_iface, j);
-			}
-		}
-	}
-	return -1;
-}
-
-
-/**
- * hostapd_new_assoc_sta - Notify that a new station associated with the AP
- * @hapd: Pointer to BSS data
- * @sta: Pointer to the associated STA data
- * @reassoc: 1 to indicate this was a re-association; 0 = first association
- *
- * This function will be called whenever a station associates with the AP. It
- * can be called from ieee802_11.c for drivers that export MLME to hostapd and
- * from drv_callbacks.c based on driver events for drivers that take care of
- * management frames (IEEE 802.11 authentication and association) internally.
- */
-void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
-			   int reassoc)
-{
-
-	if (hapd->tkip_countermeasures) {
-		hostapd_drv_sta_deauth(hapd, sta->addr,
-				       WLAN_REASON_MICHAEL_MIC_FAILURE);
-		return;
-	}
-
-	hostapd_prune_associations(hapd, sta->addr);
-	ap_sta_clear_disconnect_timeouts(hapd, sta);
-	sta->post_csa_sa_query = 0;
-
-#ifdef CONFIG_P2P
-	if (sta->p2p_ie == NULL && !sta->no_p2p_set) {
-		sta->no_p2p_set = 1;
-		hapd->num_sta_no_p2p++;
-		if (hapd->num_sta_no_p2p == 1)
-			hostapd_p2p_non_p2p_sta_connected(hapd);
-	}
-#endif /* CONFIG_P2P */
-
-	airtime_policy_new_sta(hapd, sta);
-
-	/* Start accounting here, if IEEE 802.1X and WPA are not used.
-	 * IEEE 802.1X/WPA code will start accounting after the station has
-	 * been authorized. */
-	if (!hapd->conf->ieee802_1x && !hapd->conf->wpa && !hapd->conf->osen) {
-		ap_sta_set_authorized(hapd, sta, 1);
-		os_get_reltime(&sta->connected_time);
-		accounting_sta_start(hapd, sta);
-	}
-
-	/* Start IEEE 802.1X authentication process for new stations */
-	ieee802_1x_new_station(hapd, sta);
-	if (reassoc) {
-		if (sta->auth_alg != WLAN_AUTH_FT &&
-		    sta->auth_alg != WLAN_AUTH_FILS_SK &&
-		    sta->auth_alg != WLAN_AUTH_FILS_SK_PFS &&
-		    sta->auth_alg != WLAN_AUTH_FILS_PK &&
-		    !(sta->flags & (WLAN_STA_WPS | WLAN_STA_MAYBE_WPS)))
-			wpa_auth_sm_event(sta->wpa_sm, WPA_REAUTH);
-	} else
-		wpa_auth_sta_associated(hapd->wpa_auth, sta->wpa_sm);
-
-	if (hapd->iface->drv_flags & WPA_DRIVER_FLAGS_WIRED) {
-		if (eloop_cancel_timeout(ap_handle_timer, hapd, sta) > 0) {
-			wpa_printf(MSG_DEBUG,
-				   "%s: %s: canceled wired ap_handle_timer timeout for "
-				   MACSTR,
-				   hapd->conf->iface, __func__,
-				   MAC2STR(sta->addr));
-		}
-	} else if (!(hapd->iface->drv_flags &
-		     WPA_DRIVER_FLAGS_INACTIVITY_TIMER)) {
-		wpa_printf(MSG_DEBUG,
-			   "%s: %s: reschedule ap_handle_timer timeout for "
-			   MACSTR " (%d seconds - ap_max_inactivity)",
-			   hapd->conf->iface, __func__, MAC2STR(sta->addr),
-			   hapd->conf->ap_max_inactivity);
-		eloop_cancel_timeout(ap_handle_timer, hapd, sta);
-		eloop_register_timeout(hapd->conf->ap_max_inactivity, 0,
-				       ap_handle_timer, hapd, sta);
-	}
-
-#ifdef CONFIG_MACSEC
-	if (hapd->conf->wpa_key_mgmt == WPA_KEY_MGMT_NONE &&
-	    hapd->conf->mka_psk_set)
-		ieee802_1x_create_preshared_mka_hapd(hapd, sta);
-	else
-		ieee802_1x_alloc_kay_sm_hapd(hapd, sta);
-#endif /* CONFIG_MACSEC */
-}
-
-
-const char * hostapd_state_text(enum hostapd_iface_state s)
-{
-	switch (s) {
-	case HAPD_IFACE_UNINITIALIZED:
-		return "UNINITIALIZED";
-	case HAPD_IFACE_DISABLED:
-		return "DISABLED";
-	case HAPD_IFACE_COUNTRY_UPDATE:
-		return "COUNTRY_UPDATE";
-	case HAPD_IFACE_ACS:
-		return "ACS";
-	case HAPD_IFACE_HT_SCAN:
-		return "HT_SCAN";
-	case HAPD_IFACE_DFS:
-		return "DFS";
-	case HAPD_IFACE_ENABLED:
-		return "ENABLED";
-	}
-
-	return "UNKNOWN";
-}
-
-
-void hostapd_set_state(struct hostapd_iface *iface, enum hostapd_iface_state s)
-{
-	wpa_printf(MSG_INFO, "%s: interface state %s->%s",
-		   iface->conf ? iface->conf->bss[0]->iface : "N/A",
-		   hostapd_state_text(iface->state), hostapd_state_text(s));
-	iface->state = s;
-}
-
-
-int hostapd_csa_in_progress(struct hostapd_iface *iface)
-{
-	unsigned int i;
-
-	for (i = 0; i < iface->num_bss; i++)
-		if (iface->bss[i]->csa_in_progress)
-			return 1;
-	return 0;
-}
-
-
-#ifdef NEED_AP_MLME
-
-static void free_beacon_data(struct beacon_data *beacon)
-{
-	os_free(beacon->head);
-	beacon->head = NULL;
-	os_free(beacon->tail);
-	beacon->tail = NULL;
-	os_free(beacon->probe_resp);
-	beacon->probe_resp = NULL;
-	os_free(beacon->beacon_ies);
-	beacon->beacon_ies = NULL;
-	os_free(beacon->proberesp_ies);
-	beacon->proberesp_ies = NULL;
-	os_free(beacon->assocresp_ies);
-	beacon->assocresp_ies = NULL;
-}
-
-
-static int hostapd_build_beacon_data(struct hostapd_data *hapd,
-				     struct beacon_data *beacon)
-{
-	struct wpabuf *beacon_extra, *proberesp_extra, *assocresp_extra;
-	struct wpa_driver_ap_params params;
-	int ret;
-
-	os_memset(beacon, 0, sizeof(*beacon));
-	ret = ieee802_11_build_ap_params(hapd, &params);
-	if (ret < 0)
-		return ret;
-
-	ret = hostapd_build_ap_extra_ies(hapd, &beacon_extra,
-					 &proberesp_extra,
-					 &assocresp_extra);
-	if (ret)
-		goto free_ap_params;
-
-	ret = -1;
-	beacon->head = os_memdup(params.head, params.head_len);
-	if (!beacon->head)
-		goto free_ap_extra_ies;
-
-	beacon->head_len = params.head_len;
-
-	beacon->tail = os_memdup(params.tail, params.tail_len);
-	if (!beacon->tail)
-		goto free_beacon;
-
-	beacon->tail_len = params.tail_len;
-
-	if (params.proberesp != NULL) {
-		beacon->probe_resp = os_memdup(params.proberesp,
-					       params.proberesp_len);
-		if (!beacon->probe_resp)
-			goto free_beacon;
-
-		beacon->probe_resp_len = params.proberesp_len;
-	}
-
-	/* copy the extra ies */
-	if (beacon_extra) {
-		beacon->beacon_ies = os_memdup(beacon_extra->buf,
-					       wpabuf_len(beacon_extra));
-		if (!beacon->beacon_ies)
-			goto free_beacon;
-
-		beacon->beacon_ies_len = wpabuf_len(beacon_extra);
-	}
-
-	if (proberesp_extra) {
-		beacon->proberesp_ies = os_memdup(proberesp_extra->buf,
-						  wpabuf_len(proberesp_extra));
-		if (!beacon->proberesp_ies)
-			goto free_beacon;
-
-		beacon->proberesp_ies_len = wpabuf_len(proberesp_extra);
-	}
-
-	if (assocresp_extra) {
-		beacon->assocresp_ies = os_memdup(assocresp_extra->buf,
-						  wpabuf_len(assocresp_extra));
-		if (!beacon->assocresp_ies)
-			goto free_beacon;
-
-		beacon->assocresp_ies_len = wpabuf_len(assocresp_extra);
-	}
-
-	ret = 0;
-free_beacon:
-	/* if the function fails, the caller should not free beacon data */
-	if (ret)
-		free_beacon_data(beacon);
-
-free_ap_extra_ies:
-	hostapd_free_ap_extra_ies(hapd, beacon_extra, proberesp_extra,
-				  assocresp_extra);
-free_ap_params:
-	ieee802_11_free_ap_params(&params);
-	return ret;
-}
-
-
-/*
- * TODO: This flow currently supports only changing channel and width within
- * the same hw_mode. Any other changes to MAC parameters or provided settings
- * are not supported.
- */
-static int hostapd_change_config_freq(struct hostapd_data *hapd,
-				      struct hostapd_config *conf,
-				      struct hostapd_freq_params *params,
-				      struct hostapd_freq_params *old_params)
-{
-	int channel;
-	u8 seg0, seg1;
-	struct hostapd_hw_modes *mode;
-
-	if (!params->channel) {
-		/* check if the new channel is supported by hw */
-		params->channel = hostapd_hw_get_channel(hapd, params->freq);
-	}
-
-	channel = params->channel;
-	if (!channel)
-		return -1;
-
-	mode = hapd->iface->current_mode;
-
-	/* if a pointer to old_params is provided we save previous state */
-	if (old_params &&
-	    hostapd_set_freq_params(old_params, conf->hw_mode,
-				    hostapd_hw_get_freq(hapd, conf->channel),
-				    conf->channel, conf->enable_edmg,
-				    conf->edmg_channel, conf->ieee80211n,
-				    conf->ieee80211ac, conf->ieee80211ax,
-				    conf->secondary_channel,
-				    hostapd_get_oper_chwidth(conf),
-				    hostapd_get_oper_centr_freq_seg0_idx(conf),
-				    hostapd_get_oper_centr_freq_seg1_idx(conf),
-				    conf->vht_capab,
-				    mode ? &mode->he_capab[IEEE80211_MODE_AP] :
-				    NULL))
-		return -1;
-
-	switch (params->bandwidth) {
-	case 0:
-	case 20:
-		conf->ht_capab &= ~HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET;
-		break;
-	case 40:
-	case 80:
-	case 160:
-		conf->ht_capab |= HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET;
-		break;
-	default:
-		return -1;
-	}
-
-	switch (params->bandwidth) {
-	case 0:
-	case 20:
-	case 40:
-		hostapd_set_oper_chwidth(conf, CHANWIDTH_USE_HT);
-		break;
-	case 80:
-		if (params->center_freq2)
-			hostapd_set_oper_chwidth(conf, CHANWIDTH_80P80MHZ);
-		else
-			hostapd_set_oper_chwidth(conf, CHANWIDTH_80MHZ);
-		break;
-	case 160:
-		hostapd_set_oper_chwidth(conf, CHANWIDTH_160MHZ);
-		break;
-	default:
-		return -1;
-	}
-
-	conf->channel = channel;
-	conf->ieee80211n = params->ht_enabled;
-	conf->ieee80211ac = params->vht_enabled;
-	conf->secondary_channel = params->sec_channel_offset;
-	ieee80211_freq_to_chan(params->center_freq1,
-			       &seg0);
-	ieee80211_freq_to_chan(params->center_freq2,
-			       &seg1);
-	hostapd_set_oper_centr_freq_seg0_idx(conf, seg0);
-	hostapd_set_oper_centr_freq_seg1_idx(conf, seg1);
-
-	/* TODO: maybe call here hostapd_config_check here? */
-
-	return 0;
-}
-
-
-static int hostapd_fill_csa_settings(struct hostapd_data *hapd,
-				     struct csa_settings *settings)
-{
-	struct hostapd_iface *iface = hapd->iface;
-	struct hostapd_freq_params old_freq;
-	int ret;
-	u8 chan, bandwidth;
-
-	os_memset(&old_freq, 0, sizeof(old_freq));
-	if (!iface || !iface->freq || hapd->csa_in_progress)
-		return -1;
-
-	switch (settings->freq_params.bandwidth) {
-	case 80:
-		if (settings->freq_params.center_freq2)
-			bandwidth = CHANWIDTH_80P80MHZ;
-		else
-			bandwidth = CHANWIDTH_80MHZ;
-		break;
-	case 160:
-		bandwidth = CHANWIDTH_160MHZ;
-		break;
-	default:
-		bandwidth = CHANWIDTH_USE_HT;
-		break;
-	}
-
-	if (ieee80211_freq_to_channel_ext(
-		    settings->freq_params.freq,
-		    settings->freq_params.sec_channel_offset,
-		    bandwidth,
-		    &hapd->iface->cs_oper_class,
-		    &chan) == NUM_HOSTAPD_MODES) {
-		wpa_printf(MSG_DEBUG,
-			   "invalid frequency for channel switch (freq=%d, sec_channel_offset=%d, vht_enabled=%d, he_enabled=%d)",
-			   settings->freq_params.freq,
-			   settings->freq_params.sec_channel_offset,
-			   settings->freq_params.vht_enabled,
-			   settings->freq_params.he_enabled);
-		return -1;
-	}
-
-	settings->freq_params.channel = chan;
-
-	ret = hostapd_change_config_freq(iface->bss[0], iface->conf,
-					 &settings->freq_params,
-					 &old_freq);
-	if (ret)
-		return ret;
-
-	ret = hostapd_build_beacon_data(hapd, &settings->beacon_after);
-
-	/* change back the configuration */
-	hostapd_change_config_freq(iface->bss[0], iface->conf,
-				   &old_freq, NULL);
-
-	if (ret)
-		return ret;
-
-	/* set channel switch parameters for csa ie */
-	hapd->cs_freq_params = settings->freq_params;
-	hapd->cs_count = settings->cs_count;
-	hapd->cs_block_tx = settings->block_tx;
-
-	ret = hostapd_build_beacon_data(hapd, &settings->beacon_csa);
-	if (ret) {
-		free_beacon_data(&settings->beacon_after);
-		return ret;
-	}
-
-	settings->counter_offset_beacon[0] = hapd->cs_c_off_beacon;
-	settings->counter_offset_presp[0] = hapd->cs_c_off_proberesp;
-	settings->counter_offset_beacon[1] = hapd->cs_c_off_ecsa_beacon;
-	settings->counter_offset_presp[1] = hapd->cs_c_off_ecsa_proberesp;
-
-	return 0;
-}
-
-
-void hostapd_cleanup_cs_params(struct hostapd_data *hapd)
-{
-	os_memset(&hapd->cs_freq_params, 0, sizeof(hapd->cs_freq_params));
-	hapd->cs_count = 0;
-	hapd->cs_block_tx = 0;
-	hapd->cs_c_off_beacon = 0;
-	hapd->cs_c_off_proberesp = 0;
-	hapd->csa_in_progress = 0;
-	hapd->cs_c_off_ecsa_beacon = 0;
-	hapd->cs_c_off_ecsa_proberesp = 0;
-}
-
-
-void hostapd_chan_switch_config(struct hostapd_data *hapd,
-				struct hostapd_freq_params *freq_params)
-{
-	if (freq_params->he_enabled)
-		hapd->iconf->ch_switch_he_config |= CH_SWITCH_HE_ENABLED;
-	else
-		hapd->iconf->ch_switch_he_config |= CH_SWITCH_HE_DISABLED;
-
-	if (freq_params->vht_enabled)
-		hapd->iconf->ch_switch_vht_config |= CH_SWITCH_VHT_ENABLED;
-	else
-		hapd->iconf->ch_switch_vht_config |= CH_SWITCH_VHT_DISABLED;
-
-	hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
-		       HOSTAPD_LEVEL_INFO,
-		       "CHAN_SWITCH HE config 0x%x VHT config 0x%x",
-		       hapd->iconf->ch_switch_he_config,
-		       hapd->iconf->ch_switch_vht_config);
-}
-
-
-int hostapd_switch_channel(struct hostapd_data *hapd,
-			   struct csa_settings *settings)
-{
-	int ret;
-
-	if (!(hapd->iface->drv_flags & WPA_DRIVER_FLAGS_AP_CSA)) {
-		wpa_printf(MSG_INFO, "CSA is not supported");
-		return -1;
-	}
-
-	ret = hostapd_fill_csa_settings(hapd, settings);
-	if (ret)
-		return ret;
-
-	ret = hostapd_drv_switch_channel(hapd, settings);
-	free_beacon_data(&settings->beacon_csa);
-	free_beacon_data(&settings->beacon_after);
-
-	if (ret) {
-		/* if we failed, clean cs parameters */
-		hostapd_cleanup_cs_params(hapd);
-		return ret;
-	}
-
-	hapd->csa_in_progress = 1;
-	return 0;
-}
-
-
-void
-hostapd_switch_channel_fallback(struct hostapd_iface *iface,
-				const struct hostapd_freq_params *freq_params)
-{
-	int seg0_idx = 0, seg1_idx = 0, bw = CHANWIDTH_USE_HT;
-
-	wpa_printf(MSG_DEBUG, "Restarting all CSA-related BSSes");
-
-	if (freq_params->center_freq1)
-		seg0_idx = 36 + (freq_params->center_freq1 - 5180) / 5;
-	if (freq_params->center_freq2)
-		seg1_idx = 36 + (freq_params->center_freq2 - 5180) / 5;
-
-	switch (freq_params->bandwidth) {
-	case 0:
-	case 20:
-	case 40:
-		bw = CHANWIDTH_USE_HT;
-		break;
-	case 80:
-		if (freq_params->center_freq2)
-			bw = CHANWIDTH_80P80MHZ;
-		else
-			bw = CHANWIDTH_80MHZ;
-		break;
-	case 160:
-		bw = CHANWIDTH_160MHZ;
-		break;
-	default:
-		wpa_printf(MSG_WARNING, "Unknown CSA bandwidth: %d",
-			   freq_params->bandwidth);
-		break;
-	}
-
-	iface->freq = freq_params->freq;
-	iface->conf->channel = freq_params->channel;
-	iface->conf->secondary_channel = freq_params->sec_channel_offset;
-	hostapd_set_oper_centr_freq_seg0_idx(iface->conf, seg0_idx);
-	hostapd_set_oper_centr_freq_seg1_idx(iface->conf, seg1_idx);
-	hostapd_set_oper_chwidth(iface->conf, bw);
-	iface->conf->ieee80211n = freq_params->ht_enabled;
-	iface->conf->ieee80211ac = freq_params->vht_enabled;
-	iface->conf->ieee80211ax = freq_params->he_enabled;
-
-	/*
-	 * cs_params must not be cleared earlier because the freq_params
-	 * argument may actually point to one of these.
-	 * These params will be cleared during interface disable below.
-	 */
-	hostapd_disable_iface(iface);
-	hostapd_enable_iface(iface);
-}
-
-#endif /* NEED_AP_MLME */
-
-
-struct hostapd_data * hostapd_get_iface(struct hapd_interfaces *interfaces,
-					const char *ifname)
-{
-	size_t i, j;
-
-	for (i = 0; i < interfaces->count; i++) {
-		struct hostapd_iface *iface = interfaces->iface[i];
-
-		for (j = 0; j < iface->num_bss; j++) {
-			struct hostapd_data *hapd = iface->bss[j];
-
-			if (os_strcmp(ifname, hapd->conf->iface) == 0)
-				return hapd;
-		}
-	}
-
-	return NULL;
-}
-
-
-void hostapd_periodic_iface(struct hostapd_iface *iface)
-{
-	size_t i;
-
-	ap_list_timer(iface);
-
-	for (i = 0; i < iface->num_bss; i++) {
-		struct hostapd_data *hapd = iface->bss[i];
-
-		if (!hapd->started)
-			continue;
-
-#ifndef CONFIG_NO_RADIUS
-		hostapd_acl_expire(hapd);
-#endif /* CONFIG_NO_RADIUS */
-	}
-}
-
-
-#ifdef CONFIG_OCV
-void hostapd_ocv_check_csa_sa_query(void *eloop_ctx, void *timeout_ctx)
-{
-	struct hostapd_data *hapd = eloop_ctx;
-	struct sta_info *sta;
-
-	wpa_printf(MSG_DEBUG, "OCV: Post-CSA SA Query initiation check");
-
-	for (sta = hapd->sta_list; sta; sta = sta->next) {
-		if (!sta->post_csa_sa_query)
-			continue;
-
-		wpa_printf(MSG_DEBUG, "OCV: OCVC STA " MACSTR
-			   " did not start SA Query after CSA - disconnect",
-			   MAC2STR(sta->addr));
-		ap_sta_disconnect(hapd, sta, sta->addr,
-				  WLAN_REASON_PREV_AUTH_NOT_VALID);
-	}
-}
-#endif /* CONFIG_OCV */
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/src/ap/hostapd_patch_20230316.diff b/src/lynq/packages/thirdpart/lynq-wg870/src/ap/hostapd_patch_20230316.diff
deleted file mode 100755
index 96a7d2c..0000000
--- a/src/lynq/packages/thirdpart/lynq-wg870/src/ap/hostapd_patch_20230316.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- b/hostapd.c	2023-03-16 16:56:03.313755143 +0800
-+++ a/hostapd.c	2023-03-16 16:57:59.997750241 +0800
-@@ -2294,8 +2294,9 @@
- 		 * If freq is DFS, and DFS is offloaded to the driver, then wait
- 		 * for CAC to complete.
- 		 */
--		wpa_printf(MSG_DEBUG, "%s: Wait for CAC to complete", __func__);
--		return res_dfs_offload;
-+		//wpa_printf(MSG_DEBUG, "%s: Wait for CAC to complete", __func__);
-+		wpa_printf(MSG_DEBUG, "IFX: don't need wait for CAC to complete");
-+		//return res_dfs_offload;
- 	}
- 
- #ifdef NEED_AP_MLME
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/Makefile b/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/Makefile
deleted file mode 100755
index cffba62..0000000
--- a/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-all:
-	@echo Nothing to be made.
-
-clean:
-	for d in $(SUBDIRS); do make -C $$d clean; done
-	rm -f *~ *.o *.d
-
-install:
-	@echo Nothing to be made.
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi.h b/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi.h
deleted file mode 100755
index 075b9ba..0000000
--- a/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/** @file wapi.h
- *  @brief This header file contains data structures and function declarations of wapi
- *
- *  Copyright (C) 2001-2008, Iwncomm Ltd.
- */
-
-#ifndef WAPI_H
-#define WAPI_H
-
-#include "wapi_asue.h"
-
-//#define BIT(n) (1 << (n))
-
-
-#define WAI_VERSION 1
-#define WAI_TYPE 1
-/*WAI packets type*/
-enum { 
-	WAI_PREAUTH_START	= 0x01,	/*pre-authentication start*/
-	WAI_STAKEY_REQUEST = 0x02,	/*STAKey request */
-	WAI_AUTHACTIVE	= 0x03,			/*authentication activation*/
-	WAI_ACCESS_AUTH_REQUEST = 0x04,	/*access authentication request */
-	WAI_ACCESS_AUTH_RESPONSE = 0x05,	/*access authentication response */
-	WAI_CERT_AUTH_REQUEST = 0x06,	/*certificate authentication request */
-	WAI_CERT_AUTH_RESPONSE = 0x07,	/*certificate authentication response */
-	WAI_USK_NEGOTIATION_REQUEST = 0x08,	/*unicast key negotiation request */
-	WAI_USK_NEGOTIATION_RESPONSE = 0x09,	/* unicast key negotiation response */
-	WAI_USK_NEGOTIATION_CONFIRMATION = 0x0A,/*unicast key negotiation confirmation */
-	WAI_MSK_ANNOUNCEMENT = 0x0B, /*multicast key/STAKey announcement */
-	WAI_MSK_ANNOUNCEMENT_RESPONSE = 0x0C, /*multicast key/STAKey announcement response */
-	//WAI_SENDBK = 0x10, /*BK  for TMC ??*/
-};
-
-
-enum {
-	REASON_RETRY_TIMEOUT = 25
-};
-
-//void * MEMCPY(void *dbuf, const void *srcbuf, int len) ;
-
-#endif /* WPA_H */
-
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_asue.c b/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_asue.c
deleted file mode 100755
index 06186ef..0000000
--- a/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_asue.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/* @file wapi_asue.c
- * @brief This file contains functions for wapi_asue
- *
- *  Copyright (C) 2001-2008, Iwncomm Ltd.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <string.h>
-#include <assert.h>
-/*for declaration of function `inet_addr'*/
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <signal.h>
-#include <sys/time.h>
-
-#include "wireless_copy.h"
-#include "common.h"
-#include "version.h"
-#include "wapi_asue.h"
-#include "wapi.h"
-#include "wapi_config.h"
-#include "wapi_asue_i.h"
-#include "utils/eloop.h"
-#include "drivers/driver_wext.h"
-#include "wapi/wapi_interface.h"
-#include "wpa.h"
-#include "wpa_supplicant_i.h"
-#include "wpa_ctrl.h"
-
-extern void eloop_handle_alarm(int sig);
-
-struct wpa_supplicant * wapi_asue_match_supp_handle(struct wpa_global *global)
-{
-        struct wpa_supplicant *wpa_s;
-        for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
-                if (os_strcmp(wpa_s->ifname, wapi_asue_get_ifname()) == 0) {
-                        return wpa_s;
-                }
-        }
-        wpa_printf(MSG_ERROR, "%s: No matching supp handle found\n", __FUNCTION__);
-        return NULL;
-}
-
-void *free_rxfrag(struct wapi_rxfrag *frag)
-{
-	if(frag != NULL){
-		free_buffer((void *)(frag->data), frag->maxlen);
-		free_buffer((void *)frag, sizeof(struct wapi_rxfrag ));
-	}
-	return NULL;
-}
-
-void wapi_asue_rx_wai(void *ctx, const u8 *src_addr, const u8 *buf, size_t len)
-{
-    wpa_printf(MSG_DEBUG, "%s, received %d bytes packet: %s\n",
-		__FUNCTION__, len, buf);
-    WAI_RX_packets_indication(buf, len);
-}
-
-unsigned char WIFI_get_rand_byte()
-{
-	return (unsigned char)(rand() & 0xFF);
-}
-
-void WIFI_Action_Deauth()
-{
-    struct wpa_global *global;
-    struct wpa_supplicant *wpa_s;
-
-    global = (struct wpa_global *)eloop_get_user_data(); 
-    wpa_s = global->ifaces;
-
-    wpa_msg(wpa_s, MSG_INFO, "WAPI: authentication failed");
-    wpa_supplicant_deauthenticate(wpa_s, 15);
-}
-
-unsigned long WIFI_TX_packet(const char* pbuf, int length)
-{
-	struct wpa_global *global;
-	struct wpa_supplicant *wpa_s;
-	int ret;
-
-	global = (struct wpa_global *)eloop_get_user_data();
-	wpa_s = wapi_asue_match_supp_handle(global);
-
-	wpa_printf(MSG_DEBUG, "%s: sending l2 %d bytes data: %s\n",
-		__FUNCTION__, length, pbuf);
-	ret = l2_packet_send(wpa_s->l2_wapi, wpa_s->bssid, 0x88b4,
-		(const u8*)pbuf, (unsigned  int)length);
-
-	if (ret < 0) {
-		return 0;
-	}
-	else {
-		return (unsigned long)ret;
-	}
-}
-
-int WIFI_group_key_set(const unsigned char* pKeyValue, int keylength, int key_idx, const unsigned char* keyIV)
-{
-	struct wpa_global *global;
-	struct wpa_supplicant *wpa_s;
-	int alg;
-
-	wpa_printf(MSG_DEBUG, "WIFI_group_key_set: Installing group key to the driver.");
-	wpa_hexdump(MSG_DEBUG, "WIFI_group_key_set: KEYSC", keyIV, 16);
-
-	global = (struct wpa_global *)eloop_get_user_data();
-	wpa_s = wapi_asue_match_supp_handle(global);
-
-	alg = WAPI_ALG_SMS4;
-	if (wapi_drv_set_key(wpa_s, alg, (u8 *) "\xff\xff\xff\xff\xff\xff",
-			key_idx, 1, keyIV, 16,   pKeyValue, keylength,
-			KEY_FLAG_GROUP_RX_TX_DEFAULT) < 0) {
-		wpa_printf(MSG_WARNING, "WPA: Failed to set MSK to "
-			   "the driver.");
-		return -1;
-	}
-	else {
-	    wpa_printf(MSG_DEBUG, "WAPI: succeeded to set MSK to the driver.");
-	}
-
-	wpa_printf(MSG_DEBUG,"WIFI_group_key_set(): after setting the group key,"
-		"set the wapi again.\n");
-
-	wpa_printf(MSG_DEBUG,"wpa_s->conf->wapi_policy = 0x%x\n",
-		wpa_s->wapi_conf->wapi_policy);
-
-	if (wapi_drv_set_wapi(wpa_s, wpa_s->wapi_conf->wapi_policy) < 0) {
-		wpa_printf(MSG_ERROR, "Failed to enable WPA in the driver.\n");
-		return -1;
-	}
-	else {
-	    wpa_printf(MSG_DEBUG,"WIFI_group_key_set(): calling "
-			"wpa_supplicant_set_state(WPA_COMPLETE).\n");
-	    wpa_s->wapi_state = WAPI_COMPLETED; 
-	    wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
-	}
-	
-	return 0;
-}
-
-
-int WIFI_unicast_key_set(const char* pKeyValue, int keylength, int key_idx)
-{
-	struct wpa_global *global;
-	struct wpa_supplicant *wpa_s;
-
-	int alg, keylen, rsclen;
-	u8 *key_rsc;
-	u8 null_rsc[16] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-
-	wpa_printf(MSG_DEBUG, "WIFI_unicast_key_set: Installing USK to the driver.");
-
-	global = (struct wpa_global *)eloop_get_user_data(); 
-	wpa_s = wapi_asue_match_supp_handle(global);
-
-	alg = WAPI_ALG_SMS4;
-	keylen = 32;
-	rsclen = 16;
-
-	key_rsc = null_rsc;
-	if (wapi_drv_set_key(wpa_s, alg, wpa_s->bssid, key_idx, 1, key_rsc, rsclen,
-			    (u8 *) pKeyValue, keylen, KEY_FLAG_PAIRWISE_RX_TX) < 0) {
-	    wpa_printf(MSG_WARNING, "WIFI_unicast_key_set: Failed to set PTK to the driver");
-	    return -1;
-	}
-
-	return 0;
-}
-
-static void init_sigaction(int signum, OS_timer_expired handle)
-{
-	signal(signum, handle);
-}
-
-void* OS_timer_setup(int deltaTimer, int repeated, OS_timer_expired pfunction,
-						const void* pdata)
-{
-	struct itimerval value;
-	int sec = 0, usec = 0;
-	int repsec = 0, repusec = 0;
-	
-	if (deltaTimer < 0 || repeated < 0 || pfunction == NULL)
-		return NULL;
-	
-	init_sigaction(SIGALRM, pfunction);
-
-	sec  = deltaTimer/(1000);
-	usec = (deltaTimer%(1000)) * 1000;
-
-	repsec  = repeated/(1000);
-	repusec = (repeated%(1000)) * 1000;
-
-	memset(&value, 0, sizeof(value));
-
-	value.it_interval.tv_sec   = repsec;
-	value.it_interval.tv_usec = repusec;
-
-	value.it_value.tv_sec   = sec;
-	value.it_value.tv_usec = usec;
-
-	setitimer(ITIMER_REAL, &value, NULL);
-
-	return (void *)pfunction;
-}
-
-void OS_timer_clean(void* pTimer)
-{
-	struct itimerval value;
-	
-	memset(&value, 0, sizeof(value));
-	setitimer(ITIMER_REAL, &value, NULL);
-
-	signal(SIGALRM, eloop_handle_alarm);
-}
-
-int WIFI_WAI_IE_set(const u8* pbuf, int length)
-{
-	struct wpa_global *global;
-	struct wpa_supplicant *wpa_s;
-	
-	global = (struct wpa_global *)eloop_get_user_data(); 
-	wpa_printf(MSG_ERROR, "#### Enter WIFI_WAI_IE_set\n");
-	if (global == NULL) {
-	    wpa_printf(MSG_ERROR, " global = NULL\n");
-	    return -1;
-	}
-	else {
-	    wpa_s = wapi_asue_match_supp_handle(global);
-	}
-	if (wpa_s == NULL) {
-	    wpa_printf(MSG_ERROR, " wpa_s = NULL\n");
-	    return -1;
-	}
-	wpa_printf(MSG_ERROR, " Set wpa_s to global->ifaces");
-	wapi_drv_set_wpa_ie(wpa_s, pbuf, length);
-	wpa_s->assoc_wapi_ie_len = length;
-	wpa_printf(MSG_DEBUG, "wpa_s->assoc_wapi_ie_len : %d",
-		wpa_s->assoc_wapi_ie_len);
-	memcpy(wpa_s->assoc_wapi_ie, pbuf, length);
-	wpa_printf(MSG_DEBUG, "wpa_s->assoc_wapi_ie: [%02x][%02x][%02x][%02x]\n",
-			wpa_s->assoc_wapi_ie[0], wpa_s->assoc_wapi_ie[1],
-			wpa_s->assoc_wapi_ie[2], wpa_s->assoc_wapi_ie[3]);
-	wpa_printf(MSG_DEBUG, "@@@@@@@@@@@@@ wpa_s ===> %p\n",wpa_s);
-
-	return 0;
-}
-
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_asue.h b/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_asue.h
deleted file mode 100755
index 5ccb089..0000000
--- a/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_asue.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/** @file wapi_asue.h
- *  @brief This header file contains data structures and function declarations of wapi_asue
- *
- *  Copyright (C) 2001-2008, Iwncomm Ltd.
- */
-
-
-#ifndef __WAPI_ASUE_H__
-#define __WAPI_ASUE_H__
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <sys/time.h>
-#ifdef WAPI
-#include "../wpa_supplicant/config.h"
-#else
-#include "config.h"
-#endif
-#include "drivers/driver.h"
-#include "wapi_config.h"
-#include "l2_packet/l2_packet.h"
-//#include "wpa_supplicant.h"
-#include "wapi.h"
-
-#define CTRL_IFACE_SOCK struct sockaddr_in
-#define WPA_CTRL_IFACE_PORT 9003
-//#define WPA_CGI_IFACE_PORT 9002
-
-typedef enum {
-	WAPI_DISCONNECTED=0,		
-#ifdef WAPI
-	WAPI_UNDEFINED_1,
-#endif
-	WAPI_INACTIVE,
-	WAPI_SCANNING,
-#ifdef WAPI
-        WAPI_UNDEFINED_2,
-#endif
-	WAPI_ASSOCIATING,
-	WAPI_ASSOCIATED,
-	WAPI_AUTHENICATING,
-	WAPI_CERT_HANDSHAKE,
-	WAPI_3WAY_HANDSHAKE,
-	WAPI_3WAYING,
-	WAPI_GROUP_HANDSHAKE,
-	WAPI_GROUPING,
-	WAPI_COMPLETED
-} wapi_states;
-
-typedef enum {
-	WAI_ERR_INIT=0,
-	WAI_ERR_BKID,
-	WAI_ERR_CHALLENGE,
-	WAI_ERR_IE,
-	WAI_ERR_MIC,
-} wapi_wai_err;
-
-struct wai_hdr {
-	u8 version[2];
-	u8 type;
-	u8 stype;
-	u8 reserve[2]; 
-	u16 length;
-	u8 rxseq[2];				/* Packet	Sequence	Number	*/
-	u8 frag_sc;				/* Fragment Sequence Number*/
-	u8 more_frag;				/* Flag */
-	/* followed octets of data */
-};// __attribute__ ((packed));
-
-struct wapi_state_machine {
-	int bksa_count; /* number of entries in PMKSA cache */
-
-	u8 own_addr[ETH_ALEN];
-	const char *ifname;
-	u8 bssid[ETH_ALEN];
-
-	/* Selected configuration (based on Beacon/ProbeResp WAPI IE) */
-	unsigned int pairwise_cipher;
-	unsigned int group_cipher;
-	unsigned int key_mgmt;
-
-	u8 assoc_wapi_ie[256]; /* Own WAPI/RSN IE from (Re)AssocReq */
-	u8 assoc_wapi_ie_len;
-	u8 ap_wapi_ie[256];
-	u8 ap_wapi_ie_len;
-};
-
-struct wapi_rxfrag{
-	const u8 *data;
-	int data_len;
-	int maxlen;
-	int rxfragstamp;
-};
-typedef struct byte_data_{
-	u8 length;
-	u8 data[256];
-}byte_data;
-
-
-/*Structure retry buf*/
-struct _resendbuf_st{
-	u16 		cur_count;
-	u16		len;
-	void 	*data;
-};
-typedef struct _resendbuf_st resendbuf_st;
-
-
-/**
- * struct wapi_ssid - Network configuration data
- *
- * This structure includes all the configuration variables for a network. This
- * data is included in the per-interface configuration data as an element of
- * the network list, struct wpa_config::ssid. Each network block in the
- * configuration is mapped to a struct wpa_ssid instance.
- */
-
-struct wapi_asue_st {
-	struct l2_packet_data *l2;
-	u8 own_addr[ETH_ALEN];
-	u8 bssid[ETH_ALEN];
-	char ifname[100];
-	char *confname;
-	struct wapi_config *conf;
-	int reassociate; /* reassociation requested */
-	int disconnected; /* all connections disabled; i.e., do no reassociate
-			   * before this has been cleared */
-	int wai_received;		   	
-	/* Selected configuration (based on Beacon/ProbeResp WPA IE) */
-	int pairwise_cipher;
-	int group_cipher;
-	int key_mgmt;
-
-	void *drv_priv; /* private data used by driver_ops */
-	struct wpa_scan_result *scan_results;
-	int num_scan_results;
-	struct wpa_driver_ops *driver;
-	struct wapi_state_machine *wapi_sm;
-	int ctrl_sock; /* UNIX domain socket for control interface or -1 if
-			* not used */
-	int cgi_sock; /* UNIX domain socket for control interface or -1 if
-			* not used */
-	int rxfragstamp;
-	struct wapi_rxfrag *rxfrag;
-	u16 rxseq;
-	u16 txseq;
-
-	wapi_states wapi_state;
-	wapi_wai_err wai_err;
-	unsigned char last_wai_src[ETH_ALEN];
-	u8 pad;
-	u8 flag;
-	struct _resendbuf_st buf;
-	u8 assoc_wapi_ie[256]; /* Own WAPI/RSN IE from (Re)AssocReq */
-	u8 ap_wapi_ie[256];
-	u8 ap_wapi_ie_len;
-	u8 assoc_wapi_ie_len;
-};
-/**
- * wpa_supplicant_event - report a driver event for wpa_supplicant
- * @wpa_s: pointer to wpa_supplicant data; this is the @ctx variable registered
- *	with wpa_driver_events_init()
- * @event: event type (defined above)
- * @data: possible extra data for the event
- *
- * Driver wrapper code should call this function whenever an event is received
- * from the driver.
- */
-//void wapi_asue_event(struct wpa_supplicant *wpa_s, wpa_event_type event,
-//			  void *data);
-//int wapi_asue_get_scan_results(struct wpa_supplicant *wpa_s);
-//void wapi_asue_cancel_auth_timeout(struct wpa_supplicant *wpa_s);
-#ifdef CONFIG_NO_WPA_MSG
-#define wpa_msg(args...) do { } while (0)
-#else
-extern void wpa_msg(void *ctx, int level, const char *fmt, ...);
-#endif
-//void wapi_asue_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec);
-//void wapi_asue_associate(struct wpa_supplicant *wpa_s,const u8 *ssid, int ssid_len);
-//void wapi_asue_disassociate(struct wpa_supplicant *wpa_s, int reason_code);
-void *free_rxfrag(struct wapi_rxfrag *frag);
-void wapi_asue_rx_wai(void *ctx, const u8 *src_addr, const u8 *buf, size_t len);
-#endif
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_asue_i.h b/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_asue_i.h
deleted file mode 100755
index 8753526..0000000
--- a/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_asue_i.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/** @file wapi_asue_i.h
- *  @brief This header file contains data structures and function declarations of wapi_asue_i
- *
- *  Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
- *  Copyright (C) 2001-2008, Iwncomm Ltd.
- */
-
-#include "drivers/driver.h"
-#include "common.h"
-#include "wpa_supplicant_i.h"
-
-/* driver_ops */
-
-static inline int wapi_drv_set_wapi(struct wpa_supplicant *wpa_s, int enabled)
-{
-	if (wpa_s->driver->set_wapi)
-	{
-		int ret = -1;
-		ret = wpa_s->driver->set_wapi(wpa_s->drv_priv, enabled);
-		return ret;
-	}
-	return -1;
-}
-
-static inline int wapi_drv_set_key(struct wpa_supplicant *wpa_s, enum wpa_alg alg,
-				   const u8 *addr, int key_idx, int set_tx,
-				   const u8 *seq, size_t seq_len,
-				   const u8 *key, size_t key_len,
-				   enum key_flag key_flag)
-{
-	if (wpa_s->driver->set_key) {
-		struct wpa_driver_set_key_params params;
-
-		os_memset(&params, 0, sizeof(params));
-		params.ifname = wpa_s->ifname;
-		params.alg = alg;
-		params.addr = addr;
-		params.key_idx = key_idx;
-		params.set_tx = set_tx;
-		params.seq = seq;
-		params.seq_len = seq_len;
-		params.key = key;
-		params.key_len = key_len;
-		params.vlan_id = 0;
-		params.key_flag = key_flag;
-		return wpa_s->driver->set_key(wpa_s->drv_priv, &params);
-	}
-	return -1;
-}
-
-static inline int wapi_drv_set_wpa_ie(struct wpa_supplicant *wpa_s, const u8 *wpa_ie, size_t wpa_ie_len)
-{
-	if (wpa_s->driver->set_wpa_ie) {
-		return wpa_s->driver->set_wpa_ie(wpa_s->drv_priv, wpa_ie, wpa_ie_len);
-	}
-	return -1;
-}
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_config.c b/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_config.c
deleted file mode 100755
index fe1446f..0000000
--- a/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_config.c
+++ /dev/null
@@ -1,483 +0,0 @@
-/** @file wapi_config.c
-  * @brief This file contains functions for wapi_config
- *
- *  Copyright (C) 2001-2008, Iwncomm Ltd.
- */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <string.h>
-#include <dirent.h>
-
-//#include "wapi_common.h"
-#include "wapi_config.h"
-#include "config.h"
-#include "wapi.h"
-#include "utils/eloop.h"
-#include "wapi/wapi_interface.h"
-#include "wapi_asue.h"
-#include "wpa_supplicant_i.h"
-
-#define SEP_Q_MARK	'"'
-
-static int get_pr (char type, char *line, prop_data *prop)
-{
-    char *index = NULL;	
-    char *keyptr = NULL;
-
-    if (line[0] != '#')
-    {
-        // modified by kWlW, separator changed to this  vvv  from "="
-        keyptr = (char *)strstr(line, "setenv ");	
-		//finds the first occurrence of the substring 'setenv' in line
-        if (keyptr != NULL) line = keyptr + 7;   
-		/* Add size of 'setenv ' string */
-		index =  strstr (line, type == SEP_EQUAL ? "=" : type == SEP_SPACE ? " " : "\t");	
-        if (((char *)index) != NULL)
-        {
-            *((char *) index) = '\0';
-			/* skip leading spaces or tabs at the beginning of the line */
-			while ( (*line == ' ') || (*line == '\t') ){
-				line++;
-			}
-            if ((prop->key = (char *)malloc (strlen (line) + 1)) != NULL &&
-                (prop->value =(char *) malloc (strlen ((char *) (index + 1)) + 1)) != NULL)
-            {
-                strcpy (prop->key, line);
-                strcpy (prop->value, (char *) (index + 1));
-                return 1;
-            }
-        }
-    }
-    return 0;
-}
-
-
-int load_prop (char type, char *file_name, prop_data properties[])
-{
-	FILE *fid;
-	char line[1024];
-	int prop_count = 0;
-    char * buf;
-
-	if ((fid = fopen (file_name, "r")) == NULL)    return 0;
-	while (!feof (fid))
-	{
-		buf = fgets(line, 255, fid);
-		if(feof(fid)) break;
-		if (strchr(line, '\n'))  *(strchr(line, '\n')) = '\0';
-		if (get_pr (type, line, (prop_data *) & properties[prop_count]))
-		{
-			prop_count++;
-		}
-	}
-	fclose (fid);
-	return prop_count;
-}
-
-static char *strip (char *string, char delimiter)
-{
-  register int x, y;
-
-  y = strlen (string);
-  x = 0;
-  while ((x < y) && (string[x] == delimiter))
-    {
-	  x++;
-    };
-  while ((y > 0) && (string[y - 1] == delimiter))
-    {
-      y--;
-    };
-  string[y] = 0;
-  return string + x;
-}
-char *get_prop (char *key, char *result, prop_data properties[], int count)
-{
-  int index;
-  char tmp_str[256] = "";
-  for (index = 0; index < count; index++)
-    {
-      if (strcmp (properties[index].key, key) == 0)
-	{
-	  strcpy(tmp_str, properties[index].value);	
-	  strcpy (result, strip(tmp_str, SEP_Q_MARK));
-	  return result;
-	}
-    }
-  return NULL;
-}
-
-int hex2int(char c)
-{
-	if (c >= '0' && c <= '9')
-		return (c - '0');
-	if (c >= 'a' && c <= 'f')
-		return (c - 'a' + 10);
-	if (c >= 'A' && c <= 'F')
-		return (c - 'A' + 10);
-	return -1;
-}
-
-int str2byte( unsigned char *str, int len,  char *byte_out)
-{
-	int i, val, val2;
-	unsigned char *pos = str;
-	
-	for (i = 0; i < len/2; i++) {
-		val = hex2int(*pos++);
-		if (val < 0)
-			return -1;
-		val2 = hex2int(*pos++);
-		if (val2 < 0)
-			return -1;
-		byte_out[i] = (val * 16 + val2) & 0xff;
-	}
-
-	return 0;
-}
-
-void *get_buffer(int len)
-{
-	char *buffer=NULL;
-	buffer = (char *)malloc(len);
-	if(buffer)
-		memset(buffer, 0, len);
-	else
-		buffer = NULL;
-	return buffer;
-}
-void *free_buffer(void *buffer, int len)
-{
-	char *tmpbuf = (char *)buffer;
-
-	if(tmpbuf != NULL)
-	{
-		memset(tmpbuf, 0, len);
-		free(tmpbuf);
-		return NULL;
-	}
-	else
-		return NULL;
-}
-
-int free_prop (prop_data properties[], int count)
-{
-  int index;
-  for (index = 0; index < count; index++)
-    {
-      free (properties[index].key);
-      free (properties[index].value);
-    }
-  return 1;
-}
-
-int save_global_conf(char type, char* filename, char *command, char *key, char *value)
-{
-	FILE* fidIn, *fidOut;
-	char line[1024], tmp_line[1024];
-        char tmp_fname[255], *index;
-        char separator[2];
-        int i=0;
-    char * buf;
-	
-	if ((fidIn=fopen(filename,"r"))==NULL) return 0;
-	strcpy(tmp_fname,filename);	
-	strcat(tmp_fname,".new");
-	
-        if ((fidOut=fopen(tmp_fname,"w"))==NULL) return 0;
-
-        strcpy(separator,(type==SEP_EQUAL?"=":type==SEP_SPACE?" ":"\t"));
-        type=separator[0];
-
-	while(!feof(fidIn))
-	{
-		buf = fgets(line,1024,fidIn);
-		strcpy(tmp_line,command);
-		strcat(tmp_line,key);
-                if (((index=strstr(line,tmp_line))!=NULL) && (index==line)) {
-					printf("finding\n");
-                    i=1;
-                    if (!feof(fidIn)) {
-                        if (type != '0')
-                            fprintf(fidOut,"%s%s%c%s\n",command,key,type,value);
-                        else
-                            fprintf(fidOut,"%s%s%s\n",command,key,value);
-                    }
-                } else
-                    if (!feof(fidIn)) fprintf(fidOut,"%s",line);
-        }
-
-        if (i==0) {
-            if (type != '0') { fprintf(fidOut,"%s%s%c%s\n",command,key,type,value); }
-            else fprintf(fidOut,"%s%s%s\n",command,key,value);
-        }
-             
-	fclose(fidIn);
-	fclose(fidOut);
-	unlink(filename);
-	rename(tmp_fname,filename);
-	return 1;
-
-}
-
-int change_cert_format(const  char *cert_file, 
-		       unsigned char *out_user, 
-		       int len_user,
-		       unsigned char *out_asu,
-		       int len_asu);
-
-
-void wapi_config_free(struct wapi_config *config)
-{
-	struct wapi_config *prev = NULL;
-	prev = config;
-	if (prev) {
-		if(prev->ssid)
-			free(prev->ssid);
-		if(prev->cert_name)
-			free(prev->cert_name);
-		free(config);
-	}
-}
-
-/**
-  * Save User certificate status
-*/
-int save_cert_status(char *fileconfig, char *cert_flag)
-{
-	int res = 0;
-	res = !save_global_conf(SEP_EQUAL,fileconfig,"",  "CERT_STATUS",cert_flag);
-	if(res != 0)
-	{
-		wpa_printf(MSG_DEBUG, "open file %s error\n", fileconfig);
-	}
-	return res;
-}
-
-
-struct wapi_config * wapi_config_read(const char *config_file)
-{
-	char buf[256] = {0,};
-	prop_data properties[KEYS_MAX];
-	int prop_count=0;
-	struct wapi_config *config = NULL;
-	CNTAP_PARA lib_param;  
-	u8 psk_type = 0;
-    struct wpa_global *eloop = (struct wpa_global *)eloop_get_user_data();
-	
-    if ( eloop == NULL ) return NULL;
-
-	config = malloc(sizeof(*config));
-	if (config == NULL)
-		return NULL;
-	memset(config, 0, sizeof(*config));
-
-	wpa_printf(MSG_DEBUG, "Reading configuration file '%s'",
-		   config_file);
-	prop_count=load_prop(SEP_EQUAL, (char *)config_file,properties);	
-
-	if(prop_count == 0){
-		wpa_printf(MSG_ERROR, "no keys and values pair in configuration file '%s'",
-			   config_file);
-		return NULL;
-	}
-
-	memset(buf, 0, 256);
-
-	/*Get Authentication and Key Management Suites*/
-	get_prop("wapi", buf, properties, prop_count);
-	config->wapi_policy = atoi(buf);
-	wpa_printf(MSG_DEBUG, "wapi_policy '%d'",   config->wapi_policy);
-
-	if (config->wapi_policy & 0x08)
-	{
-		lib_param.authType = AUTH_TYPE_WAPI;
-	}
-	else
-		if (config->wapi_policy & 0x04)
-		{
-			lib_param.authType = AUTH_TYPE_WAPI_PSK;
-		}
-		else
-		{
-			lib_param.authType = AUTH_TYPE_NONE_WAPI;
-		}
-	
-	wpa_printf(MSG_DEBUG, "WAPI '%d'", config->wapi_policy);
-
-	if(config->wapi_policy != 0)
-	{
-		config->group_cipher = WAPI_CIPHER_SMS4;
-		config->pairwise_cipher = WAPI_CIPHER_SMS4;
-	}
-	memset(buf, 0, 256);
-
-	get_prop("ssid", buf, properties, prop_count);
-	config->ssid_len = strlen(buf);
-	config->ssid = (u8*)strdup(buf);
-	wpa_hexdump_ascii(MSG_DEBUG, " SSID:", config->ssid, config->ssid_len);
-
-	memset(buf, 0, 256);
-	get_prop("cert_index", buf, properties, prop_count);
-	eloop->cert_info.config.used_cert = (u8)atoi(buf);/*1:x509 2:GBW */
-
-	memset(buf, 0, 256);
-	get_prop("cert_name", eloop->cert_info.config.cert_name, properties, prop_count);
-	wpa_printf(MSG_DEBUG, "CERT_NAME '%s'", eloop->cert_info.config.cert_name);
-
-	if((config->wapi_policy & 0x08) && strlen(eloop->cert_info.config.cert_name))
-	{
-
-		change_cert_format(eloop->cert_info.config.cert_name,
-							lib_param.para.user, 2048,
-							lib_param.para.as, 2048);
-	}
-
-	memset(buf, 0, sizeof(buf));
-	get_prop("psk_key_type", buf, properties, prop_count);
-	psk_type = (u8)atoi(buf);
-	wpa_printf(MSG_DEBUG, "PSK_KEY_TYPE '%d'",   psk_type);
-
-	memset(buf, 0, 256);
-	get_prop("psk", buf, properties, prop_count);
-	wpa_printf(MSG_DEBUG, "PSK'%s'", buf);
-
-	if(config->wapi_policy & WAPI_KEY_MGMT_PSK){ /*bit 2:PSK*/
-
-		lib_param.para.kt = psk_type;
-		lib_param.para.kl = strlen(buf);
-		memcpy(lib_param.para.kv, buf, lib_param.para.kl);
-	}
-
-	WAI_CNTAPPARA_SET(&lib_param, eloop->ifaces->ifname);	// do it after the wpa_s has been attached to global
-	
-	/* copy wapi_config stuff into wpa_config structure? */
-	free_prop(properties,prop_count);
-	return config;
-}
-
-
-
-/**
- * find mark in src
- */
-static const unsigned char* findmark_mem(const unsigned char* src, int lsrc, const unsigned char* mark, int lmark)
-{
-	const unsigned char* p = src;
-	const unsigned char* pe = src+lsrc;
-	if (NULL==src || NULL==mark || lsrc<0 || lmark<0 || lsrc<lmark)
-	{
-		return NULL;
-	}
-	pe -= lmark;
-	for (; p<=pe; p++)
-	{
-		if (0 == memcmp(p, mark, lmark))
-		{
-			return p;
-		}
-	}
-	return NULL;
-}
-
-static const unsigned char* findstrmark_mem(const unsigned char* src, int lsrc, const char* mark)
-{
-	return findmark_mem(src, lsrc, (const unsigned char*)mark, strlen(mark));
-}
-
-int change_cert_format(const  char *cert_file, 
-						unsigned char *out_user, 
-						int len_user,
-						unsigned char *out_asu,
-						int len_asu)
-{
-	int ret = -1;
-	int len = 0;
-	unsigned char buf[1024*8] = {0};
-
-	const char* mark_asu_s = "-----BEGIN ASU CERTIFICATE-----";
-	const char* mark_asu_e = "-----END ASU CERTIFICATE-----";
-	const char* mark_user_s = "-----BEGIN USER CERTIFICATE-----";
-	const char* mark_user_e = "-----END USER CERTIFICATE-----";
-	const char* mark_ec_s = "-----BEGIN EC PRIVATE KEY-----";
-	const char* mark_ec_e = "-----END EC PRIVATE KEY-----";
-	const char* mark_s = "-----BEGIN CERTIFICATE-----";
-	const char* mark_e = "-----END CERTIFICATE-----";
-
-	if (cert_file == NULL || out_user == NULL || out_asu == NULL || len_user <= 0 || len_asu <= 0)
-	{
-		return ret;
-	}
-
-	{
-		FILE* fp = fopen((const char*)cert_file, "rb");
-		if (fp == NULL)
-		{
-			return ret;
-		}
-		len = fread(buf, 1, 1024*8, fp);
-		fclose(fp);
-		if (len <= 0)
-		{
-			return ret;
-		}
-	}
-
-	{
-		unsigned char *p  = NULL;
-		const unsigned char *ps  = NULL;
-		const unsigned char *pe  = NULL;
-		ps = findstrmark_mem(buf, len, mark_asu_s);
-		pe = findstrmark_mem(buf, len, mark_asu_e);
-		if (NULL==ps || NULL==pe || ps>=pe)
-		{
-			return ret;
-		}
-		if ((unsigned int)len_asu < strlen(mark_s)+pe-ps-strlen(mark_asu_s)+strlen(mark_e))
-		{
-			return ret;
-		}
-		p = out_asu;
-		memcpy(p, mark_s, strlen(mark_s));
-		p += strlen(mark_s);
-		memcpy(p, ps+strlen(mark_asu_s), pe-ps-strlen(mark_asu_s));
-		p += pe-ps-strlen(mark_asu_s);
-		memcpy(p, mark_e, strlen(mark_e));
-
-		ps = findstrmark_mem(buf, len, mark_user_s);
-		pe = findstrmark_mem(buf, len, mark_user_e);
-		if (NULL==ps || NULL==pe || ps>=pe)
-		{
-			return ret;
-		}
-		if ((unsigned int)len_user < strlen(mark_s)+pe-ps-strlen(mark_user_s)+strlen(mark_e))
-		{
-			return ret;
-		}
-		p = out_user;
-		memcpy(p, mark_s, strlen(mark_s));
-		p += strlen(mark_s);
-		memcpy(p, ps+strlen(mark_user_s), pe-ps-strlen(mark_user_s));
-		p += pe-ps-strlen(mark_user_s);
-		memcpy(p, mark_e, strlen(mark_e));
-		p += strlen(mark_e);
-
-		ps = findstrmark_mem(buf, len, mark_ec_s);
-		pe = findstrmark_mem(buf, len, mark_ec_e);
-		if (NULL==ps || NULL==pe || ps>=pe)
-		{
-			return ret;
-		}
-		if (len_user-strlen((char*)out_user) < pe-ps+strlen(mark_ec_e))
-		{
-			return ret;
-		}
-		memcpy(p, ps, pe-ps+strlen(mark_ec_e));
-	}
-	ret = 0;
-	return ret;
-}
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_config.h b/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_config.h
deleted file mode 100755
index feb88fc..0000000
--- a/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_config.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/** @file wapi_config.h

- *  @brief This header file contains data structures and function declarations of wapi_config

- *

- *  Copyright (C) 2001-2008, Iwncomm Ltd.

- */

-

-#ifndef __WAPI_CONFIG_H__

-#define __WAPI_CONFIG_H__

-

-#include "common.h"

-

-#define MAX_SSID_LEN 32

-#define BK_LEN 16

-#define EAP_PSK_LEN 16

-#define EAP_PSK_LEN 16

-#define WAPI_CIPHER_NONE BIT(0)

-#define WAPI_CIPHER_SMS4 BIT(4)

-

-#define WAPI_KEY_MGMT_NONE 0

-#define WAPI_KEY_MGMT_CERT BIT(1)

-#define WAPI_KEY_MGMT_PSK BIT(2)

-

-/* Separators */

-#define SEP_EQUAL '='

-#define SEP_SPACE ' '

-#define SEP_TAB (char)0x9

-

-#define ENABLE 		1

-#define DISABLE 		2

-#define MYVERIFY 		3

-#define LENGTH		255

-#define KEYS_MAX 	255

-

-

-struct prop_data_st

-{

-  char *key;

-  char *value;

-};

-

-typedef struct prop_data_st prop_data;

-

-struct asue_config

-{

-	char cert_name[256];

-	unsigned short used_cert;

-	unsigned short pad;

-};

-

-struct _asue_cert_info {

-	struct asue_config config;

-};

-

-int load_prop (char type, char *file_name, prop_data properties[]);

-char *get_prop (char *key, char *result, prop_data properties[], int count);

-int save_global_conf(char type, char* filename, char *command, char *key, char *value);

-int free_prop (prop_data properties[], int count);

-int hex2int(char c);

-void *get_buffer(int len);

-void *free_buffer(void *buffer, int len);

-int str2byte( unsigned char *str, int len,  char *byte_out);

-

-struct wapi_config{

-	u8 *ssid;

-	size_t ssid_len;

-	

-	u8 *psk;

-	size_t psk_len;

-	u8 psk_bk[BK_LEN];

-	int psk_set;

-	

-	int wapi_policy;

-	int wpi_policy;

-	int pairwise_cipher;

-	int group_cipher;

-	int key_mgmt;

-

-	int proto;

-	int auth_alg;

-	char *cert_name;

-	int disabled;

-};

-void wapi_config_free(struct wapi_config *config);

-struct wapi_config * wapi_config_read(const char *config_file);

-int change_cert_format(const  char *cert_file, unsigned char *out_user, int len_user, unsigned char *out_asu, int len_asu);

-#endif	

diff --git a/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_interface.h b/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_interface.h
deleted file mode 100755
index 2e82225..0000000
--- a/src/lynq/packages/thirdpart/lynq-wg870/src/wapi/wapi_interface.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/** @file wapi_interface.h
- *  @brief This header file contains data structures and function declarations of interface of this lib
- *
- *  Copyright (C) 2001-2008, Iwncomm Ltd.
- */
-
-
-#ifndef _INTERFACE_INOUT_H_
-#define _INTERFACE_INOUT_H_
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-
-typedef enum
-{
-	AUTH_TYPE_NONE_WAPI = 0,	/*no WAPI	*/
-	AUTH_TYPE_WAPI,			/*Certificate*/
-	AUTH_TYPE_WAPI_PSK,		/*Pre-PSK*/
-}AUTH_TYPE;
-
-typedef enum
-{
-	KEY_TYPE_ASCII = 0,			/*ascii		*/
-	KEY_TYPE_HEX,				/*HEX*/
-}KEY_TYPE;
-
-typedef struct
-{
-	AUTH_TYPE authType;		/*Authentication type*/
-	union
-	{
-		struct
-		{
-			KEY_TYPE kt;				/*Key type*/
-			unsigned int  kl;			/*key length*/
-			unsigned char kv[128];/*value*/
-		};
-		struct
-		{
-			unsigned char as[2048];	/*ASU Certificate*/
-			unsigned char user[2048];/*User Certificate*/
-		};
-	}para;
-}CNTAP_PARA;
-
-typedef enum
-{
-	CONN_ASSOC = 0,
-	CONN_DISASSOC,
-}CONN_STATUS;
-typedef struct
-{
-	unsigned char v[6];
-	unsigned char pad[2];
-}MAC_ADDRESS;
-
-/**
- * WAI_CNTAPPARA_SET - Set WIE to driver
- * @CNTAP_PARA: Pointer to  struct CNTAP_PARA
- * Returns: 0 on success, -1 on failure
- *
- * set WIE to driver 
- *
- */
-int WAI_CNTAPPARA_SET(const CNTAP_PARA* pPar, char *ifname);
-
-void WAI_Msg_Input(CONN_STATUS action, const MAC_ADDRESS* pBSSID, const MAC_ADDRESS* pLocalMAC, unsigned char *assoc_ie, unsigned char assoc_ie_len);
-
-unsigned long WAI_RX_packets_indication(const u8* pbuf, int length);
-
-int WIFI_lib_init();
-
-int WIFI_lib_exit();
-
-int WIFI_lib_initialized();
-
-int lib_get_wapi_state(void);
-
-
-
-typedef void (*OS_timer_expired)(const int pdata);
-void* OS_timer_setup(int deltaTimer, int repeated, OS_timer_expired pfunction, const void* pdata);
-void OS_timer_clean(void* pTimer);
-void WIFI_Action_Deauth();
-unsigned long WIFI_TX_packet(const char* pbuf, int length);
-int WIFI_unicast_key_set(const char* pKeyValue, int keylength, int key_idx);
-int WIFI_group_key_set(const unsigned char* pKeyValue, int keylength, int key_idx, const unsigned char* keyIV);
-int WIFI_WAI_IE_set(const unsigned char* pbuf, int length);
-unsigned char WIFI_get_rand_byte();
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* _INTERFACE_INOUT_H_  */
-
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/wpa_supplicant/.config b/src/lynq/packages/thirdpart/lynq-wg870/wpa_supplicant/.config
index 8f89787..0199bde 100755
--- a/src/lynq/packages/thirdpart/lynq-wg870/wpa_supplicant/.config
+++ b/src/lynq/packages/thirdpart/lynq-wg870/wpa_supplicant/.config
@@ -373,7 +373,7 @@
 
 # Add support for new DBus control interface
 # (fi.w1.hostap.wpa_supplicant1)
-CONFIG_CTRL_IFACE_DBUS_NEW=y
+#CONFIG_CTRL_IFACE_DBUS_NEW=y
 
 # Add introspection support for new DBus control interface
 CONFIG_CTRL_IFACE_DBUS_INTRO=y
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/wpa_supplicant/blacklist.c b/src/lynq/packages/thirdpart/lynq-wg870/wpa_supplicant/blacklist.c
deleted file mode 100755
index 2f32644..0000000
--- a/src/lynq/packages/thirdpart/lynq-wg870/wpa_supplicant/blacklist.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * wpa_supplicant - Temporary BSSID blacklist
- * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-#include "includes.h"
-
-#include "common.h"
-#include "wpa_supplicant_i.h"
-#include "blacklist.h"
-
-/**
- * wpa_blacklist_get - Get the blacklist entry for a BSSID
- * @wpa_s: Pointer to wpa_supplicant data
- * @bssid: BSSID
- * Returns: Matching blacklist entry for the BSSID or %NULL if not found
- */
-struct wpa_blacklist * wpa_blacklist_get(struct wpa_supplicant *wpa_s,
-					 const u8 *bssid)
-{
-	struct wpa_blacklist *e;
-
-	if (wpa_s == NULL || bssid == NULL)
-		return NULL;
-
-	if (wpa_s->current_ssid &&
-	    wpa_s->current_ssid->was_recently_reconfigured) {
-		wpa_blacklist_clear(wpa_s);
-		wpa_s->current_ssid->was_recently_reconfigured = false;
-		return NULL;
-	}
-
-	wpa_blacklist_update(wpa_s);
-
-	e = wpa_s->blacklist;
-	while (e) {
-		if (os_memcmp(e->bssid, bssid, ETH_ALEN) == 0)
-			return e;
-		e = e->next;
-	}
-
-	return NULL;
-}
-
-
-/**
- * wpa_blacklist_add - Add an BSSID to the blacklist
- * @wpa_s: Pointer to wpa_supplicant data
- * @bssid: BSSID to be added to the blacklist
- * Returns: Current blacklist count on success, -1 on failure
- *
- * This function adds the specified BSSID to the blacklist or increases the
- * blacklist count if the BSSID was already listed. It should be called when
- * an association attempt fails either due to the selected BSS rejecting
- * association or due to timeout.
- *
- * This blacklist is used to force %wpa_supplicant to go through all available
- * BSSes before retrying to associate with an BSS that rejected or timed out
- * association. It does not prevent the listed BSS from being used; it only
- * changes the order in which they are tried.
- */
-int wpa_blacklist_add(struct wpa_supplicant *wpa_s, const u8 *bssid)
-{
-	struct wpa_blacklist *e;
-	struct os_reltime now;
-
-	if (wpa_s == NULL || bssid == NULL)
-		return -1;
-
-	e = wpa_blacklist_get(wpa_s, bssid);
-	os_get_reltime(&now);
-	if (e) {
-		e->blacklist_start = now;
-		e->count++;
-		if (e->count > 5)
-			e->timeout_secs = 1800;
-		else if (e->count == 5)
-			e->timeout_secs = 600;
-		else if (e->count == 4)
-			e->timeout_secs = 120;
-		else if (e->count == 3)
-			e->timeout_secs = 60;
-		else
-			e->timeout_secs = 10;
-		wpa_printf(MSG_INFO, "BSSID " MACSTR
-			   " blacklist count incremented to %d, blacklisting for %d seconds",
-			   MAC2STR(bssid), e->count, e->timeout_secs);
-		return e->count;
-	}
-
-	e = os_zalloc(sizeof(*e));
-	if (e == NULL)
-		return -1;
-	os_memcpy(e->bssid, bssid, ETH_ALEN);
-	e->count = 1;
-	e->timeout_secs = 10;
-	e->blacklist_start = now;
-	e->next = wpa_s->blacklist;
-	wpa_s->blacklist = e;
-	wpa_printf(MSG_DEBUG, "Added BSSID " MACSTR
-		   " into blacklist, blacklisting for %d seconds",
-		   MAC2STR(bssid), e->timeout_secs);
-
-	return e->count;
-}
-
-
-/**
- * wpa_blacklist_del - Remove an BSSID from the blacklist
- * @wpa_s: Pointer to wpa_supplicant data
- * @bssid: BSSID to be removed from the blacklist
- * Returns: 0 on success, -1 on failure
- */
-int wpa_blacklist_del(struct wpa_supplicant *wpa_s, const u8 *bssid)
-{
-	struct wpa_blacklist *e, *prev = NULL;
-
-	if (wpa_s == NULL || bssid == NULL)
-		return -1;
-
-	e = wpa_s->blacklist;
-	while (e) {
-		if (os_memcmp(e->bssid, bssid, ETH_ALEN) == 0) {
-			if (prev == NULL) {
-				wpa_s->blacklist = e->next;
-			} else {
-				prev->next = e->next;
-			}
-			wpa_printf(MSG_DEBUG, "Removed BSSID " MACSTR " from "
-				   "blacklist", MAC2STR(bssid));
-			os_free(e);
-			return 0;
-		}
-		prev = e;
-		e = e->next;
-	}
-	return -1;
-}
-
-
-/**
- * wpa_blacklist_is_blacklisted - Check the blacklist status of a BSS
- * @wpa_s: Pointer to wpa_supplicant data
- * @bssid: BSSID to be checked
- * Returns: count if BSS is currently considered to be blacklisted, 0 otherwise
- */
-int wpa_blacklist_is_blacklisted(struct wpa_supplicant *wpa_s, const u8 *bssid)
-{
-	struct wpa_blacklist *e;
-	struct os_reltime now;
-
-	e = wpa_blacklist_get(wpa_s, bssid);
-	if (!e)
-		return 0;
-	os_get_reltime(&now);
-	if (os_reltime_expired(&now, &e->blacklist_start, e->timeout_secs))
-		return 0;
-	return e->count;
-}
-
-
-/**
- * wpa_blacklist_clear - Clear the blacklist of all entries
- * @wpa_s: Pointer to wpa_supplicant data
- */
-void wpa_blacklist_clear(struct wpa_supplicant *wpa_s)
-{
-	struct wpa_blacklist *e, *prev;
-
-	e = wpa_s->blacklist;
-	wpa_s->blacklist = NULL;
-	while (e) {
-		prev = e;
-		e = e->next;
-		wpa_printf(MSG_DEBUG, "Removed BSSID " MACSTR " from "
-			   "blacklist (clear)", MAC2STR(prev->bssid));
-		os_free(prev);
-	}
-}
-
-
-/**
- * wpa_blacklist_update - Update the entries in the blacklist,
- * deleting entries that have been expired for over an hour.
- * @wpa_s: Pointer to wpa_supplicant data
- */
-void wpa_blacklist_update(struct wpa_supplicant *wpa_s)
-{
-	struct wpa_blacklist *e, *prev = NULL;
-	struct os_reltime now;
-
-	if (!wpa_s)
-		return;
-
-	e = wpa_s->blacklist;
-	os_get_reltime(&now);
-	while (e) {
-		if (os_reltime_expired(&now, &e->blacklist_start,
-				       e->timeout_secs + 3600)) {
-			struct wpa_blacklist *to_delete = e;
-
-			if (prev) {
-				prev->next = e->next;
-				e = prev->next;
-			} else {
-				wpa_s->blacklist = e->next;
-				e = wpa_s->blacklist;
-			}
-			wpa_printf(MSG_INFO, "Removed BSSID " MACSTR
-				   " from blacklist (expired)",
-				   MAC2STR(to_delete->bssid));
-			os_free(to_delete);
-		} else {
-			prev = e;
-			e = e->next;
-		}
-	}
-}
diff --git a/src/lynq/packages/thirdpart/lynq-wg870/wpa_supplicant/blacklist.h b/src/lynq/packages/thirdpart/lynq-wg870/wpa_supplicant/blacklist.h
deleted file mode 100755
index a1c60d5..0000000
--- a/src/lynq/packages/thirdpart/lynq-wg870/wpa_supplicant/blacklist.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * wpa_supplicant - Temporary BSSID blacklist
- * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-#ifndef BLACKLIST_H
-#define BLACKLIST_H
-
-struct wpa_blacklist {
-	struct wpa_blacklist *next;
-	u8 bssid[ETH_ALEN];
-	int count;
-	/* Time of most recent blacklist event. */
-	struct os_reltime blacklist_start;
-	/*
-	 * Number of seconds after blacklist_start that the entry will be
-	 * considered blacklisted.
-	 */
-	int timeout_secs;
-};
-
-struct wpa_blacklist * wpa_blacklist_get(struct wpa_supplicant *wpa_s,
-					 const u8 *bssid);
-int wpa_blacklist_add(struct wpa_supplicant *wpa_s, const u8 *bssid);
-int wpa_blacklist_del(struct wpa_supplicant *wpa_s, const u8 *bssid);
-int wpa_blacklist_is_blacklisted(struct wpa_supplicant *wpa_s, const u8 *bssid);
-void wpa_blacklist_clear(struct wpa_supplicant *wpa_s);
-void wpa_blacklist_update(struct wpa_supplicant *wpa_s);
-
-#endif /* BLACKLIST_H */