]> git.ipfire.org Git - thirdparty/hostap.git/blobdiff - src/ap/drv_callbacks.c
hostapd: DFS for channel switch in repeater mode
[thirdparty/hostap.git] / src / ap / drv_callbacks.c
index 9beb32245461053c9c09b67294a0107616c4c292..559bb87c213e726cddcb3ecd9432ab196292ba42 100644 (file)
 #include "common/ieee802_11_defs.h"
 #include "common/ieee802_11_common.h"
 #include "common/wpa_ctrl.h"
+#include "common/dpp.h"
+#include "common/sae.h"
+#include "common/hw_features_common.h"
 #include "crypto/random.h"
 #include "p2p/p2p.h"
 #include "wps/wps.h"
+#include "fst/fst.h"
 #include "wnm_ap.h"
 #include "hostapd.h"
 #include "ieee802_11.h"
+#include "ieee802_11_auth.h"
 #include "sta_info.h"
 #include "accounting.h"
 #include "tkip_countermeasures.h"
 #include "wps_hostapd.h"
 #include "ap_drv_ops.h"
 #include "ap_config.h"
+#include "ap_mlme.h"
 #include "hw_features.h"
 #include "dfs.h"
 #include "beacon.h"
+#include "mbo_ap.h"
+#include "dpp_hostapd.h"
+#include "fils_hlp.h"
+#include "neighbor_db.h"
+
+
+#ifdef CONFIG_FILS
+void hostapd_notify_assoc_fils_finish(struct hostapd_data *hapd,
+                                     struct sta_info *sta)
+{
+       u16 reply_res = WLAN_STATUS_SUCCESS;
+       struct ieee802_11_elems elems;
+       u8 buf[IEEE80211_MAX_MMPDU_SIZE], *p = buf;
+       int new_assoc;
+
+       wpa_printf(MSG_DEBUG, "%s FILS: Finish association with " MACSTR,
+                  __func__, MAC2STR(sta->addr));
+       eloop_cancel_timeout(fils_hlp_timeout, hapd, sta);
+       if (!sta->fils_pending_assoc_req)
+               return;
+
+       ieee802_11_parse_elems(sta->fils_pending_assoc_req,
+                              sta->fils_pending_assoc_req_len, &elems, 0);
+       if (!elems.fils_session) {
+               wpa_printf(MSG_DEBUG, "%s failed to find FILS Session element",
+                          __func__);
+               return;
+       }
+
+       p = hostapd_eid_assoc_fils_session(sta->wpa_sm, p,
+                                          elems.fils_session,
+                                          sta->fils_hlp_resp);
+
+       reply_res = hostapd_sta_assoc(hapd, sta->addr,
+                                     sta->fils_pending_assoc_is_reassoc,
+                                     WLAN_STATUS_SUCCESS,
+                                     buf, p - buf);
+       ap_sta_set_authorized(hapd, sta, 1);
+       new_assoc = (sta->flags & WLAN_STA_ASSOC) == 0;
+       sta->flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC;
+       sta->flags &= ~WLAN_STA_WNM_SLEEP_MODE;
+       hostapd_set_sta_flags(hapd, sta);
+       wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC_FILS);
+       ieee802_1x_notify_port_enabled(sta->eapol_sm, 1);
+       hostapd_new_assoc_sta(hapd, sta, !new_assoc);
+       os_free(sta->fils_pending_assoc_req);
+       sta->fils_pending_assoc_req = NULL;
+       sta->fils_pending_assoc_req_len = 0;
+       wpabuf_free(sta->fils_hlp_resp);
+       sta->fils_hlp_resp = NULL;
+       wpabuf_free(sta->hlp_dhcp_discover);
+       sta->hlp_dhcp_discover = NULL;
+       fils_hlp_deinit(hapd);
+
+       /*
+        * Remove the station in case transmission of a success response fails
+        * (the STA was added associated to the driver) or if the station was
+        * previously added unassociated.
+        */
+       if (reply_res != WLAN_STATUS_SUCCESS || sta->added_unassoc) {
+               hostapd_drv_sta_remove(hapd, sta->addr);
+               sta->added_unassoc = 0;
+       }
+}
+#endif /* CONFIG_FILS */
 
 
 int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
                        const u8 *req_ies, size_t req_ies_len, int reassoc)
 {
        struct sta_info *sta;
-       int new_assoc, res;
+       int new_assoc;
+       enum wpa_validate_result res;
        struct ieee802_11_elems elems;
        const u8 *ie;
        size_t ielen;
-#ifdef CONFIG_IEEE80211R
        u8 buf[sizeof(struct ieee80211_mgmt) + 1024];
        u8 *p = buf;
-#endif /* CONFIG_IEEE80211R */
        u16 reason = WLAN_REASON_UNSPECIFIED;
        u16 status = WLAN_STATUS_SUCCESS;
        const u8 *p2p_dev_addr = NULL;
@@ -58,10 +128,23 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
                 * running, so better make sure we stop processing such an
                 * event here.
                 */
-               wpa_printf(MSG_DEBUG, "hostapd_notif_assoc: Skip event with "
-                          "no address");
+               wpa_printf(MSG_DEBUG,
+                          "hostapd_notif_assoc: Skip event with no address");
                return -1;
        }
+
+       if (is_multicast_ether_addr(addr) ||
+           is_zero_ether_addr(addr) ||
+           os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) {
+               /* Do not process any frames with unexpected/invalid SA so that
+                * we do not add any state for unexpected STA addresses or end
+                * up sending out frames to unexpected destination. */
+               wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR
+                          " in received indication - ignore this indication silently",
+                          __func__, MAC2STR(addr));
+               return 0;
+       }
+
        random_add_randomness(addr, ETH_ALEN);
 
        hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
@@ -89,8 +172,8 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
        } else {
                ie = NULL;
                ielen = 0;
-               wpa_printf(MSG_DEBUG, "STA did not include WPS/RSN/WPA IE in "
-                          "(Re)AssocReq");
+               wpa_printf(MSG_DEBUG,
+                          "STA did not include WPS/RSN/WPA IE in (Re)AssocReq");
        }
 
        sta = ap_get_sta(hapd, addr);
@@ -113,6 +196,21 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
        }
        sta->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS | WLAN_STA_WPS2);
 
+       /*
+        * ACL configurations to the drivers (implementing AP SME and ACL
+        * offload) without hostapd's knowledge, can result in a disconnection
+        * though the driver accepts the connection. Skip the hostapd check for
+        * ACL if the driver supports ACL offload to avoid potentially
+        * conflicting ACL rules.
+        */
+       if (hapd->iface->drv_max_acl_mac_addrs == 0 &&
+           hostapd_check_acl(hapd, addr, NULL) != HOSTAPD_ACL_ACCEPT) {
+               wpa_printf(MSG_INFO, "STA " MACSTR " not allowed to connect",
+                          MAC2STR(addr));
+               reason = WLAN_REASON_UNSPECIFIED;
+               goto fail;
+       }
+
 #ifdef CONFIG_P2P
        if (elems.p2p) {
                wpabuf_free(sta->p2p_ie);
@@ -123,11 +221,8 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
        }
 #endif /* CONFIG_P2P */
 
-#ifdef CONFIG_IEEE80211N
 #ifdef NEED_AP_MLME
        if (elems.ht_capabilities &&
-           elems.ht_capabilities_len >=
-           sizeof(struct ieee80211_ht_capabilities) &&
            (hapd->iface->conf->ht_capab &
             HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET)) {
                struct ieee80211_ht_capabilities *ht_cap =
@@ -139,7 +234,6 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
                        ht40_intolerant_add(hapd->iface, sta);
        }
 #endif /* NEED_AP_MLME */
-#endif /* CONFIG_IEEE80211N */
 
 #ifdef CONFIG_INTERWORKING
        if (elems.ext_capab && elems.ext_capab_len > 4) {
@@ -155,34 +249,57 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
                                                 elems.hs20_len - 4);
        } else
                sta->hs20_ie = NULL;
+
+       wpabuf_free(sta->roaming_consortium);
+       if (elems.roaming_cons_sel)
+               sta->roaming_consortium = wpabuf_alloc_copy(
+                       elems.roaming_cons_sel + 4,
+                       elems.roaming_cons_sel_len - 4);
+       else
+               sta->roaming_consortium = NULL;
 #endif /* CONFIG_HS20 */
 
+#ifdef CONFIG_FST
+       wpabuf_free(sta->mb_ies);
+       if (hapd->iface->fst)
+               sta->mb_ies = mb_ies_by_info(&elems.mb_ies);
+       else
+               sta->mb_ies = NULL;
+#endif /* CONFIG_FST */
+
+       mbo_ap_check_sta_assoc(hapd, sta, &elems);
+
+       ap_copy_sta_supp_op_classes(sta, elems.supp_op_classes,
+                                   elems.supp_op_classes_len);
+
        if (hapd->conf->wpa) {
                if (ie == NULL || ielen == 0) {
 #ifdef CONFIG_WPS
                        if (hapd->conf->wps_state) {
-                               wpa_printf(MSG_DEBUG, "STA did not include "
-                                          "WPA/RSN IE in (Re)Association "
-                                          "Request - possible WPS use");
+                               wpa_printf(MSG_DEBUG,
+                                          "STA did not include WPA/RSN IE in (Re)Association Request - possible WPS use");
                                sta->flags |= WLAN_STA_MAYBE_WPS;
                                goto skip_wpa_check;
                        }
 #endif /* CONFIG_WPS */
 
                        wpa_printf(MSG_DEBUG, "No WPA/RSN IE from STA");
-                       return -1;
+                       reason = WLAN_REASON_INVALID_IE;
+                       status = WLAN_STATUS_INVALID_IE;
+                       goto fail;
                }
 #ifdef CONFIG_WPS
                if (hapd->conf->wps_state && ie[0] == 0xdd && ie[1] >= 4 &&
                    os_memcmp(ie + 2, "\x00\x50\xf2\x04", 4) == 0) {
                        struct wpabuf *wps;
+
                        sta->flags |= WLAN_STA_WPS;
                        wps = ieee802_11_vendor_ie_concat(ie, ielen,
                                                          WPS_IE_VENDOR_TYPE);
                        if (wps) {
                                if (wps_is_20(wps)) {
-                                       wpa_printf(MSG_DEBUG, "WPS: STA "
-                                                  "supports WPS 2.0");
+                                       wpa_printf(MSG_DEBUG,
+                                                  "WPS: STA supports WPS 2.0");
                                        sta->flags |= WLAN_STA_WPS2;
                                }
                                wpabuf_free(wps);
@@ -196,47 +313,89 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
                                                        sta->addr,
                                                        p2p_dev_addr);
                if (sta->wpa_sm == NULL) {
-                       wpa_printf(MSG_ERROR, "Failed to initialize WPA state "
-                                  "machine");
+                       wpa_printf(MSG_ERROR,
+                                  "Failed to initialize WPA state machine");
                        return -1;
                }
                res = wpa_validate_wpa_ie(hapd->wpa_auth, sta->wpa_sm,
+                                         hapd->iface->freq,
                                          ie, ielen,
-                                         elems.mdie, elems.mdie_len);
-               if (res != WPA_IE_OK) {
-                       wpa_printf(MSG_DEBUG, "WPA/RSN information element "
-                                  "rejected? (res %u)", res);
+                                         elems.rsnxe ? elems.rsnxe - 2 : NULL,
+                                         elems.rsnxe ? elems.rsnxe_len + 2 : 0,
+                                         elems.mdie, elems.mdie_len,
+                                         elems.owe_dh, elems.owe_dh_len);
+               reason = WLAN_REASON_INVALID_IE;
+               status = WLAN_STATUS_INVALID_IE;
+               switch (res) {
+               case WPA_IE_OK:
+                       reason = WLAN_REASON_UNSPECIFIED;
+                       status = WLAN_STATUS_SUCCESS;
+                       break;
+               case WPA_INVALID_IE:
+                       reason = WLAN_REASON_INVALID_IE;
+                       status = WLAN_STATUS_INVALID_IE;
+                       break;
+               case WPA_INVALID_GROUP:
+                       reason = WLAN_REASON_GROUP_CIPHER_NOT_VALID;
+                       status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID;
+                       break;
+               case WPA_INVALID_PAIRWISE:
+                       reason = WLAN_REASON_PAIRWISE_CIPHER_NOT_VALID;
+                       status = WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID;
+                       break;
+               case WPA_INVALID_AKMP:
+                       reason = WLAN_REASON_AKMP_NOT_VALID;
+                       status = WLAN_STATUS_AKMP_NOT_VALID;
+                       break;
+               case WPA_NOT_ENABLED:
+                       reason = WLAN_REASON_INVALID_IE;
+                       status = WLAN_STATUS_INVALID_IE;
+                       break;
+               case WPA_ALLOC_FAIL:
+                       reason = WLAN_REASON_UNSPECIFIED;
+                       status = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                       break;
+               case WPA_MGMT_FRAME_PROTECTION_VIOLATION:
+                       reason = WLAN_REASON_INVALID_IE;
+                       status = WLAN_STATUS_INVALID_IE;
+                       break;
+               case WPA_INVALID_MGMT_GROUP_CIPHER:
+                       reason = WLAN_REASON_CIPHER_SUITE_REJECTED;
+                       status = WLAN_STATUS_CIPHER_REJECTED_PER_POLICY;
+                       break;
+               case WPA_INVALID_MDIE:
+                       reason = WLAN_REASON_INVALID_MDE;
+                       status = WLAN_STATUS_INVALID_MDIE;
+                       break;
+               case WPA_INVALID_PROTO:
+                       reason = WLAN_REASON_INVALID_IE;
+                       status = WLAN_STATUS_INVALID_IE;
+                       break;
+               case WPA_INVALID_PMKID:
+                       reason = WLAN_REASON_INVALID_PMKID;
+                       status = WLAN_STATUS_INVALID_PMKID;
+                       break;
+               case WPA_DENIED_OTHER_REASON:
+                       reason = WLAN_REASON_UNSPECIFIED;
+                       status = WLAN_STATUS_ASSOC_DENIED_UNSPEC;
+                       break;
+               }
+               if (status != WLAN_STATUS_SUCCESS) {
+                       wpa_printf(MSG_DEBUG,
+                                  "WPA/RSN information element rejected? (res %u)",
+                                  res);
                        wpa_hexdump(MSG_DEBUG, "IE", ie, ielen);
-                       if (res == WPA_INVALID_GROUP) {
-                               reason = WLAN_REASON_GROUP_CIPHER_NOT_VALID;
-                               status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID;
-                       } else if (res == WPA_INVALID_PAIRWISE) {
-                               reason = WLAN_REASON_PAIRWISE_CIPHER_NOT_VALID;
-                               status = WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID;
-                       } else if (res == WPA_INVALID_AKMP) {
-                               reason = WLAN_REASON_AKMP_NOT_VALID;
-                               status = WLAN_STATUS_AKMP_NOT_VALID;
-                       }
-#ifdef CONFIG_IEEE80211W
-                       else if (res == WPA_MGMT_FRAME_PROTECTION_VIOLATION) {
-                               reason = WLAN_REASON_INVALID_IE;
-                               status = WLAN_STATUS_INVALID_IE;
-                       } else if (res == WPA_INVALID_MGMT_GROUP_CIPHER) {
-                               reason = WLAN_REASON_GROUP_CIPHER_NOT_VALID;
-                               status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID;
-                       }
-#endif /* CONFIG_IEEE80211W */
-                       else {
-                               reason = WLAN_REASON_INVALID_IE;
-                               status = WLAN_STATUS_INVALID_IE;
-                       }
                        goto fail;
                }
-#ifdef CONFIG_IEEE80211W
-               if ((sta->flags & WLAN_STA_MFP) && !sta->sa_query_timed_out &&
+
+               if ((sta->flags & (WLAN_STA_ASSOC | WLAN_STA_MFP)) ==
+                   (WLAN_STA_ASSOC | WLAN_STA_MFP) &&
+                   !sta->sa_query_timed_out &&
                    sta->sa_query_count > 0)
                        ap_check_sa_query_timeout(hapd, sta);
-               if ((sta->flags & WLAN_STA_MFP) && !sta->sa_query_timed_out &&
+               if ((sta->flags & (WLAN_STA_ASSOC | WLAN_STA_MFP)) ==
+                   (WLAN_STA_ASSOC | WLAN_STA_MFP) &&
+                   !sta->sa_query_timed_out &&
                    (sta->auth_alg != WLAN_AUTH_FT)) {
                        /*
                         * STA has already been associated with MFP and SA
@@ -248,14 +407,12 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
                        if (sta->sa_query_count == 0)
                                ap_sta_start_sa_query(hapd, sta);
 
-#ifdef CONFIG_IEEE80211R
                        status = WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY;
 
                        p = hostapd_eid_assoc_comeback_time(hapd, sta, p);
 
                        hostapd_sta_assoc(hapd, addr, reassoc, status, buf,
                                          p - buf);
-#endif /* CONFIG_IEEE80211R */
                        return 0;
                }
 
@@ -263,9 +420,8 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
                        sta->flags |= WLAN_STA_MFP;
                else
                        sta->flags &= ~WLAN_STA_MFP;
-#endif /* CONFIG_IEEE80211W */
 
-#ifdef CONFIG_IEEE80211R
+#ifdef CONFIG_IEEE80211R_AP
                if (sta->auth_alg == WLAN_AUTH_FT) {
                        status = wpa_ft_validate_reassoc(sta->wpa_sm, req_ies,
                                                         req_ies_len);
@@ -279,10 +435,25 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
                                goto fail;
                        }
                }
-#endif /* CONFIG_IEEE80211R */
+#endif /* CONFIG_IEEE80211R_AP */
+#ifdef CONFIG_SAE
+               if (hapd->conf->sae_pwe == 2 &&
+                   sta->auth_alg == WLAN_AUTH_SAE &&
+                   sta->sae && sta->sae->tmp && !sta->sae->tmp->h2e &&
+                   elems.rsnxe && elems.rsnxe_len >= 1 &&
+                   (elems.rsnxe[0] & BIT(WLAN_RSNX_CAPAB_SAE_H2E))) {
+                       wpa_printf(MSG_INFO, "SAE: " MACSTR
+                                  " indicates support for SAE H2E, but did not use it",
+                                  MAC2STR(sta->addr));
+                       status = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                       reason = WLAN_REASON_UNSPECIFIED;
+                       goto fail;
+               }
+#endif /* CONFIG_SAE */
        } else if (hapd->conf->wps_state) {
 #ifdef CONFIG_WPS
                struct wpabuf *wps;
+
                if (req_ies)
                        wps = ieee802_11_vendor_ie_concat(req_ies, req_ies_len,
                                                          WPS_IE_VENDOR_TYPE);
@@ -299,8 +470,8 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
                if (wps) {
                        sta->flags |= WLAN_STA_WPS;
                        if (wps_is_20(wps)) {
-                               wpa_printf(MSG_DEBUG, "WPS: STA supports "
-                                          "WPS 2.0");
+                               wpa_printf(MSG_DEBUG,
+                                          "WPS: STA supports WPS 2.0");
                                sta->flags |= WLAN_STA_WPS2;
                        }
                } else
@@ -322,8 +493,8 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
                        sta->wpa_sm = wpa_auth_sta_init(hapd->wpa_auth,
                                                        sta->addr, NULL);
                if (sta->wpa_sm == NULL) {
-                       wpa_printf(MSG_WARNING, "Failed to initialize WPA "
-                                  "state machine");
+                       wpa_printf(MSG_WARNING,
+                                  "Failed to initialize WPA state machine");
                        return WLAN_STATUS_UNSPECIFIED_FAILURE;
                }
                if (wpa_validate_osen(hapd->wpa_auth, sta->wpa_sm,
@@ -335,19 +506,176 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
 skip_wpa_check:
 #endif /* CONFIG_WPS */
 
-#ifdef CONFIG_IEEE80211R
+#ifdef CONFIG_MBO
+       if (hapd->conf->mbo_enabled && (hapd->conf->wpa & 2) &&
+           elems.mbo && sta->cell_capa && !(sta->flags & WLAN_STA_MFP) &&
+           hapd->conf->ieee80211w != NO_MGMT_FRAME_PROTECTION) {
+               wpa_printf(MSG_INFO,
+                          "MBO: Reject WPA2 association without PMF");
+               return WLAN_STATUS_UNSPECIFIED_FAILURE;
+       }
+#endif /* CONFIG_MBO */
+
+#ifdef CONFIG_IEEE80211R_AP
        p = wpa_sm_write_assoc_resp_ies(sta->wpa_sm, buf, sizeof(buf),
-                                       sta->auth_alg, req_ies, req_ies_len);
+                                       sta->auth_alg, req_ies, req_ies_len,
+                                       !elems.rsnxe);
+       if (!p) {
+               wpa_printf(MSG_DEBUG, "FT: Failed to write AssocResp IEs");
+               return WLAN_STATUS_UNSPECIFIED_FAILURE;
+       }
+#endif /* CONFIG_IEEE80211R_AP */
+
+#ifdef CONFIG_FILS
+       if (sta->auth_alg == WLAN_AUTH_FILS_SK ||
+           sta->auth_alg == WLAN_AUTH_FILS_SK_PFS ||
+           sta->auth_alg == WLAN_AUTH_FILS_PK) {
+               int delay_assoc = 0;
+
+               if (!req_ies)
+                       return WLAN_STATUS_UNSPECIFIED_FAILURE;
+
+               if (!wpa_fils_validate_fils_session(sta->wpa_sm, req_ies,
+                                                   req_ies_len,
+                                                   sta->fils_session)) {
+                       wpa_printf(MSG_DEBUG,
+                                  "FILS: Session validation failed");
+                       return WLAN_STATUS_UNSPECIFIED_FAILURE;
+               }
+
+               res = wpa_fils_validate_key_confirm(sta->wpa_sm, req_ies,
+                                                   req_ies_len);
+               if (res < 0) {
+                       wpa_printf(MSG_DEBUG,
+                                  "FILS: Key Confirm validation failed");
+                       return WLAN_STATUS_UNSPECIFIED_FAILURE;
+               }
 
+               if (fils_process_hlp(hapd, sta, req_ies, req_ies_len) > 0) {
+                       wpa_printf(MSG_DEBUG,
+                                  "FILS: Delaying Assoc Response (HLP)");
+                       delay_assoc = 1;
+               } else {
+                       wpa_printf(MSG_DEBUG,
+                                  "FILS: Going ahead with Assoc Response (no HLP)");
+               }
+
+               if (sta) {
+                       wpa_printf(MSG_DEBUG, "FILS: HLP callback cleanup");
+                       eloop_cancel_timeout(fils_hlp_timeout, hapd, sta);
+                       os_free(sta->fils_pending_assoc_req);
+                       sta->fils_pending_assoc_req = NULL;
+                       sta->fils_pending_assoc_req_len = 0;
+                       wpabuf_free(sta->fils_hlp_resp);
+                       sta->fils_hlp_resp = NULL;
+                       sta->fils_drv_assoc_finish = 0;
+               }
+
+               if (sta && delay_assoc && status == WLAN_STATUS_SUCCESS) {
+                       u8 *req_tmp;
+
+                       req_tmp = os_malloc(req_ies_len);
+                       if (!req_tmp) {
+                               wpa_printf(MSG_DEBUG,
+                                          "FILS: buffer allocation failed for assoc req");
+                               goto fail;
+                       }
+                       os_memcpy(req_tmp, req_ies, req_ies_len);
+                       sta->fils_pending_assoc_req = req_tmp;
+                       sta->fils_pending_assoc_req_len = req_ies_len;
+                       sta->fils_pending_assoc_is_reassoc = reassoc;
+                       sta->fils_drv_assoc_finish = 1;
+                       wpa_printf(MSG_DEBUG,
+                                  "FILS: Waiting for HLP processing before sending (Re)Association Response frame to "
+                                  MACSTR, MAC2STR(sta->addr));
+                       eloop_register_timeout(
+                               0, hapd->conf->fils_hlp_wait_time * 1024,
+                               fils_hlp_timeout, hapd, sta);
+                       return 0;
+               }
+               p = hostapd_eid_assoc_fils_session(sta->wpa_sm, p,
+                                                  elems.fils_session,
+                                                  sta->fils_hlp_resp);
+               wpa_hexdump(MSG_DEBUG, "FILS Assoc Resp BUF (IEs)",
+                           buf, p - buf);
+       }
+#endif /* CONFIG_FILS */
+
+#ifdef CONFIG_OWE
+       if ((hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_OWE) &&
+           wpa_auth_sta_key_mgmt(sta->wpa_sm) == WPA_KEY_MGMT_OWE &&
+           elems.owe_dh) {
+               u8 *npos;
+
+               npos = owe_assoc_req_process(hapd, sta,
+                                            elems.owe_dh, elems.owe_dh_len,
+                                            p, sizeof(buf) - (p - buf),
+                                            &status);
+               if (npos)
+                       p = npos;
+
+               if (!npos &&
+                   status == WLAN_STATUS_FINITE_CYCLIC_GROUP_NOT_SUPPORTED) {
+                       hostapd_sta_assoc(hapd, addr, reassoc, status, buf,
+                                         p - buf);
+                       return 0;
+               }
+
+               if (!npos || status != WLAN_STATUS_SUCCESS)
+                       goto fail;
+       }
+#endif /* CONFIG_OWE */
+
+#ifdef CONFIG_DPP2
+               dpp_pfs_free(sta->dpp_pfs);
+               sta->dpp_pfs = NULL;
+
+               if ((hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_DPP) &&
+                   hapd->conf->dpp_netaccesskey && sta->wpa_sm &&
+                   wpa_auth_sta_key_mgmt(sta->wpa_sm) == WPA_KEY_MGMT_DPP &&
+                   elems.owe_dh) {
+                       sta->dpp_pfs = dpp_pfs_init(
+                               wpabuf_head(hapd->conf->dpp_netaccesskey),
+                               wpabuf_len(hapd->conf->dpp_netaccesskey));
+                       if (!sta->dpp_pfs) {
+                               wpa_printf(MSG_DEBUG,
+                                          "DPP: Could not initialize PFS");
+                               /* Try to continue without PFS */
+                               goto pfs_fail;
+                       }
+
+                       if (dpp_pfs_process(sta->dpp_pfs, elems.owe_dh,
+                                           elems.owe_dh_len) < 0) {
+                               dpp_pfs_free(sta->dpp_pfs);
+                               sta->dpp_pfs = NULL;
+                               reason = WLAN_REASON_UNSPECIFIED;
+                               goto fail;
+                       }
+               }
+
+               wpa_auth_set_dpp_z(sta->wpa_sm, sta->dpp_pfs ?
+                                  sta->dpp_pfs->secret : NULL);
+       pfs_fail:
+#endif /* CONFIG_DPP2 */
+
+       if (elems.rrm_enabled &&
+           elems.rrm_enabled_len >= sizeof(sta->rrm_enabled_capa))
+           os_memcpy(sta->rrm_enabled_capa, elems.rrm_enabled,
+                     sizeof(sta->rrm_enabled_capa));
+
+#if defined(CONFIG_IEEE80211R_AP) || defined(CONFIG_FILS) || defined(CONFIG_OWE)
        hostapd_sta_assoc(hapd, addr, reassoc, status, buf, p - buf);
 
-       if (sta->auth_alg == WLAN_AUTH_FT)
+       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)
                ap_sta_set_authorized(hapd, sta, 1);
-#else /* CONFIG_IEEE80211R */
+#else /* CONFIG_IEEE80211R_AP || CONFIG_FILS */
        /* Keep compiler silent about unused variables */
        if (status) {
        }
-#endif /* CONFIG_IEEE80211R */
+#endif /* CONFIG_IEEE80211R_AP || CONFIG_FILS */
 
        new_assoc = (sta->flags & WLAN_STA_ASSOC) == 0;
        sta->flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC;
@@ -357,6 +685,12 @@ skip_wpa_check:
 
        if (reassoc && (sta->auth_alg == WLAN_AUTH_FT))
                wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC_FT);
+#ifdef CONFIG_FILS
+       else if (sta->auth_alg == WLAN_AUTH_FILS_SK ||
+                sta->auth_alg == WLAN_AUTH_FILS_SK_PFS ||
+                sta->auth_alg == WLAN_AUTH_FILS_PK)
+               wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC_FILS);
+#endif /* CONFIG_FILS */
        else
                wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC);
 
@@ -374,9 +708,9 @@ skip_wpa_check:
        return 0;
 
 fail:
-#ifdef CONFIG_IEEE80211R
+#ifdef CONFIG_IEEE80211R_AP
        hostapd_sta_assoc(hapd, addr, reassoc, status, buf, p - buf);
-#endif /* CONFIG_IEEE80211R */
+#endif /* CONFIG_IEEE80211R_AP */
        hostapd_drv_sta_disassoc(hapd, sta->addr, reason);
        ap_free_sta(hapd, sta);
        return -1;
@@ -395,8 +729,8 @@ void hostapd_notif_disassoc(struct hostapd_data *hapd, const u8 *addr)
                 * was running, so better make sure we stop processing such an
                 * event here.
                 */
-               wpa_printf(MSG_DEBUG, "hostapd_notif_disassoc: Skip event "
-                          "with no address");
+               wpa_printf(MSG_DEBUG,
+                          "hostapd_notif_disassoc: Skip event with no address");
                return;
        }
 
@@ -405,13 +739,15 @@ void hostapd_notif_disassoc(struct hostapd_data *hapd, const u8 *addr)
 
        sta = ap_get_sta(hapd, addr);
        if (sta == NULL) {
-               wpa_printf(MSG_DEBUG, "Disassociation notification for "
-                          "unknown STA " MACSTR, MAC2STR(addr));
+               wpa_printf(MSG_DEBUG,
+                          "Disassociation notification for unknown STA "
+                          MACSTR, MAC2STR(addr));
                return;
        }
 
        ap_sta_set_authorized(hapd, sta, 0);
        sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC);
+       hostapd_set_sta_flags(hapd, sta);
        wpa_auth_sm_event(sta->wpa_sm, WPA_DISASSOC);
        sta->acct_terminate_cause = RADIUS_ACCT_TERMINATE_CAUSE_USER_REQUEST;
        ieee802_1x_notify_port_enabled(sta->eapol_sm, 0);
@@ -423,54 +759,134 @@ void hostapd_event_sta_low_ack(struct hostapd_data *hapd, const u8 *addr)
 {
        struct sta_info *sta = ap_get_sta(hapd, addr);
 
-       if (!sta || !hapd->conf->disassoc_low_ack)
+       if (!sta || !hapd->conf->disassoc_low_ack || sta->agreed_to_steer)
                return;
 
        hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
-                      HOSTAPD_LEVEL_INFO, "disconnected due to excessive "
-                      "missing ACKs");
+                      HOSTAPD_LEVEL_INFO,
+                      "disconnected due to excessive missing ACKs");
        hostapd_drv_sta_disassoc(hapd, addr, WLAN_REASON_DISASSOC_LOW_ACK);
-       if (sta)
-               ap_sta_disassociate(hapd, sta, WLAN_REASON_DISASSOC_LOW_ACK);
+       ap_sta_disassociate(hapd, sta, WLAN_REASON_DISASSOC_LOW_ACK);
+}
+
+
+void hostapd_event_sta_opmode_changed(struct hostapd_data *hapd, const u8 *addr,
+                                     enum smps_mode smps_mode,
+                                     enum chan_width chan_width, u8 rx_nss)
+{
+       struct sta_info *sta = ap_get_sta(hapd, addr);
+       const char *txt;
+
+       if (!sta)
+               return;
+
+       switch (smps_mode) {
+       case SMPS_AUTOMATIC:
+               txt = "automatic";
+               break;
+       case SMPS_OFF:
+               txt = "off";
+               break;
+       case SMPS_DYNAMIC:
+               txt = "dynamic";
+               break;
+       case SMPS_STATIC:
+               txt = "static";
+               break;
+       default:
+               txt = NULL;
+               break;
+       }
+       if (txt) {
+               wpa_msg(hapd->msg_ctx, MSG_INFO, STA_OPMODE_SMPS_MODE_CHANGED
+                       MACSTR " %s", MAC2STR(addr), txt);
+       }
+
+       switch (chan_width) {
+       case CHAN_WIDTH_20_NOHT:
+               txt = "20(no-HT)";
+               break;
+       case CHAN_WIDTH_20:
+               txt = "20";
+               break;
+       case CHAN_WIDTH_40:
+               txt = "40";
+               break;
+       case CHAN_WIDTH_80:
+               txt = "80";
+               break;
+       case CHAN_WIDTH_80P80:
+               txt = "80+80";
+               break;
+       case CHAN_WIDTH_160:
+               txt = "160";
+               break;
+       default:
+               txt = NULL;
+               break;
+       }
+       if (txt) {
+               wpa_msg(hapd->msg_ctx, MSG_INFO, STA_OPMODE_MAX_BW_CHANGED
+                       MACSTR " %s", MAC2STR(addr), txt);
+       }
+
+       if (rx_nss != 0xff) {
+               wpa_msg(hapd->msg_ctx, MSG_INFO, STA_OPMODE_N_SS_CHANGED
+                       MACSTR " %d", MAC2STR(addr), rx_nss);
+       }
 }
 
 
 void hostapd_event_ch_switch(struct hostapd_data *hapd, int freq, int ht,
-                            int offset, int width, int cf1, int cf2)
+                            int offset, int width, int cf1, int cf2,
+                            int finished)
 {
+       /* TODO: If OCV is enabled deauth STAs that don't perform a SA Query */
+
 #ifdef NEED_AP_MLME
-       int channel, chwidth, seg0_idx = 0, seg1_idx = 0;
+       int channel, chwidth, is_dfs;
+       u8 seg0_idx = 0, seg1_idx = 0;
+       size_t i;
 
        hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
-                      HOSTAPD_LEVEL_INFO, "driver had channel switch: "
-                      "freq=%d, ht=%d, offset=%d, width=%d, cf1=%d, cf2=%d",
-                      freq, ht, offset, width, cf1, cf2);
+                      HOSTAPD_LEVEL_INFO,
+                      "driver %s channel switch: freq=%d, ht=%d, vht_ch=0x%x, offset=%d, width=%d (%s), cf1=%d, cf2=%d",
+                      finished ? "had" : "starting",
+                      freq, ht, hapd->iconf->ch_switch_vht_config, offset,
+                      width, channel_width_to_string(width), cf1, cf2);
+
+       if (!hapd->iface->current_mode) {
+               hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
+                              HOSTAPD_LEVEL_WARNING,
+                              "ignore channel switch since the interface is not yet ready");
+               return;
+       }
 
        hapd->iface->freq = freq;
 
        channel = hostapd_hw_get_channel(hapd, freq);
        if (!channel) {
                hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
-                              HOSTAPD_LEVEL_WARNING, "driver switched to "
-                              "bad channel!");
+                              HOSTAPD_LEVEL_WARNING,
+                              "driver switched to bad channel!");
                return;
        }
 
        switch (width) {
        case CHAN_WIDTH_80:
-               chwidth = VHT_CHANWIDTH_80MHZ;
+               chwidth = CHANWIDTH_80MHZ;
                break;
        case CHAN_WIDTH_80P80:
-               chwidth = VHT_CHANWIDTH_80P80MHZ;
+               chwidth = CHANWIDTH_80P80MHZ;
                break;
        case CHAN_WIDTH_160:
-               chwidth = VHT_CHANWIDTH_160MHZ;
+               chwidth = CHANWIDTH_160MHZ;
                break;
        case CHAN_WIDTH_20_NOHT:
        case CHAN_WIDTH_20:
        case CHAN_WIDTH_40:
        default:
-               chwidth = VHT_CHANWIDTH_USE_HT;
+               chwidth = CHANWIDTH_USE_HT;
                break;
        }
 
@@ -482,26 +898,63 @@ void hostapd_event_ch_switch(struct hostapd_data *hapd, int freq, int ht,
                        seg1_idx = (cf2 - 5000) / 5;
                break;
        default:
-               seg0_idx = hostapd_hw_get_channel(hapd, cf1);
-               seg1_idx = hostapd_hw_get_channel(hapd, cf2);
+               ieee80211_freq_to_chan(cf1, &seg0_idx);
+               ieee80211_freq_to_chan(cf2, &seg1_idx);
                break;
        }
 
        hapd->iconf->channel = channel;
        hapd->iconf->ieee80211n = ht;
+       if (!ht) {
+               hapd->iconf->ieee80211ac = 0;
+       } else if (hapd->iconf->ch_switch_vht_config) {
+               /* CHAN_SWITCH VHT config */
+               if (hapd->iconf->ch_switch_vht_config &
+                   CH_SWITCH_VHT_ENABLED)
+                       hapd->iconf->ieee80211ac = 1;
+               else if (hapd->iconf->ch_switch_vht_config &
+                        CH_SWITCH_VHT_DISABLED)
+                       hapd->iconf->ieee80211ac = 0;
+       }
+       hapd->iconf->ch_switch_vht_config = 0;
+
        hapd->iconf->secondary_channel = offset;
-       hapd->iconf->vht_oper_chwidth = chwidth;
-       hapd->iconf->vht_oper_centr_freq_seg0_idx = seg0_idx;
-       hapd->iconf->vht_oper_centr_freq_seg1_idx = seg1_idx;
+       hostapd_set_oper_chwidth(hapd->iconf, chwidth);
+       hostapd_set_oper_centr_freq_seg0_idx(hapd->iconf, seg0_idx);
+       hostapd_set_oper_centr_freq_seg1_idx(hapd->iconf, seg1_idx);
+
+       is_dfs = ieee80211_is_dfs(freq, hapd->iface->hw_features,
+                                 hapd->iface->num_hw_features);
+
+       wpa_msg(hapd->msg_ctx, MSG_INFO,
+               "%sfreq=%d ht_enabled=%d ch_offset=%d ch_width=%s cf1=%d cf2=%d dfs=%d",
+               finished ? WPA_EVENT_CHANNEL_SWITCH :
+               WPA_EVENT_CHANNEL_SWITCH_STARTED,
+               freq, ht, offset, channel_width_to_string(width),
+               cf1, cf2, is_dfs);
+       if (!finished)
+               return;
 
        if (hapd->csa_in_progress &&
            freq == hapd->cs_freq_params.freq) {
                hostapd_cleanup_cs_params(hapd);
                ieee802_11_set_beacon(hapd);
 
-               wpa_msg(hapd->msg_ctx, MSG_INFO, AP_CSA_FINISHED "freq=%d",
-                       freq);
+               wpa_msg(hapd->msg_ctx, MSG_INFO, AP_CSA_FINISHED
+                       "freq=%d dfs=%d", freq, is_dfs);
+       } else if (hapd->iface->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD) {
+               wpa_msg(hapd->msg_ctx, MSG_INFO, AP_CSA_FINISHED
+                       "freq=%d dfs=%d", freq, is_dfs);
+       } else if (is_dfs &&
+                  hostapd_is_dfs_required(hapd->iface) &&
+                  !hostapd_is_dfs_chan_available(hapd->iface) &&
+                  !hapd->iface->cac_started) {
+               hostapd_disable_iface(hapd->iface);
+               hostapd_enable_iface(hapd->iface);
        }
+
+       for (i = 0; i < hapd->iface->num_bss; i++)
+               hostapd_neighbor_set_own_report(hapd->iface->bss[i]);
 #endif /* NEED_AP_MLME */
 }
 
@@ -522,6 +975,123 @@ void hostapd_event_connect_failed_reason(struct hostapd_data *hapd,
 }
 
 
+#ifdef CONFIG_ACS
+void hostapd_acs_channel_selected(struct hostapd_data *hapd,
+                                 struct acs_selected_channels *acs_res)
+{
+       int ret, i;
+       int err = 0;
+       struct hostapd_channel_data *pri_chan;
+
+       if (hapd->iconf->channel) {
+               wpa_printf(MSG_INFO, "ACS: Channel was already set to %d",
+                          hapd->iconf->channel);
+               return;
+       }
+
+       hapd->iface->freq = acs_res->pri_freq;
+
+       if (!hapd->iface->current_mode) {
+               for (i = 0; i < hapd->iface->num_hw_features; i++) {
+                       struct hostapd_hw_modes *mode =
+                               &hapd->iface->hw_features[i];
+
+                       if (mode->mode == acs_res->hw_mode) {
+                               if (hapd->iface->freq > 0 &&
+                                   !hw_get_chan(mode->mode,
+                                                hapd->iface->freq,
+                                                hapd->iface->hw_features,
+                                                hapd->iface->num_hw_features))
+                                       continue;
+                               hapd->iface->current_mode = mode;
+                               break;
+                       }
+               }
+               if (!hapd->iface->current_mode) {
+                       hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
+                                      HOSTAPD_LEVEL_WARNING,
+                                      "driver selected to bad hw_mode");
+                       err = 1;
+                       goto out;
+               }
+       }
+
+       if (!acs_res->pri_freq) {
+               hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
+                              HOSTAPD_LEVEL_WARNING,
+                              "driver switched to bad channel");
+               err = 1;
+               goto out;
+       }
+       pri_chan = hw_get_channel_freq(hapd->iface->current_mode->mode,
+                                      acs_res->pri_freq, NULL,
+                                      hapd->iface->hw_features,
+                                      hapd->iface->num_hw_features);
+       if (!pri_chan) {
+               wpa_printf(MSG_ERROR,
+                          "ACS: Could not determine primary channel number from pri_freq %u",
+                          acs_res->pri_freq);
+               err = 1;
+               goto out;
+       }
+
+       hapd->iconf->channel = pri_chan->chan;
+       hapd->iconf->acs = 1;
+
+       if (acs_res->sec_freq == 0)
+               hapd->iconf->secondary_channel = 0;
+       else if (acs_res->sec_freq < acs_res->pri_freq)
+               hapd->iconf->secondary_channel = -1;
+       else if (acs_res->sec_freq > acs_res->pri_freq)
+               hapd->iconf->secondary_channel = 1;
+       else {
+               wpa_printf(MSG_ERROR, "Invalid secondary channel!");
+               err = 1;
+               goto out;
+       }
+
+       hapd->iconf->edmg_channel = acs_res->edmg_channel;
+
+       if (hapd->iface->conf->ieee80211ac || hapd->iface->conf->ieee80211ax) {
+               /* set defaults for backwards compatibility */
+               hostapd_set_oper_centr_freq_seg1_idx(hapd->iconf, 0);
+               hostapd_set_oper_centr_freq_seg0_idx(hapd->iconf, 0);
+               hostapd_set_oper_chwidth(hapd->iconf, CHANWIDTH_USE_HT);
+               if (acs_res->ch_width == 40) {
+                       if (is_6ghz_freq(acs_res->pri_freq))
+                               hostapd_set_oper_centr_freq_seg0_idx(
+                                       hapd->iconf,
+                                       acs_res->vht_seg0_center_ch);
+               } else if (acs_res->ch_width == 80) {
+                       hostapd_set_oper_centr_freq_seg0_idx(
+                               hapd->iconf, acs_res->vht_seg0_center_ch);
+                       if (acs_res->vht_seg1_center_ch == 0) {
+                               hostapd_set_oper_chwidth(hapd->iconf,
+                                                        CHANWIDTH_80MHZ);
+                       } else {
+                               hostapd_set_oper_chwidth(hapd->iconf,
+                                                        CHANWIDTH_80P80MHZ);
+                               hostapd_set_oper_centr_freq_seg1_idx(
+                                       hapd->iconf,
+                                       acs_res->vht_seg1_center_ch);
+                       }
+               } else if (acs_res->ch_width == 160) {
+                       hostapd_set_oper_chwidth(hapd->iconf, CHANWIDTH_160MHZ);
+                       hostapd_set_oper_centr_freq_seg0_idx(
+                               hapd->iconf, acs_res->vht_seg1_center_ch);
+               }
+       }
+
+out:
+       ret = hostapd_acs_completed(hapd->iface, err);
+       if (ret) {
+               wpa_printf(MSG_ERROR,
+                          "ACS: Possibly channel configuration is invalid");
+       }
+}
+#endif /* CONFIG_ACS */
+
+
 int hostapd_probe_req_rx(struct hostapd_data *hapd, const u8 *sa, const u8 *da,
                         const u8 *bssid, const u8 *ie, size_t ie_len,
                         int ssi_signal)
@@ -547,7 +1117,7 @@ int hostapd_probe_req_rx(struct hostapd_data *hapd, const u8 *sa, const u8 *da,
 
 #ifdef HOSTAPD
 
-#ifdef CONFIG_IEEE80211R
+#ifdef CONFIG_IEEE80211R_AP
 static void hostapd_notify_auth_ft_finish(void *ctx, const u8 *dst,
                                          const u8 *bssid,
                                          u16 auth_transaction, u16 status,
@@ -566,7 +1136,33 @@ static void hostapd_notify_auth_ft_finish(void *ctx, const u8 *dst,
 
        hostapd_sta_auth(hapd, dst, auth_transaction, status, ies, ies_len);
 }
-#endif /* CONFIG_IEEE80211R */
+#endif /* CONFIG_IEEE80211R_AP */
+
+
+#ifdef CONFIG_FILS
+static void hostapd_notify_auth_fils_finish(struct hostapd_data *hapd,
+                                           struct sta_info *sta, u16 resp,
+                                           struct wpabuf *data, int pub)
+{
+       if (resp == WLAN_STATUS_SUCCESS) {
+               hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
+                              HOSTAPD_LEVEL_DEBUG, "authentication OK (FILS)");
+               sta->flags |= WLAN_STA_AUTH;
+               wpa_auth_sm_event(sta->wpa_sm, WPA_AUTH);
+               sta->auth_alg = WLAN_AUTH_FILS_SK;
+               mlme_authenticate_indication(hapd, sta);
+       } else {
+               hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
+                              HOSTAPD_LEVEL_DEBUG,
+                              "authentication failed (FILS)");
+       }
+
+       hostapd_sta_auth(hapd, sta->addr, 2, resp,
+                        data ? wpabuf_head(data) : NULL,
+                        data ? wpabuf_len(data) : 0);
+       wpabuf_free(data);
+}
+#endif /* CONFIG_FILS */
 
 
 static void hostapd_notif_auth(struct hostapd_data *hapd,
@@ -587,15 +1183,15 @@ static void hostapd_notif_auth(struct hostapd_data *hapd,
        }
        sta->flags &= ~WLAN_STA_PREAUTH;
        ieee802_1x_notify_pre_auth(sta->eapol_sm, 0);
-#ifdef CONFIG_IEEE80211R
+#ifdef CONFIG_IEEE80211R_AP
        if (rx_auth->auth_type == WLAN_AUTH_FT && hapd->wpa_auth) {
                sta->auth_alg = WLAN_AUTH_FT;
                if (sta->wpa_sm == NULL)
                        sta->wpa_sm = wpa_auth_sta_init(hapd->wpa_auth,
                                                        sta->addr, NULL);
                if (sta->wpa_sm == NULL) {
-                       wpa_printf(MSG_DEBUG, "FT: Failed to initialize WPA "
-                                  "state machine");
+                       wpa_printf(MSG_DEBUG,
+                                  "FT: Failed to initialize WPA state machine");
                        status = WLAN_STATUS_UNSPECIFIED_FAILURE;
                        goto fail;
                }
@@ -605,13 +1201,26 @@ static void hostapd_notif_auth(struct hostapd_data *hapd,
                                    hostapd_notify_auth_ft_finish, hapd);
                return;
        }
-#endif /* CONFIG_IEEE80211R */
+#endif /* CONFIG_IEEE80211R_AP */
+
+#ifdef CONFIG_FILS
+       if (rx_auth->auth_type == WLAN_AUTH_FILS_SK) {
+               sta->auth_alg = WLAN_AUTH_FILS_SK;
+               handle_auth_fils(hapd, sta, rx_auth->ies, rx_auth->ies_len,
+                                rx_auth->auth_type, rx_auth->auth_transaction,
+                                rx_auth->status_code,
+                                hostapd_notify_auth_fils_finish);
+               return;
+       }
+#endif /* CONFIG_FILS */
+
 fail:
        hostapd_sta_auth(hapd, rx_auth->peer, rx_auth->auth_transaction + 1,
                         status, resp_ies, resp_ies_len);
 }
 
 
+#ifndef NEED_AP_MLME
 static void hostapd_action_rx(struct hostapd_data *hapd,
                              struct rx_mgmt *drv_mgmt)
 {
@@ -619,45 +1228,70 @@ static void hostapd_action_rx(struct hostapd_data *hapd,
        struct sta_info *sta;
        size_t plen __maybe_unused;
        u16 fc;
+       u8 *action __maybe_unused;
 
-       if (drv_mgmt->frame_len < 24 + 1)
+       if (drv_mgmt->frame_len < IEEE80211_HDRLEN + 2 + 1)
                return;
 
-       plen = drv_mgmt->frame_len - 24 - 1;
+       plen = drv_mgmt->frame_len - IEEE80211_HDRLEN;
 
        mgmt = (struct ieee80211_mgmt *) drv_mgmt->frame;
        fc = le_to_host16(mgmt->frame_control);
        if (WLAN_FC_GET_STYPE(fc) != WLAN_FC_STYPE_ACTION)
                return; /* handled by the driver */
 
-        wpa_printf(MSG_DEBUG, "RX_ACTION cat %d action plen %d",
-                  mgmt->u.action.category, (int) plen);
+       action = (u8 *) &mgmt->u.action.u;
+       wpa_printf(MSG_DEBUG, "RX_ACTION category %u action %u sa " MACSTR
+                  " da " MACSTR " plen %d",
+                  mgmt->u.action.category, *action,
+                  MAC2STR(mgmt->sa), MAC2STR(mgmt->da), (int) plen);
 
        sta = ap_get_sta(hapd, mgmt->sa);
        if (sta == NULL) {
                wpa_printf(MSG_DEBUG, "%s: station not found", __func__);
                return;
        }
-#ifdef CONFIG_IEEE80211R
+#ifdef CONFIG_IEEE80211R_AP
        if (mgmt->u.action.category == WLAN_ACTION_FT) {
-               const u8 *payload = drv_mgmt->frame + 24 + 1;
-               wpa_ft_action_rx(sta->wpa_sm, payload, plen);
-       }
-#endif /* CONFIG_IEEE80211R */
-#ifdef CONFIG_IEEE80211W
-       if (mgmt->u.action.category == WLAN_ACTION_SA_QUERY && plen >= 4) {
-               ieee802_11_sa_query_action(
-                       hapd, mgmt->sa,
-                       mgmt->u.action.u.sa_query_resp.action,
-                       mgmt->u.action.u.sa_query_resp.trans_id);
-       }
-#endif /* CONFIG_IEEE80211W */
-#ifdef CONFIG_WNM
+               wpa_ft_action_rx(sta->wpa_sm, (u8 *) &mgmt->u.action, plen);
+               return;
+       }
+#endif /* CONFIG_IEEE80211R_AP */
+       if (mgmt->u.action.category == WLAN_ACTION_SA_QUERY) {
+               ieee802_11_sa_query_action(hapd, mgmt, drv_mgmt->frame_len);
+               return;
+       }
+#ifdef CONFIG_WNM_AP
        if (mgmt->u.action.category == WLAN_ACTION_WNM) {
                ieee802_11_rx_wnm_action_ap(hapd, mgmt, drv_mgmt->frame_len);
+               return;
+       }
+#endif /* CONFIG_WNM_AP */
+#ifdef CONFIG_FST
+       if (mgmt->u.action.category == WLAN_ACTION_FST && hapd->iface->fst) {
+               fst_rx_action(hapd->iface->fst, mgmt, drv_mgmt->frame_len);
+               return;
        }
-#endif /* CONFIG_WNM */
+#endif /* CONFIG_FST */
+#ifdef CONFIG_DPP
+       if (plen >= 2 + 4 &&
+           mgmt->u.action.u.vs_public_action.action ==
+           WLAN_PA_VENDOR_SPECIFIC &&
+           WPA_GET_BE24(mgmt->u.action.u.vs_public_action.oui) ==
+           OUI_WFA &&
+           mgmt->u.action.u.vs_public_action.variable[0] ==
+           DPP_OUI_TYPE) {
+               const u8 *pos, *end;
+
+               pos = mgmt->u.action.u.vs_public_action.oui;
+               end = drv_mgmt->frame + drv_mgmt->frame_len;
+               hostapd_dpp_rx_action(hapd, mgmt->sa, pos, end - pos,
+                                     drv_mgmt->freq);
+               return;
+       }
+#endif /* CONFIG_DPP */
 }
+#endif /* NEED_AP_MLME */
 
 
 #ifdef NEED_AP_MLME
@@ -708,6 +1342,7 @@ static int hostapd_mgmt_rx(struct hostapd_data *hapd, struct rx_mgmt *rx_mgmt)
        if (hapd->ext_mgmt_frame_handling) {
                size_t hex_len = 2 * rx_mgmt->frame_len + 1;
                char *hex = os_malloc(hex_len);
+
                if (hex) {
                        wpa_snprintf_hex(hex, hex_len, rx_mgmt->frame,
                                         rx_mgmt->frame_len);
@@ -725,8 +1360,7 @@ static int hostapd_mgmt_rx(struct hostapd_data *hapd, struct rx_mgmt *rx_mgmt)
 
        hapd = get_hapd_bssid(iface, bssid);
        if (hapd == NULL) {
-               u16 fc;
-               fc = le_to_host16(hdr->frame_control);
+               u16 fc = le_to_host16(hdr->frame_control);
 
                /*
                 * Drop frames to unknown BSSIDs except for Beacon frames which
@@ -740,11 +1374,13 @@ static int hostapd_mgmt_rx(struct hostapd_data *hapd, struct rx_mgmt *rx_mgmt)
        }
 
        os_memset(&fi, 0, sizeof(fi));
+       fi.freq = rx_mgmt->freq;
        fi.datarate = rx_mgmt->datarate;
        fi.ssi_signal = rx_mgmt->ssi_signal;
 
        if (hapd == HAPD_BROADCAST) {
                size_t i;
+
                ret = 0;
                for (i = 0; i < iface->num_bss; i++) {
                        /* if bss is set, driver will call this function for
@@ -771,10 +1407,24 @@ static void hostapd_mgmt_tx_cb(struct hostapd_data *hapd, const u8 *buf,
                               size_t len, u16 stype, int ok)
 {
        struct ieee80211_hdr *hdr;
+       struct hostapd_data *orig_hapd = hapd;
+
        hdr = (struct ieee80211_hdr *) buf;
        hapd = get_hapd_bssid(hapd->iface, get_hdr_bssid(hdr, len));
-       if (hapd == NULL || hapd == HAPD_BROADCAST)
+       if (!hapd)
                return;
+       if (hapd == HAPD_BROADCAST) {
+               if (stype != WLAN_FC_STYPE_ACTION || len <= 25 ||
+                   buf[24] != WLAN_ACTION_PUBLIC)
+                       return;
+               hapd = get_hapd_bssid(orig_hapd->iface, hdr->addr2);
+               if (!hapd || hapd == HAPD_BROADCAST)
+                       return;
+               /*
+                * Allow processing of TX status for a Public Action frame that
+                * used wildcard BBSID.
+                */
+       }
        ieee802_11_mgmt_cb(hapd, buf, len, stype, ok);
 }
 
@@ -784,6 +1434,7 @@ static void hostapd_mgmt_tx_cb(struct hostapd_data *hapd, const u8 *buf,
 static int hostapd_event_new_sta(struct hostapd_data *hapd, const u8 *addr)
 {
        struct sta_info *sta = ap_get_sta(hapd, addr);
+
        if (sta)
                return 0;
 
@@ -810,17 +1461,34 @@ static void hostapd_event_eapol_rx(struct hostapd_data *hapd, const u8 *src,
        size_t j;
 
        for (j = 0; j < iface->num_bss; j++) {
-               if ((sta = ap_get_sta(iface->bss[j], src))) {
-                       if (sta->flags & WLAN_STA_ASSOC) {
-                               hapd = iface->bss[j];
-                               break;
-                       }
+               sta = ap_get_sta(iface->bss[j], src);
+               if (sta && sta->flags & WLAN_STA_ASSOC) {
+                       hapd = iface->bss[j];
+                       break;
                }
        }
 
        ieee802_1x_receive(hapd, src, data, data_len);
 }
 
+#endif /* HOSTAPD */
+
+
+static struct hostapd_channel_data *
+hostapd_get_mode_chan(struct hostapd_hw_modes *mode, unsigned int freq)
+{
+       int i;
+       struct hostapd_channel_data *chan;
+
+       for (i = 0; i < mode->num_channels; i++) {
+               chan = &mode->channels[i];
+               if ((unsigned int) chan->freq == freq)
+                       return chan;
+       }
+
+       return NULL;
+}
+
 
 static struct hostapd_channel_data * hostapd_get_mode_channel(
        struct hostapd_iface *iface, unsigned int freq)
@@ -828,11 +1496,11 @@ static struct hostapd_channel_data * hostapd_get_mode_channel(
        int i;
        struct hostapd_channel_data *chan;
 
-       for (i = 0; i < iface->current_mode->num_channels; i++) {
-               chan = &iface->current_mode->channels[i];
-               if (!chan)
-                       return NULL;
-               if ((unsigned int) chan->freq == freq)
+       for (i = 0; i < iface->num_hw_features; i++) {
+               if (hostapd_hw_skip_mode(iface, &iface->hw_features[i]))
+                       continue;
+               chan = hostapd_get_mode_chan(&iface->hw_features[i], freq);
+               if (chan)
                        return chan;
        }
 
@@ -874,7 +1542,8 @@ static void hostapd_single_channel_get_survey(struct hostapd_iface *iface,
        if (!chan || chan->flag & HOSTAPD_CHAN_DISABLED)
                return;
 
-       wpa_printf(MSG_DEBUG, "Single Channel Survey: (freq=%d channel_time=%ld channel_time_busy=%ld)",
+       wpa_printf(MSG_DEBUG,
+                  "Single Channel Survey: (freq=%d channel_time=%ld channel_time_busy=%ld)",
                   survey->freq,
                   (unsigned long int) survey->channel_time,
                   (unsigned long int) survey->channel_time_busy);
@@ -894,10 +1563,9 @@ static void hostapd_single_channel_get_survey(struct hostapd_iface *iface,
 }
 
 
-static void hostapd_event_get_survey(struct hostapd_data *hapd,
-                                    struct survey_results *survey_results)
+void hostapd_event_get_survey(struct hostapd_iface *iface,
+                             struct survey_results *survey_results)
 {
-       struct hostapd_iface *iface = hapd->iface;
        struct freq_survey *survey, *tmp;
        struct hostapd_channel_data *chan;
 
@@ -929,6 +1597,7 @@ static void hostapd_event_get_survey(struct hostapd_data *hapd,
 }
 
 
+#ifdef HOSTAPD
 #ifdef NEED_AP_MLME
 
 static void hostapd_event_iface_unavailable(struct hostapd_data *hapd)
@@ -955,6 +1624,16 @@ static void hostapd_event_dfs_radar_detected(struct hostapd_data *hapd,
 }
 
 
+static void hostapd_event_dfs_pre_cac_expired(struct hostapd_data *hapd,
+                                             struct dfs_event *radar)
+{
+       wpa_printf(MSG_DEBUG, "DFS Pre-CAC expired on %d MHz", radar->freq);
+       hostapd_dfs_pre_cac_expired(hapd->iface, radar->freq, radar->ht_enabled,
+                                   radar->chan_offset, radar->chan_width,
+                                   radar->cf1, radar->cf2);
+}
+
+
 static void hostapd_event_dfs_cac_finished(struct hostapd_data *hapd,
                                           struct dfs_event *radar)
 {
@@ -984,9 +1663,108 @@ static void hostapd_event_dfs_nop_finished(struct hostapd_data *hapd,
                                 radar->cf1, radar->cf2);
 }
 
+
+static void hostapd_event_dfs_cac_started(struct hostapd_data *hapd,
+                                         struct dfs_event *radar)
+{
+       wpa_printf(MSG_DEBUG, "DFS offload CAC started on %d MHz", radar->freq);
+       hostapd_dfs_start_cac(hapd->iface, radar->freq, radar->ht_enabled,
+                             radar->chan_offset, radar->chan_width,
+                             radar->cf1, radar->cf2);
+}
+
 #endif /* NEED_AP_MLME */
 
 
+static void hostapd_event_wds_sta_interface_status(struct hostapd_data *hapd,
+                                                  int istatus,
+                                                  const char *ifname,
+                                                  const u8 *addr)
+{
+       struct sta_info *sta = ap_get_sta(hapd, addr);
+
+       if (sta) {
+               os_free(sta->ifname_wds);
+               if (istatus == INTERFACE_ADDED)
+                       sta->ifname_wds = os_strdup(ifname);
+               else
+                       sta->ifname_wds = NULL;
+       }
+
+       wpa_msg(hapd->msg_ctx, MSG_INFO, "%sifname=%s sta_addr=" MACSTR,
+               istatus == INTERFACE_ADDED ?
+               WDS_STA_INTERFACE_ADDED : WDS_STA_INTERFACE_REMOVED,
+               ifname, MAC2STR(addr));
+}
+
+
+#ifdef CONFIG_OWE
+static int hostapd_notif_update_dh_ie(struct hostapd_data *hapd,
+                                     const u8 *peer, const u8 *ie,
+                                     size_t ie_len)
+{
+       u16 status;
+       struct sta_info *sta;
+       struct ieee802_11_elems elems;
+
+       if (!hapd || !hapd->wpa_auth) {
+               wpa_printf(MSG_DEBUG, "OWE: Invalid hapd context");
+               return -1;
+       }
+       if (!peer) {
+               wpa_printf(MSG_DEBUG, "OWE: Peer unknown");
+               return -1;
+       }
+       if (!(hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_OWE)) {
+               wpa_printf(MSG_DEBUG, "OWE: No OWE AKM configured");
+               status = WLAN_STATUS_AKMP_NOT_VALID;
+               goto err;
+       }
+       if (ieee802_11_parse_elems(ie, ie_len, &elems, 1) == ParseFailed) {
+               wpa_printf(MSG_DEBUG, "OWE: Failed to parse OWE IE for "
+                          MACSTR, MAC2STR(peer));
+               status = WLAN_STATUS_UNSPECIFIED_FAILURE;
+               goto err;
+       }
+       status = owe_validate_request(hapd, peer, elems.rsn_ie,
+                                     elems.rsn_ie_len,
+                                     elems.owe_dh, elems.owe_dh_len);
+       if (status != WLAN_STATUS_SUCCESS)
+               goto err;
+
+       sta = ap_get_sta(hapd, peer);
+       if (sta) {
+               ap_sta_no_session_timeout(hapd, sta);
+               accounting_sta_stop(hapd, sta);
+
+               /*
+                * Make sure that the previously registered inactivity timer
+                * will not remove the STA immediately.
+                */
+               sta->timeout_next = STA_NULLFUNC;
+       } else {
+               sta = ap_sta_add(hapd, peer);
+               if (!sta) {
+                       status = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                       goto err;
+               }
+       }
+       sta->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS | WLAN_STA_WPS2);
+
+       status = owe_process_rsn_ie(hapd, sta, elems.rsn_ie,
+                                   elems.rsn_ie_len, elems.owe_dh,
+                                   elems.owe_dh_len);
+       if (status != WLAN_STATUS_SUCCESS)
+               ap_free_sta(hapd, sta);
+
+       return 0;
+err:
+       hostapd_drv_update_dh_ie(hapd, peer, status, NULL, 0);
+       return 0;
+}
+#endif /* CONFIG_OWE */
+
+
 void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
                          union wpa_event_data *data)
 {
@@ -998,6 +1776,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
            data->rx_mgmt.frame_len >= 24) {
                const struct ieee80211_hdr *hdr;
                u16 fc;
+
                hdr = (const struct ieee80211_hdr *) data->rx_mgmt.frame;
                fc = le_to_host16(hdr->frame_control);
                if (WLAN_FC_GET_TYPE(fc) == WLAN_FC_TYPE_MGMT &&
@@ -1020,12 +1799,6 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
                if (hapd->iface->scan_cb)
                        hapd->iface->scan_cb(hapd->iface);
                break;
-#ifdef CONFIG_IEEE80211R
-       case EVENT_FT_RRB_RX:
-               wpa_ft_rrb_rx(hapd->wpa_auth, data->ft_rrb_rx.src,
-                             data->ft_rrb_rx.data, data->ft_rrb_rx.data_len);
-               break;
-#endif /* CONFIG_IEEE80211R */
        case EVENT_WPS_BUTTON_PUSHED:
                hostapd_wps_button_pushed(hapd, NULL);
                break;
@@ -1065,10 +1838,10 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
                if (!data->rx_mgmt.frame)
                        break;
 #ifdef NEED_AP_MLME
-               if (hostapd_mgmt_rx(hapd, &data->rx_mgmt) > 0)
-                       break;
-#endif /* NEED_AP_MLME */
+               hostapd_mgmt_rx(hapd, &data->rx_mgmt);
+#else /* NEED_AP_MLME */
                hostapd_action_rx(hapd, &data->rx_mgmt);
+#endif /* NEED_AP_MLME */
                break;
        case EVENT_RX_PROBE_REQ:
                if (data->rx_probe_req.sa == NULL ||
@@ -1097,6 +1870,15 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
                                    data->assoc_info.req_ies_len,
                                    data->assoc_info.reassoc);
                break;
+#ifdef CONFIG_OWE
+       case EVENT_UPDATE_DH:
+               if (!data)
+                       return;
+               hostapd_notif_update_dh_ie(hapd, data->update_dh.peer,
+                                          data->update_dh.ie,
+                                          data->update_dh.ie_len);
+               break;
+#endif /* CONFIG_OWE */
        case EVENT_DISASSOC:
                if (data)
                        hostapd_notif_disassoc(hapd, data->disassoc_info.addr);
@@ -1113,6 +1895,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
        case EVENT_AUTH:
                hostapd_notif_auth(hapd, &data->auth);
                break;
+       case EVENT_CH_SWITCH_STARTED:
        case EVENT_CH_SWITCH:
                if (!data)
                        break;
@@ -1121,7 +1904,8 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
                                        data->ch_switch.ch_offset,
                                        data->ch_switch.ch_width,
                                        data->ch_switch.cf1,
-                                       data->ch_switch.cf2);
+                                       data->ch_switch.cf2,
+                                       event == EVENT_CH_SWITCH);
                break;
        case EVENT_CONNECT_FAILED_REASON:
                if (!data)
@@ -1131,7 +1915,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
                        data->connect_failed_reason.code);
                break;
        case EVENT_SURVEY:
-               hostapd_event_get_survey(hapd, &data->survey_results);
+               hostapd_event_get_survey(hapd->iface, &data->survey_results);
                break;
 #ifdef NEED_AP_MLME
        case EVENT_INTERFACE_UNAVAILABLE:
@@ -1142,6 +1926,11 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
                        break;
                hostapd_event_dfs_radar_detected(hapd, &data->dfs_event);
                break;
+       case EVENT_DFS_PRE_CAC_EXPIRED:
+               if (!data)
+                       break;
+               hostapd_event_dfs_pre_cac_expired(hapd, &data->dfs_event);
+               break;
        case EVENT_DFS_CAC_FINISHED:
                if (!data)
                        break;
@@ -1165,11 +1954,87 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
                hostapd_channel_list_updated(
                        hapd->iface, data->channel_list_changed.initiator);
                break;
+       case EVENT_DFS_CAC_STARTED:
+               if (!data)
+                       break;
+               hostapd_event_dfs_cac_started(hapd, &data->dfs_event);
+               break;
 #endif /* NEED_AP_MLME */
+       case EVENT_INTERFACE_ENABLED:
+               wpa_msg(hapd->msg_ctx, MSG_INFO, INTERFACE_ENABLED);
+               if (hapd->disabled && hapd->started) {
+                       hapd->disabled = 0;
+                       /*
+                        * Try to re-enable interface if the driver stopped it
+                        * when the interface got disabled.
+                        */
+                       if (hapd->wpa_auth)
+                               wpa_auth_reconfig_group_keys(hapd->wpa_auth);
+                       else
+                               hostapd_reconfig_encryption(hapd);
+                       hapd->reenable_beacon = 1;
+                       ieee802_11_set_beacon(hapd);
+#ifdef NEED_AP_MLME
+               } else if (hapd->disabled && hapd->iface->cac_started) {
+                       wpa_printf(MSG_DEBUG, "DFS: restarting pending CAC");
+                       hostapd_handle_dfs(hapd->iface);
+#endif /* NEED_AP_MLME */
+               }
+               break;
+       case EVENT_INTERFACE_DISABLED:
+               hostapd_free_stas(hapd);
+               wpa_msg(hapd->msg_ctx, MSG_INFO, INTERFACE_DISABLED);
+               hapd->disabled = 1;
+               break;
+#ifdef CONFIG_ACS
+       case EVENT_ACS_CHANNEL_SELECTED:
+               hostapd_acs_channel_selected(hapd,
+                                            &data->acs_selected_channels);
+               break;
+#endif /* CONFIG_ACS */
+       case EVENT_STATION_OPMODE_CHANGED:
+               hostapd_event_sta_opmode_changed(hapd, data->sta_opmode.addr,
+                                                data->sta_opmode.smps_mode,
+                                                data->sta_opmode.chan_width,
+                                                data->sta_opmode.rx_nss);
+               break;
+       case EVENT_WDS_STA_INTERFACE_STATUS:
+               hostapd_event_wds_sta_interface_status(
+                       hapd, data->wds_sta_interface.istatus,
+                       data->wds_sta_interface.ifname,
+                       data->wds_sta_interface.sta_addr);
+               break;
        default:
                wpa_printf(MSG_DEBUG, "Unknown event %d", event);
                break;
        }
 }
 
+
+void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
+                                union wpa_event_data *data)
+{
+       struct hapd_interfaces *interfaces = ctx;
+       struct hostapd_data *hapd;
+
+       if (event != EVENT_INTERFACE_STATUS)
+               return;
+
+       hapd = hostapd_get_iface(interfaces, data->interface_status.ifname);
+       if (hapd && hapd->driver && hapd->driver->get_ifindex &&
+           hapd->drv_priv) {
+               unsigned int ifindex;
+
+               ifindex = hapd->driver->get_ifindex(hapd->drv_priv);
+               if (ifindex != data->interface_status.ifindex) {
+                       wpa_dbg(hapd->msg_ctx, MSG_DEBUG,
+                               "interface status ifindex %d mismatch (%d)",
+                               ifindex, data->interface_status.ifindex);
+                       return;
+               }
+       }
+       if (hapd)
+               wpa_supplicant_event(hapd, event, data);
+}
+
 #endif /* HOSTAPD */