[][MAC80211][WiFi7][hostapd][add hostapd patches for mt76 MLO build]
[Description]
Add hostapd patches for mt76 MLO build.
[Release-log]
N/A
Change-Id: I0a78c5124b60dc17e76f501b9f816c9aaec5547d
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/8832331
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/Makefile b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/Makefile
new file mode 100644
index 0000000..a73f352
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/Makefile
@@ -0,0 +1,857 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Copyright (C) 2006-2021 OpenWrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=hostapd
+PKG_RELEASE:=6
+
+PKG_SOURCE_URL:=http://w1.fi/hostap.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2023-09-08
+PKG_SOURCE_VERSION:=5b4a78b1f90977fdd013baffa0a05c47ef59f817
+PKG_MIRROR_HASH:=79a12bdf6944b4abb7a2b91ba74e1ba86ce28e616cbb122ae5fabd0f3e20ce80
+# PKG_SOURCE_VERSION:=e5ccbfc69ecf297590341ae8b461edba9d8e964c
+# PKG_MIRROR_HASH:=fcc6550f46c7f8bbdbf71e63f8f699b9a0878565ad1b90a17855f5ec21283b8f
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+PKG_LICENSE:=BSD-3-Clause
+PKG_CPE_ID:=cpe:/a:w1.fi:hostapd
+
+PKG_BUILD_PARALLEL:=1
+PKG_ASLR_PIE_REGULAR:=1
+
+PKG_CONFIG_DEPENDS:= \
+ CONFIG_PACKAGE_hostapd \
+ CONFIG_PACKAGE_hostapd-basic \
+ CONFIG_PACKAGE_hostapd-mini \
+ CONFIG_WPA_RFKILL_SUPPORT \
+ CONFIG_DRIVER_11AC_SUPPORT \
+ CONFIG_DRIVER_11AX_SUPPORT \
+ CONFIG_DRIVER_11BE_SUPPORT \
+ CONFIG_WPA_ENABLE_WEP
+
+PKG_BUILD_FLAGS:=gc-sections lto
+
+EAPOL_TEST_PROVIDERS:=eapol-test eapol-test-openssl eapol-test-wolfssl
+
+SUPPLICANT_PROVIDERS:=
+HOSTAPD_PROVIDERS:=
+
+LOCAL_TYPE=$(strip \
+ $(if $(findstring wpad,$(BUILD_VARIANT)),wpad, \
+ $(if $(findstring supplicant,$(BUILD_VARIANT)),supplicant, \
+ hostapd \
+ )))
+
+LOCAL_AND_LIB_VARIANT=$(patsubst hostapd-%,%,\
+ $(patsubst wpad-%,%,\
+ $(patsubst supplicant-%,%,\
+ $(BUILD_VARIANT)\
+ )))
+
+LOCAL_VARIANT=$(patsubst %-internal,%,\
+ $(patsubst %-openssl,%,\
+ $(patsubst %-wolfssl,%,\
+ $(patsubst %-mbedtls,%,\
+ $(LOCAL_AND_LIB_VARIANT)\
+ ))))
+
+SSL_VARIANT=$(strip \
+ $(if $(findstring openssl,$(LOCAL_AND_LIB_VARIANT)),openssl,\
+ $(if $(findstring wolfssl,$(LOCAL_AND_LIB_VARIANT)),wolfssl,\
+ $(if $(findstring mbedtls,$(LOCAL_AND_LIB_VARIANT)),mbedtls,\
+ internal\
+ ))))
+
+CONFIG_VARIANT:=$(LOCAL_VARIANT)
+ifeq ($(LOCAL_VARIANT),mesh)
+ CONFIG_VARIANT:=full
+endif
+
+include $(INCLUDE_DIR)/package.mk
+
+STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(CONFIG_WPA_MSG_MIN_PRIORITY)
+
+ifneq ($(CONFIG_DRIVER_11AC_SUPPORT),)
+ HOSTAPD_IEEE80211AC:=y
+endif
+
+ifneq ($(CONFIG_DRIVER_11AX_SUPPORT),)
+ HOSTAPD_IEEE80211AX:=y
+endif
+
+ifneq ($(CONFIG_DRIVER_11BE_SUPPORT),)
+ HOSTAPD_IEEE80211BE:=y
+endif
+
+CORE_DEPENDS = +ucode +libubus +libucode +ucode-mod-fs +ucode-mod-nl80211 +ucode-mod-rtnl +ucode-mod-ubus +ucode-mod-uloop +libblobmsg-json +libudebug
+OPENSSL_DEPENDS = +PACKAGE_$(1):libopenssl
+
+DRIVER_MAKEOPTS= \
+ CONFIG_ACS=y CONFIG_DRIVER_NL80211=y \
+ CONFIG_IEEE80211AC=$(HOSTAPD_IEEE80211AC) \
+ CONFIG_IEEE80211AX=$(HOSTAPD_IEEE80211AX) \
+ CONFIG_IEEE80211BE=$(HOSTAPD_IEEE80211BE) \
+ CONFIG_MBO=$(CONFIG_WPA_MBO_SUPPORT) \
+ CONFIG_UCODE=y
+
+ifeq ($(SSL_VARIANT),openssl)
+ DRIVER_MAKEOPTS += CONFIG_TLS=openssl CONFIG_SAE=y
+ TARGET_LDFLAGS += -lcrypto -lssl
+
+ ifeq ($(LOCAL_VARIANT),basic)
+ DRIVER_MAKEOPTS += CONFIG_OWE=y
+ endif
+ ifeq ($(LOCAL_VARIANT),mesh)
+ DRIVER_MAKEOPTS += CONFIG_AP=y CONFIG_MESH=y
+ endif
+ ifeq ($(LOCAL_VARIANT),full)
+ DRIVER_MAKEOPTS += CONFIG_OWE=y CONFIG_SUITEB192=y CONFIG_AP=y CONFIG_MESH=y
+ endif
+endif
+
+ifeq ($(SSL_VARIANT),wolfssl)
+ DRIVER_MAKEOPTS += CONFIG_TLS=wolfssl CONFIG_SAE=y
+ TARGET_LDFLAGS += -lwolfssl
+
+ ifeq ($(LOCAL_VARIANT),basic)
+ DRIVER_MAKEOPTS += CONFIG_OWE=y
+ endif
+ ifeq ($(LOCAL_VARIANT),mesh)
+ DRIVER_MAKEOPTS += CONFIG_AP=y CONFIG_MESH=y CONFIG_WPS_NFC=1
+ endif
+ ifeq ($(LOCAL_VARIANT),full)
+ DRIVER_MAKEOPTS += CONFIG_OWE=y CONFIG_SUITEB192=y CONFIG_AP=y CONFIG_MESH=y CONFIG_WPS_NFC=1
+ endif
+endif
+
+ifeq ($(SSL_VARIANT),mbedtls)
+ DRIVER_MAKEOPTS += CONFIG_TLS=mbedtls CONFIG_SAE=y
+ TARGET_LDFLAGS += -lmbedcrypto -lmbedx509 -lmbedtls
+
+ ifeq ($(LOCAL_VARIANT),basic)
+ DRIVER_MAKEOPTS += CONFIG_OWE=y
+ endif
+ ifeq ($(LOCAL_VARIANT),mesh)
+ DRIVER_MAKEOPTS += CONFIG_AP=y CONFIG_MESH=y CONFIG_WPS_NFC=1
+ endif
+ ifeq ($(LOCAL_VARIANT),full)
+ DRIVER_MAKEOPTS += CONFIG_OWE=y CONFIG_SUITEB192=y CONFIG_AP=y CONFIG_MESH=y CONFIG_WPS_NFC=1
+ endif
+endif
+
+ifneq ($(LOCAL_TYPE),hostapd)
+ ifdef CONFIG_WPA_RFKILL_SUPPORT
+ DRIVER_MAKEOPTS += NEED_RFKILL=y
+ endif
+endif
+
+DRV_DEPENDS:=+libnl-tiny
+
+
+define Package/hostapd/Default
+ SECTION:=net
+ CATEGORY:=Network
+ SUBMENU:=WirelessAPD
+ TITLE:=IEEE 802.1x Authenticator
+ URL:=http://hostap.epitest.fi/
+ DEPENDS:=$(DRV_DEPENDS) +hostapd-common $(CORE_DEPENDS)
+ EXTRA_DEPENDS:=hostapd-common (=$(PKG_VERSION)-$(PKG_RELEASE))
+ USERID:=network=101:network=101
+ PROVIDES:=hostapd
+ CONFLICTS:=$(HOSTAPD_PROVIDERS)
+ HOSTAPD_PROVIDERS+=$(1)
+endef
+
+define Package/hostapd
+$(call Package/hostapd/Default,$(1))
+ TITLE+= (built-in full)
+ VARIANT:=full-internal
+endef
+
+define Package/hostapd/description
+ This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS
+ Authenticator.
+endef
+
+define Package/hostapd-openssl
+$(call Package/hostapd/Default,$(1))
+ TITLE+= (OpenSSL full)
+ VARIANT:=full-openssl
+ DEPENDS+=$(OPENSSL_DEPENDS)
+endef
+
+Package/hostapd-openssl/description = $(Package/hostapd/description)
+
+define Package/hostapd-wolfssl
+$(call Package/hostapd/Default,$(1))
+ TITLE+= (wolfSSL full)
+ VARIANT:=full-wolfssl
+ DEPENDS+=+PACKAGE_hostapd-wolfssl:libwolfssl
+endef
+
+Package/hostapd-wolfssl/description = $(Package/hostapd/description)
+
+define Package/hostapd-mbedtls
+$(call Package/hostapd/Default,$(1))
+ TITLE+= (mbedTLS full)
+ VARIANT:=full-mbedtls
+ DEPENDS+=+PACKAGE_hostapd-mbedtls:libmbedtls
+endef
+
+Package/hostapd-mbedtls/description = $(Package/hostapd/description)
+
+define Package/hostapd-basic
+$(call Package/hostapd/Default,$(1))
+ TITLE+= (WPA-PSK, 11r, 11w)
+ VARIANT:=basic
+endef
+
+define Package/hostapd-basic/description
+ This package contains a basic IEEE 802.1x/WPA Authenticator with WPA-PSK, 802.11r and 802.11w support.
+endef
+
+define Package/hostapd-basic-openssl
+$(call Package/hostapd/Default,$(1))
+ TITLE+= (WPA-PSK, 11r and 11w)
+ VARIANT:=basic-openssl
+ DEPENDS+=+PACKAGE_hostapd-basic-openssl:libopenssl
+endef
+
+define Package/hostapd-basic-openssl/description
+ This package contains a basic IEEE 802.1x/WPA Authenticator with WPA-PSK, 802.11r and 802.11w support.
+endef
+
+define Package/hostapd-basic-wolfssl
+$(call Package/hostapd/Default,$(1))
+ TITLE+= (WPA-PSK, 11r and 11w)
+ VARIANT:=basic-wolfssl
+ DEPENDS+=+PACKAGE_hostapd-basic-wolfssl:libwolfssl
+endef
+
+define Package/hostapd-basic-wolfssl/description
+ This package contains a basic IEEE 802.1x/WPA Authenticator with WPA-PSK, 802.11r and 802.11w support.
+endef
+
+define Package/hostapd-basic-mbedtls
+$(call Package/hostapd/Default,$(1))
+ TITLE+= (WPA-PSK, 11r and 11w)
+ VARIANT:=basic-mbedtls
+ DEPENDS+=+PACKAGE_hostapd-basic-mbedtls:libmbedtls
+endef
+
+define Package/hostapd-basic-mbedtls/description
+ This package contains a basic IEEE 802.1x/WPA Authenticator with WPA-PSK, 802.11r and 802.11w support.
+endef
+
+define Package/hostapd-mini
+$(call Package/hostapd/Default,$(1))
+ TITLE+= (WPA-PSK only)
+ VARIANT:=mini
+endef
+
+define Package/hostapd-mini/description
+ This package contains a minimal IEEE 802.1x/WPA Authenticator (WPA-PSK only).
+endef
+
+
+define Package/wpad/Default
+ SECTION:=net
+ CATEGORY:=Network
+ SUBMENU:=WirelessAPD
+ TITLE:=IEEE 802.1x Auth/Supplicant
+ DEPENDS:=$(DRV_DEPENDS) +hostapd-common $(CORE_DEPENDS)
+ EXTRA_DEPENDS:=hostapd-common (=$(PKG_VERSION)-$(PKG_RELEASE))
+ USERID:=network=101:network=101
+ URL:=http://hostap.epitest.fi/
+ PROVIDES:=hostapd wpa-supplicant
+ CONFLICTS:=$(HOSTAPD_PROVIDERS) $(SUPPLICANT_PROVIDERS)
+ HOSTAPD_PROVIDERS+=$(1)
+ SUPPLICANT_PROVIDERS+=$(1)
+endef
+
+define Package/wpad
+$(call Package/wpad/Default,$(1))
+ TITLE+= (built-in full)
+ VARIANT:=wpad-full-internal
+endef
+
+define Package/wpad/description
+ This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS
+ Authenticator and Supplicant
+endef
+
+define Package/wpad-openssl
+$(call Package/wpad/Default,$(1))
+ TITLE+= (OpenSSL full)
+ VARIANT:=wpad-full-openssl
+ DEPENDS+=$(OPENSSL_DEPENDS)
+endef
+
+Package/wpad-openssl/description = $(Package/wpad/description)
+
+define Package/wpad-wolfssl
+$(call Package/wpad/Default,$(1))
+ TITLE+= (wolfSSL full)
+ VARIANT:=wpad-full-wolfssl
+ DEPENDS+=+PACKAGE_wpad-wolfssl:libwolfssl
+endef
+
+Package/wpad-wolfssl/description = $(Package/wpad/description)
+
+define Package/wpad-mbedtls
+$(call Package/wpad/Default,$(1))
+ TITLE+= (mbedTLS full)
+ VARIANT:=wpad-full-mbedtls
+ DEPENDS+=+PACKAGE_wpad-mbedtls:libmbedtls
+endef
+
+Package/wpad-mbedtls/description = $(Package/wpad/description)
+
+define Package/wpad-basic
+$(call Package/wpad/Default,$(1))
+ TITLE+= (WPA-PSK, 11r, 11w)
+ VARIANT:=wpad-basic
+endef
+
+define Package/wpad-basic/description
+ This package contains a basic IEEE 802.1x/WPA Authenticator and Supplicant with WPA-PSK, 802.11r and 802.11w support.
+endef
+
+define Package/wpad-basic-openssl
+$(call Package/wpad/Default,$(1))
+ TITLE+= (OpenSSL, 11r, 11w)
+ VARIANT:=wpad-basic-openssl
+ DEPENDS+=$(OPENSSL_DEPENDS)
+endef
+
+define Package/wpad-basic-openssl/description
+ This package contains a basic IEEE 802.1x/WPA Authenticator and Supplicant with WPA-PSK, SAE (WPA3-Personal), 802.11r and 802.11w support.
+endef
+
+define Package/wpad-basic-wolfssl
+$(call Package/wpad/Default,$(1))
+ TITLE+= (wolfSSL, 11r, 11w)
+ VARIANT:=wpad-basic-wolfssl
+ DEPENDS+=+PACKAGE_wpad-basic-wolfssl:libwolfssl
+endef
+
+define Package/wpad-basic-wolfssl/description
+ This package contains a basic IEEE 802.1x/WPA Authenticator and Supplicant with WPA-PSK, SAE (WPA3-Personal), 802.11r and 802.11w support.
+endef
+
+define Package/wpad-basic-mbedtls
+$(call Package/wpad/Default,$(1))
+ TITLE+= (mbedTLS, 11r, 11w)
+ VARIANT:=wpad-basic-mbedtls
+ DEPENDS+=+PACKAGE_wpad-basic-mbedtls:libmbedtls
+endef
+
+define Package/wpad-basic-mbedtls/description
+ This package contains a basic IEEE 802.1x/WPA Authenticator and Supplicant with WPA-PSK, SAE (WPA3-Personal), 802.11r and 802.11w support.
+endef
+
+define Package/wpad-mini
+$(call Package/wpad/Default,$(1))
+ TITLE+= (WPA-PSK only)
+ VARIANT:=wpad-mini
+endef
+
+define Package/wpad-mini/description
+ This package contains a minimal IEEE 802.1x/WPA Authenticator and Supplicant (WPA-PSK only).
+endef
+
+define Package/wpad-mesh
+$(call Package/wpad/Default,$(1))
+ DEPENDS+=@(!TARGET_uml||BROKEN)
+ PROVIDES+=wpa-supplicant-mesh wpad-mesh
+endef
+
+define Package/wpad-mesh/description
+ This package contains a minimal IEEE 802.1x/WPA Authenticator and Supplicant (with 802.11s mesh and SAE support).
+endef
+
+define Package/wpad-mesh-openssl
+$(call Package/wpad-mesh,$(1))
+ TITLE+= (OpenSSL, 11s, SAE)
+ DEPENDS+=$(OPENSSL_DEPENDS)
+ VARIANT:=wpad-mesh-openssl
+endef
+
+Package/wpad-mesh-openssl/description = $(Package/wpad-mesh/description)
+
+define Package/wpad-mesh-wolfssl
+$(call Package/wpad-mesh,$(1))
+ TITLE+= (wolfSSL, 11s, SAE)
+ DEPENDS+=+PACKAGE_wpad-mesh-wolfssl:libwolfssl
+ VARIANT:=wpad-mesh-wolfssl
+endef
+
+Package/wpad-mesh-wolfssl/description = $(Package/wpad-mesh/description)
+
+define Package/wpad-mesh-mbedtls
+$(call Package/wpad-mesh,$(1))
+ TITLE+= (mbedTLS, 11s, SAE)
+ DEPENDS+=+PACKAGE_wpad-mesh-mbedtls:libmbedtls
+ VARIANT:=wpad-mesh-mbedtls
+endef
+
+Package/wpad-mesh-mbedtls/description = $(Package/wpad-mesh/description)
+
+
+define Package/wpa-supplicant/Default
+ SECTION:=net
+ CATEGORY:=Network
+ SUBMENU:=WirelessAPD
+ TITLE:=WPA Supplicant
+ URL:=http://hostap.epitest.fi/wpa_supplicant/
+ DEPENDS:=$(DRV_DEPENDS) +hostapd-common $(CORE_DEPENDS)
+ EXTRA_DEPENDS:=hostapd-common (=$(PKG_VERSION)-$(PKG_RELEASE))
+ USERID:=network=101:network=101
+ PROVIDES:=wpa-supplicant
+ CONFLICTS:=$(SUPPLICANT_PROVIDERS)
+ SUPPLICANT_PROVIDERS+=$(1)
+endef
+
+define Package/wpa-supplicant
+$(call Package/wpa-supplicant/Default,$(1))
+ TITLE+= (built-in full)
+ VARIANT:=supplicant-full-internal
+endef
+
+define Package/wpa-supplicant-openssl
+$(call Package/wpa-supplicant/Default,$(1))
+ TITLE+= (OpenSSL full)
+ VARIANT:=supplicant-full-openssl
+ DEPENDS+=$(OPENSSL_DEPENDS)
+endef
+
+define Package/wpa-supplicant-wolfssl
+$(call Package/wpa-supplicant/Default,$(1))
+ TITLE+= (wolfSSL full)
+ VARIANT:=supplicant-full-wolfssl
+ DEPENDS+=+PACKAGE_wpa-supplicant-wolfssl:libwolfssl
+endef
+
+define Package/wpa-supplicant-mbedtls
+$(call Package/wpa-supplicant/Default,$(1))
+ TITLE+= (mbedTLS full)
+ VARIANT:=supplicant-full-mbedtls
+ DEPENDS+=+PACKAGE_wpa-supplicant-mbedtls:libmbedtls
+endef
+
+define Package/wpa-supplicant/config
+ source "$(SOURCE)/Config.in"
+endef
+
+define Package/wpa-supplicant-p2p
+$(call Package/wpa-supplicant/Default,$(1))
+ TITLE+= (Wi-Fi P2P support)
+ VARIANT:=supplicant-p2p-internal
+endef
+
+define Package/wpa-supplicant-mesh/Default
+$(call Package/wpa-supplicant/Default,$(1))
+ DEPENDS+=@(!TARGET_uml||BROKEN)
+ PROVIDES+=wpa-supplicant-mesh
+endef
+
+define Package/wpa-supplicant-mesh-openssl
+$(call Package/wpa-supplicant-mesh/Default,$(1))
+ TITLE+= (OpenSSL, 11s, SAE)
+ VARIANT:=supplicant-mesh-openssl
+ DEPENDS+=$(OPENSSL_DEPENDS)
+endef
+
+define Package/wpa-supplicant-mesh-wolfssl
+$(call Package/wpa-supplicant-mesh/Default,$(1))
+ TITLE+= (wolfSSL, 11s, SAE)
+ VARIANT:=supplicant-mesh-wolfssl
+ DEPENDS+=+PACKAGE_wpa-supplicant-mesh-wolfssl:libwolfssl
+endef
+
+define Package/wpa-supplicant-mesh-mbedtls
+$(call Package/wpa-supplicant-mesh/Default,$(1))
+ TITLE+= (mbedTLS, 11s, SAE)
+ VARIANT:=supplicant-mesh-mbedtls
+ DEPENDS+=+PACKAGE_wpa-supplicant-mesh-mbedtls:libmbedtls
+endef
+
+define Package/wpa-supplicant-basic
+$(call Package/wpa-supplicant/Default,$(1))
+ TITLE+= (11r, 11w)
+ VARIANT:=supplicant-basic
+endef
+
+define Package/wpa-supplicant-mini
+$(call Package/wpa-supplicant/Default,$(1))
+ TITLE+= (minimal)
+ VARIANT:=supplicant-mini
+endef
+
+
+define Package/hostapd-common
+ TITLE:=hostapd/wpa_supplicant common support files
+ SECTION:=net
+ CATEGORY:=Network
+ SUBMENU:=WirelessAPD
+endef
+
+define Package/hostapd-utils
+ SECTION:=net
+ CATEGORY:=Network
+ SUBMENU:=WirelessAPD
+ TITLE:=IEEE 802.1x Authenticator (utils)
+ URL:=http://hostap.epitest.fi/
+ DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(HOSTAPD_PROVIDERS),PACKAGE_$(pkg)))
+endef
+
+define Package/hostapd-utils/description
+ This package contains a command line utility to control the
+ IEEE 802.1x/WPA/EAP/RADIUS Authenticator.
+endef
+
+define Package/wpa-cli
+ SECTION:=net
+ CATEGORY:=Network
+ SUBMENU:=WirelessAPD
+ DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(SUPPLICANT_PROVIDERS),PACKAGE_$(pkg)))
+ TITLE:=WPA Supplicant command line control utility
+endef
+
+define Package/eapol-test/Default
+ TITLE:=802.1x auth test utility
+ SECTION:=net
+ SUBMENU:=WirelessAPD
+ CATEGORY:=Network
+ DEPENDS:=$(DRV_DEPENDS) $(CORE_DEPENDS)
+endef
+
+define Package/eapol-test
+ $(call Package/eapol-test/Default,$(1))
+ TITLE+= (built-in full)
+ VARIANT:=supplicant-full-internal
+endef
+
+define Package/eapol-test-openssl
+ $(call Package/eapol-test/Default,$(1))
+ TITLE+= (OpenSSL full)
+ VARIANT:=supplicant-full-openssl
+ CONFLICTS:=$(filter-out eapol-test-openssl ,$(EAPOL_TEST_PROVIDERS))
+ DEPENDS+=$(OPENSSL_DEPENDS)
+ PROVIDES:=eapol-test
+endef
+
+define Package/eapol-test-wolfssl
+ $(call Package/eapol-test/Default,$(1))
+ TITLE+= (wolfSSL full)
+ VARIANT:=supplicant-full-wolfssl
+ CONFLICTS:=$(filter-out eapol-test-openssl ,$(filter-out eapol-test-wolfssl ,$(EAPOL_TEST_PROVIDERS)))
+ DEPENDS+=+PACKAGE_eapol-test-wolfssl:libwolfssl
+ PROVIDES:=eapol-test
+endef
+
+define Package/eapol-test-mbedtls
+ $(call Package/eapol-test/Default,$(1))
+ TITLE+= (mbedTLS full)
+ VARIANT:=supplicant-full-mbedtls
+ CONFLICTS:=$(filter-out eapol-test-openssl ,$(filter-out eapol-test-mbedtls ,$(EAPOL_TEST_PROVIDERS)))
+ DEPENDS+=+PACKAGE_eapol-test-mbedtls:libmbedtls
+ PROVIDES:=eapol-test
+endef
+
+
+ifneq ($(wildcard $(PKG_BUILD_DIR)/.config_*),$(subst .configured_,.config_,$(STAMP_CONFIGURED)))
+ define Build/Configure/rebuild
+ $(FIND) $(PKG_BUILD_DIR) -name \*.o -or -name \*.a | $(XARGS) rm -f
+ rm -f $(PKG_BUILD_DIR)/hostapd/hostapd
+ rm -f $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant
+ rm -f $(PKG_BUILD_DIR)/.config_*
+ touch $(subst .configured_,.config_,$(STAMP_CONFIGURED))
+ endef
+endif
+
+define Build/Configure
+ $(Build/Configure/rebuild)
+ $(if $(wildcard ./files/hostapd-$(CONFIG_VARIANT).config), \
+ $(CP) ./files/hostapd-$(CONFIG_VARIANT).config $(PKG_BUILD_DIR)/hostapd/.config \
+ )
+ $(if $(wildcard ./files/wpa_supplicant-$(CONFIG_VARIANT).config), \
+ $(CP) ./files/wpa_supplicant-$(CONFIG_VARIANT).config $(PKG_BUILD_DIR)/wpa_supplicant/.config
+ )
+endef
+
+TARGET_CPPFLAGS := \
+ -I$(STAGING_DIR)/usr/include/libnl-tiny \
+ -I$(PKG_BUILD_DIR)/src/crypto \
+ $(TARGET_CPPFLAGS) \
+ -DCONFIG_LIBNL20 \
+ -D_GNU_SOURCE \
+ $(if $(CONFIG_WPA_MSG_MIN_PRIORITY),-DCONFIG_MSG_MIN_PRIORITY=$(CONFIG_WPA_MSG_MIN_PRIORITY))
+
+TARGET_LDFLAGS += -lubox -lubus -lblobmsg_json -lucode -lm -lnl-tiny -ludebug
+
+ifdef CONFIG_WPA_ENABLE_WEP
+ DRIVER_MAKEOPTS += CONFIG_WEP=y
+endif
+
+define Build/RunMake
+ CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
+ $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(1) \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(DRIVER_MAKEOPTS) \
+ LIBS="$(TARGET_LDFLAGS)" \
+ LIBS_c="$(TARGET_LDFLAGS_C)" \
+ AR="$(TARGET_CROSS)gcc-ar" \
+ BCHECK= \
+ $(if $(findstring s,$(OPENWRT_VERBOSE)),V=1) \
+ $(2)
+endef
+
+define Build/Compile/wpad
+ echo ` \
+ $(call Build/RunMake,hostapd,-s MULTICALL=1 dump_cflags); \
+ $(call Build/RunMake,wpa_supplicant,-s MULTICALL=1 dump_cflags) | \
+ sed -e 's,-n ,,g' -e 's^$(TARGET_CFLAGS)^^' \
+ ` > $(PKG_BUILD_DIR)/.cflags
+ sed -i 's/"/\\"/g' $(PKG_BUILD_DIR)/.cflags
+ +$(call Build/RunMake,hostapd, \
+ CFLAGS="$$$$(cat $(PKG_BUILD_DIR)/.cflags)" \
+ MULTICALL=1 \
+ hostapd_cli hostapd_multi.a \
+ )
+ +$(call Build/RunMake,wpa_supplicant, \
+ CFLAGS="$$$$(cat $(PKG_BUILD_DIR)/.cflags)" \
+ MULTICALL=1 \
+ wpa_cli wpa_supplicant_multi.a \
+ )
+ +export MAKEFLAGS="$(MAKE_JOBSERVER)"; $(TARGET_CC) -o $(PKG_BUILD_DIR)/wpad \
+ $(TARGET_CFLAGS) \
+ ./files/multicall.c \
+ $(PKG_BUILD_DIR)/hostapd/hostapd_multi.a \
+ $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant_multi.a \
+ $(TARGET_LDFLAGS)
+endef
+
+define Build/Compile/hostapd
+ +$(call Build/RunMake,hostapd, \
+ hostapd hostapd_cli \
+ )
+endef
+
+define Build/Compile/supplicant
+ +$(call Build/RunMake,wpa_supplicant, \
+ wpa_cli wpa_supplicant \
+ )
+endef
+
+define Build/Compile/supplicant-full-internal
+ +$(call Build/RunMake,wpa_supplicant, \
+ eapol_test \
+ )
+endef
+
+define Build/Compile/supplicant-full-openssl
+ +$(call Build/RunMake,wpa_supplicant, \
+ eapol_test \
+ )
+endef
+
+define Build/Compile/supplicant-full-wolfssl
+ +$(call Build/RunMake,wpa_supplicant, \
+ eapol_test \
+ )
+endef
+
+define Build/Compile/supplicant-full-mbedtls
+ +$(call Build/RunMake,wpa_supplicant, \
+ eapol_test \
+ )
+endef
+
+define Build/Compile
+ $(Build/Compile/$(LOCAL_TYPE))
+ $(Build/Compile/$(BUILD_VARIANT))
+endef
+
+define Install/hostapd/full
+ $(INSTALL_DIR) $(1)/etc/init.d $(1)/etc/config $(1)/etc/radius
+ ln -sf hostapd $(1)/usr/sbin/hostapd-radius
+ $(INSTALL_BIN) ./files/radius.init $(1)/etc/init.d/radius
+ $(INSTALL_DATA) ./files/radius.config $(1)/etc/config/radius
+ $(INSTALL_DATA) ./files/radius.clients $(1)/etc/radius/clients
+ $(INSTALL_DATA) ./files/radius.users $(1)/etc/radius/users
+endef
+
+define Package/hostapd-full/conffiles
+/etc/config/radius
+/etc/radius
+endef
+
+ifeq ($(CONFIG_VARIANT),full)
+Package/wpad-mesh-openssl/conffiles = $(Package/hostapd-full/conffiles)
+Package/wpad-mesh-wolfssl/conffiles = $(Package/hostapd-full/conffiles)
+Package/wpad-mesh-mbedtls/conffiles = $(Package/hostapd-full/conffiles)
+Package/wpad/conffiles = $(Package/hostapd-full/conffiles)
+Package/wpad-openssl/conffiles = $(Package/hostapd-full/conffiles)
+Package/wpad-wolfssl/conffiles = $(Package/hostapd-full/conffiles)
+Package/wpad-mbedtls/conffiles = $(Package/hostapd-full/conffiles)
+Package/hostapd/conffiles = $(Package/hostapd-full/conffiles)
+Package/hostapd-openssl/conffiles = $(Package/hostapd-full/conffiles)
+Package/hostapd-wolfssl/conffiles = $(Package/hostapd-full/conffiles)
+Package/hostapd-mbedtls/conffiles = $(Package/hostapd-full/conffiles)
+endif
+
+define Install/hostapd
+ $(INSTALL_DIR) $(1)/usr/sbin $(1)/usr/share/hostap
+ $(INSTALL_DATA) ./files/hostapd.uc $(1)/usr/share/hostap/
+ $(if $(findstring full,$(CONFIG_VARIANT)),$(Install/hostapd/full))
+endef
+
+define Install/supplicant
+ $(INSTALL_DIR) $(1)/usr/sbin $(1)/usr/share/hostap
+ $(INSTALL_DATA) ./files/wpa_supplicant.uc $(1)/usr/share/hostap/
+endef
+
+define Package/hostapd-common/install
+ $(INSTALL_DIR) $(1)/etc/capabilities $(1)/etc/rc.button $(1)/etc/hotplug.d/ieee80211 $(1)/etc/init.d $(1)/lib/netifd $(1)/usr/share/acl.d $(1)/usr/share/hostap
+ $(INSTALL_BIN) ./files/dhcp-get-server.sh $(1)/lib/netifd/dhcp-get-server.sh
+ $(INSTALL_BIN) ./files/wpad.init $(1)/etc/init.d/wpad
+ $(INSTALL_BIN) ./files/wps-hotplug.sh $(1)/etc/rc.button/wps
+ $(INSTALL_DATA) ./files/wpad_acl.json $(1)/usr/share/acl.d
+ $(INSTALL_DATA) ./files/wpad.json $(1)/etc/capabilities
+ [ ! -d $(STAGING_DIR)/usr/include/wpa_ctrl.h ] && $(CP) -f $(PKG_BUILD_DIR)/src/common/wpa_ctrl.h $(STAGING_DIR)/usr/include
+ [ ! -d $(STAGING_DIR)/usr/lib/wpa_ctrl.o ] && $(CP) -f $(PKG_BUILD_DIR)/build/hostapd/src/common/wpa_ctrl.o $(STAGING_DIR)/usr/lib
+ [ ! -d $(STAGING_DIR)/usr/lib/os_unix.o ] && $(CP) -f $(PKG_BUILD_DIR)/build/hostapd/src/utils/os_unix.o $(STAGING_DIR)/usr/lib
+endef
+
+define Package/hostapd/install
+ $(call Install/hostapd,$(1))
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd $(1)/usr/sbin/
+endef
+Package/hostapd-basic/install = $(Package/hostapd/install)
+Package/hostapd-basic-openssl/install = $(Package/hostapd/install)
+Package/hostapd-basic-wolfssl/install = $(Package/hostapd/install)
+Package/hostapd-basic-mbedtls/install = $(Package/hostapd/install)
+Package/hostapd-mini/install = $(Package/hostapd/install)
+Package/hostapd-openssl/install = $(Package/hostapd/install)
+Package/hostapd-wolfssl/install = $(Package/hostapd/install)
+Package/hostapd-mbedtls/install = $(Package/hostapd/install)
+
+ifneq ($(LOCAL_TYPE),supplicant)
+ define Package/hostapd-utils/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd_cli $(1)/usr/sbin/
+ endef
+endif
+
+define Package/wpad/install
+ $(call Install/hostapd,$(1))
+ $(call Install/supplicant,$(1))
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wpad $(1)/usr/sbin/
+ $(LN) wpad $(1)/usr/sbin/hostapd
+ $(LN) wpad $(1)/usr/sbin/wpa_supplicant
+endef
+Package/wpad-basic/install = $(Package/wpad/install)
+Package/wpad-basic-openssl/install = $(Package/wpad/install)
+Package/wpad-basic-wolfssl/install = $(Package/wpad/install)
+Package/wpad-basic-mbedtls/install = $(Package/wpad/install)
+Package/wpad-mini/install = $(Package/wpad/install)
+Package/wpad-openssl/install = $(Package/wpad/install)
+Package/wpad-wolfssl/install = $(Package/wpad/install)
+Package/wpad-mbedtls/install = $(Package/wpad/install)
+Package/wpad-mesh-openssl/install = $(Package/wpad/install)
+Package/wpad-mesh-wolfssl/install = $(Package/wpad/install)
+Package/wpad-mesh-mbedtls/install = $(Package/wpad/install)
+
+define Package/wpa-supplicant/install
+ $(call Install/supplicant,$(1))
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant $(1)/usr/sbin/
+endef
+Package/wpa-supplicant-basic/install = $(Package/wpa-supplicant/install)
+Package/wpa-supplicant-mini/install = $(Package/wpa-supplicant/install)
+Package/wpa-supplicant-p2p/install = $(Package/wpa-supplicant/install)
+Package/wpa-supplicant-openssl/install = $(Package/wpa-supplicant/install)
+Package/wpa-supplicant-wolfssl/install = $(Package/wpa-supplicant/install)
+Package/wpa-supplicant-mbedtls/install = $(Package/wpa-supplicant/install)
+Package/wpa-supplicant-mesh-openssl/install = $(Package/wpa-supplicant/install)
+Package/wpa-supplicant-mesh-wolfssl/install = $(Package/wpa-supplicant/install)
+Package/wpa-supplicant-mesh-mbedtls/install = $(Package/wpa-supplicant/install)
+
+ifneq ($(LOCAL_TYPE),hostapd)
+ define Package/wpa-cli/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(CP) $(PKG_BUILD_DIR)/wpa_supplicant/wpa_cli $(1)/usr/sbin/
+ endef
+endif
+
+ifeq ($(BUILD_VARIANT),supplicant-full-internal)
+ define Package/eapol-test/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(CP) $(PKG_BUILD_DIR)/wpa_supplicant/eapol_test $(1)/usr/sbin/
+ endef
+endif
+
+ifeq ($(BUILD_VARIANT),supplicant-full-openssl)
+ define Package/eapol-test-openssl/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(CP) $(PKG_BUILD_DIR)/wpa_supplicant/eapol_test $(1)/usr/sbin/
+ endef
+endif
+
+ifeq ($(BUILD_VARIANT),supplicant-full-wolfssl)
+ define Package/eapol-test-wolfssl/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(CP) $(PKG_BUILD_DIR)/wpa_supplicant/eapol_test $(1)/usr/sbin/
+ endef
+endif
+
+ifeq ($(BUILD_VARIANT),supplicant-full-mbedtls)
+ define Package/eapol-test-mbedtls/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(CP) $(PKG_BUILD_DIR)/wpa_supplicant/eapol_test $(1)/usr/sbin/
+ endef
+endif
+
+# Build hostapd-common before its dependents, to avoid
+# spurious rebuilds when building multiple variants.
+$(eval $(call BuildPackage,hostapd-common))
+$(eval $(call BuildPackage,hostapd))
+$(eval $(call BuildPackage,hostapd-basic))
+$(eval $(call BuildPackage,hostapd-basic-openssl))
+$(eval $(call BuildPackage,hostapd-basic-wolfssl))
+$(eval $(call BuildPackage,hostapd-basic-mbedtls))
+$(eval $(call BuildPackage,hostapd-mini))
+$(eval $(call BuildPackage,hostapd-openssl))
+$(eval $(call BuildPackage,hostapd-wolfssl))
+$(eval $(call BuildPackage,hostapd-mbedtls))
+$(eval $(call BuildPackage,wpad))
+$(eval $(call BuildPackage,wpad-mesh-openssl))
+$(eval $(call BuildPackage,wpad-mesh-wolfssl))
+$(eval $(call BuildPackage,wpad-mesh-mbedtls))
+$(eval $(call BuildPackage,wpad-basic))
+$(eval $(call BuildPackage,wpad-basic-openssl))
+$(eval $(call BuildPackage,wpad-basic-wolfssl))
+$(eval $(call BuildPackage,wpad-basic-mbedtls))
+$(eval $(call BuildPackage,wpad-mini))
+$(eval $(call BuildPackage,wpad-openssl))
+$(eval $(call BuildPackage,wpad-wolfssl))
+$(eval $(call BuildPackage,wpad-mbedtls))
+$(eval $(call BuildPackage,wpa-supplicant))
+$(eval $(call BuildPackage,wpa-supplicant-mesh-openssl))
+$(eval $(call BuildPackage,wpa-supplicant-mesh-wolfssl))
+$(eval $(call BuildPackage,wpa-supplicant-mesh-mbedtls))
+$(eval $(call BuildPackage,wpa-supplicant-basic))
+$(eval $(call BuildPackage,wpa-supplicant-mini))
+$(eval $(call BuildPackage,wpa-supplicant-p2p))
+$(eval $(call BuildPackage,wpa-supplicant-openssl))
+$(eval $(call BuildPackage,wpa-supplicant-wolfssl))
+$(eval $(call BuildPackage,wpa-supplicant-mbedtls))
+$(eval $(call BuildPackage,wpa-cli))
+$(eval $(call BuildPackage,hostapd-utils))
+$(eval $(call BuildPackage,eapol-test))
+$(eval $(call BuildPackage,eapol-test-openssl))
+$(eval $(call BuildPackage,eapol-test-wolfssl))
+$(eval $(call BuildPackage,eapol-test-mbedtls))
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0001-backport-hostapd-afcd-add-AFC-daemon-support.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0001-backport-hostapd-afcd-add-AFC-daemon-support.patch
new file mode 100644
index 0000000..12f3cc2
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0001-backport-hostapd-afcd-add-AFC-daemon-support.patch
@@ -0,0 +1,372 @@
+From 6fba149b3d3db0b7c9bb6e71632fef947eac7cab Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Wed, 20 Mar 2024 07:13:01 +0800
+Subject: [PATCH 01/69] backport: hostapd: afcd: add AFC daemon support
+
+Introduce Automated Frequency Coordination Daemon (AFCD) support
+for UNII-5 and UNII-7 6GHz bands.
+AFCD will be used by hostapd AFC client in order to forward the AFC
+request to the AFC coordinator and decouple AFC connection management
+from hostapd.
+AFC is required for Standard Power Devices (SPDs) to determine a lists
+of channels and EIRP/PSD powers that are available in the 6GHz spectrum.
+AFCD is tested with AFC DUT Test Harness [0].
+
+[0] https://github.com/Wi-FiTestSuite/AFC-DUT/tree/main
+
+Tested-by: Allen Ye <allen.ye@mediatek.com>
+Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
+---
+ afc/.gitignore | 1 +
+ afc/Makefile | 31 ++++++
+ afc/afcd.c | 292 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 324 insertions(+)
+ create mode 100644 afc/.gitignore
+ create mode 100644 afc/Makefile
+ create mode 100644 afc/afcd.c
+
+diff --git a/afc/.gitignore b/afc/.gitignore
+new file mode 100644
+index 000000000..8d8cca905
+--- /dev/null
++++ b/afc/.gitignore
+@@ -0,0 +1 @@
++afcd
+diff --git a/afc/Makefile b/afc/Makefile
+new file mode 100644
+index 000000000..a83bd01db
+--- /dev/null
++++ b/afc/Makefile
+@@ -0,0 +1,31 @@
++ALL=afcd
++
++include ../src/build.rules
++
++CFLAGS += -I../src/utils
++CFLAGS += -I../src
++
++OBJS=afcd.o
++OBJS += ../src/utils/common.o
++OBJS += ../src/utils/wpa_debug.o
++OBJS += ../src/utils/wpabuf.o
++
++ifndef CONFIG_OS
++ifdef CONFIG_NATIVE_WINDOWS
++CONFIG_OS=win32
++else
++CONFIG_OS=unix
++endif
++endif
++OBJS += ../src/utils/os_$(CONFIG_OS).o
++
++LIBS += -lcurl
++
++_OBJS_VAR := OBJS
++include ../src/objs.mk
++afcd: $(OBJS)
++ $(Q)$(LDO) $(LDFLAGS) -o afcd $(OBJS) $(LIBS)
++ @$(E) " LD " $@
++
++clean: common-clean
++ rm -f core *~
+diff --git a/afc/afcd.c b/afc/afcd.c
+new file mode 100644
+index 000000000..f502846c5
+--- /dev/null
++++ b/afc/afcd.c
+@@ -0,0 +1,292 @@
++/*
++ * Automated Frequency Coordination Daemon
++ * Copyright (c) 2024, Lorenzo Bianconi <lorenzo@kernel.org>
++ *
++ * This software may be distributed under the terms of the BSD license.
++ * See README for more details.
++ */
++
++#include <curl/curl.h>
++#include <sys/un.h>
++#include <sys/stat.h>
++
++#include "utils/includes.h"
++#include "utils/common.h"
++
++#define CURL_TIMEOUT 60
++#define AFCD_SOCK "afcd.sock"
++
++struct curl_ctx {
++ char *buf;
++ size_t buf_len;
++};
++
++static volatile bool exiting;
++
++static char *path = "/var/run";
++static char *bearer_token;
++static char *url;
++static int port = 443;
++
++
++static size_t afcd_curl_cb_write(void *ptr, size_t size, size_t nmemb,
++ void *userdata)
++{
++ struct curl_ctx *ctx = userdata;
++ char *buf;
++
++ buf = os_realloc(ctx->buf, ctx->buf_len + size * nmemb + 1);
++ if (!buf)
++ return 0;
++
++ ctx->buf = buf;
++ os_memcpy(buf + ctx->buf_len, ptr, size * nmemb);
++ buf[ctx->buf_len + size * nmemb] = '\0';
++ ctx->buf_len += size * nmemb;
++
++ return size * nmemb;
++}
++
++
++static int afcd_send_request(struct curl_ctx *ctx, unsigned char *request)
++{
++ struct curl_slist *headers = NULL;
++ CURL *curl;
++ int ret;
++
++ wpa_printf(MSG_DEBUG, "Sending AFC request to %s", url);
++
++ curl_global_init(CURL_GLOBAL_ALL);
++ curl = curl_easy_init();
++ if (!curl)
++ return -ENOMEM;
++
++ headers = curl_slist_append(headers, "Accept: application/json");
++ headers = curl_slist_append(headers,
++ "Content-Type: application/json");
++ headers = curl_slist_append(headers, "charset: utf-8");
++
++ curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
++ curl_easy_setopt(curl, CURLOPT_URL, url);
++ curl_easy_setopt(curl, CURLOPT_PORT, port);
++ curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
++ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
++ afcd_curl_cb_write);
++ curl_easy_setopt(curl, CURLOPT_WRITEDATA, ctx);
++ curl_easy_setopt(curl, CURLOPT_USERAGENT, "libcrp/0.1");
++ curl_easy_setopt(curl, CURLOPT_TIMEOUT, CURL_TIMEOUT);
++ curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2);
++ if (bearer_token)
++ curl_easy_setopt(curl, CURLOPT_XOAUTH2_BEARER, bearer_token);
++ curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_BEARER);
++ curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1L);
++ curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 1L);
++ curl_easy_setopt(curl, CURLOPT_POSTFIELDS, request);
++ curl_easy_setopt(curl, CURLOPT_SSL_VERIFYSTATUS, 1L);
++
++ ret = curl_easy_perform(curl);
++ if (ret != CURLE_OK)
++ wpa_printf(MSG_ERROR, "curl_easy_perform failed: %s",
++ curl_easy_strerror(ret));
++
++ curl_easy_cleanup(curl);
++ curl_global_cleanup();
++
++ return ret == CURLE_OK ? 0 : -EINVAL;
++}
++
++
++static void handle_term(int sig)
++{
++ wpa_printf(MSG_ERROR, "Received signal %d", sig);
++ exiting = true;
++}
++
++
++static void usage(void)
++{
++ wpa_printf(MSG_ERROR,
++ "%s:\n"
++ "afcd -u<url> [-p<port>][-t<token>][-D<unix-sock dir>][-P<PID file>][-dB]",
++ __func__);
++}
++
++
++#define BUFSIZE 8192
++static int afcd_server_run(void)
++{
++ size_t len = os_strlen(path) + 1 + os_strlen(AFCD_SOCK);
++ struct sockaddr_un addr = {
++ .sun_family = AF_UNIX,
++#ifdef __FreeBSD__
++ .sun_len = sizeof(addr),
++#endif /* __FreeBSD__ */
++ };
++ int sockfd, ret = 0;
++ char *fname = NULL;
++ unsigned char *buf;
++ fd_set read_set;
++
++ if (len >= sizeof(addr.sun_path))
++ return -EINVAL;
++
++ if (mkdir(path, S_IRWXU | S_IRWXG) < 0 && errno != EEXIST)
++ return -EINVAL;
++
++ buf = os_malloc(BUFSIZE);
++ if (!buf)
++ return -ENOMEM;
++
++ fname = os_malloc(len + 1);
++ if (!fname) {
++ ret = -ENOMEM;
++ goto free_buf;
++ }
++
++ os_snprintf(fname, len + 1, "%s/%s", path, AFCD_SOCK);
++ fname[len] = '\0';
++ os_strlcpy(addr.sun_path, fname, sizeof(addr.sun_path));
++
++ sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
++ if (sockfd < 0) {
++ wpa_printf(MSG_ERROR, "Failed creating socket");
++ ret = -errno;
++ goto unlink;
++ }
++
++ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
++ wpa_printf(MSG_ERROR, "Failed to bind socket");
++ ret = -errno;
++ goto close;
++ }
++
++ if (listen(sockfd, 10) < 0) {
++ wpa_printf(MSG_ERROR, "Failed to listen on socket");
++ ret = -errno;
++ goto close;
++ }
++
++ FD_ZERO(&read_set);
++ while (!exiting) {
++ socklen_t addr_len = sizeof(addr);
++ struct sockaddr_in6 c_addr;
++ struct timeval timeout = {
++ .tv_sec = 1,
++ };
++ struct curl_ctx ctx = {};
++ int fd;
++
++ FD_SET(sockfd, &read_set);
++ if (select(sockfd + 1, &read_set, NULL, NULL, &timeout) < 0) {
++ if (errno != EINTR) {
++ wpa_printf(MSG_ERROR,
++ "Select failed on socket");
++ ret = -errno;
++ break;
++ }
++ continue;
++ }
++
++ if (!FD_ISSET(sockfd, &read_set))
++ continue;
++
++ fd = accept(sockfd, (struct sockaddr *)&c_addr,
++ &addr_len);
++ if (fd < 0) {
++ if (errno != EINTR) {
++ wpa_printf(MSG_ERROR,
++ "Failed accepting connections");
++ ret = -errno;
++ break;
++ }
++ continue;
++ }
++
++ os_memset(buf, 0, BUFSIZE);
++ if (recv(fd, buf, BUFSIZE, 0) <= 0) {
++ close(fd);
++ continue;
++ }
++
++ wpa_printf(MSG_DEBUG, "Received request: %s", buf);
++ if (!afcd_send_request(&ctx, buf)) {
++ wpa_printf(MSG_DEBUG, "Received reply: %s", ctx.buf);
++ send(fd, ctx.buf, ctx.buf_len, MSG_NOSIGNAL);
++ free(ctx.buf);
++ }
++ close(fd);
++ }
++close:
++ close(sockfd);
++unlink:
++ unlink(fname);
++ os_free(fname);
++free_buf:
++ os_free(buf);
++
++ return ret;
++}
++
++
++int main(int argc, char **argv)
++{
++ bool daemonize = false;
++ char *pid_file = NULL;
++
++ if (os_program_init())
++ return -1;
++
++ for (;;) {
++ int c = getopt(argc, argv, "u:p:t:D:P:hdB");
++
++ if (c < 0)
++ break;
++
++ switch (c) {
++ case 'h':
++ usage();
++ return 0;
++ case 'B':
++ daemonize = true;
++ break;
++ case 'D':
++ path = optarg;
++ break;
++ case 'P':
++ os_free(pid_file);
++ pid_file = os_rel2abs_path(optarg);
++ break;
++ case 'u':
++ url = optarg;
++ break;
++ case 'p':
++ port = atoi(optarg);
++ break;
++ case 'd':
++ if (wpa_debug_level > 0)
++ wpa_debug_level--;
++ break;
++ case 't':
++ bearer_token = optarg;
++ break;
++ default:
++ usage();
++ return -EINVAL;
++ }
++ }
++
++ if (!url) {
++ usage();
++ return -EINVAL;
++ }
++
++ if (daemonize && os_daemonize(pid_file)) {
++ wpa_printf(MSG_ERROR, "daemon: %s", strerror(errno));
++ return -EINVAL;
++ }
++
++ signal(SIGTERM, handle_term);
++ signal(SIGINT, handle_term);
++
++ return afcd_server_run();
++}
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0002-backport-hostapd-export-hostapd_is_usable_chans-util.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0002-backport-hostapd-export-hostapd_is_usable_chans-util.patch
new file mode 100644
index 0000000..6b91d4d
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0002-backport-hostapd-export-hostapd_is_usable_chans-util.patch
@@ -0,0 +1,55 @@
+From 153d95998a8ae64588aa3edabed2f052e1dfca09 Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Wed, 20 Mar 2024 07:17:31 +0800
+Subject: [PATCH 02/69] backport: hostapd: export hostapd_is_usable_chans
+ utility routine
+
+This is a preliminary patch to introduce AFC support.
+
+Tested-by: Allen Ye <allen.ye@mediatek.com>
+Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
+---
+ src/ap/hw_features.c | 2 +-
+ src/ap/hw_features.h | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
+index fd401d78a..e652d7504 100644
+--- a/src/ap/hw_features.c
++++ b/src/ap/hw_features.c
+@@ -995,7 +995,7 @@ static bool hostapd_is_usable_punct_bitmap(struct hostapd_iface *iface)
+ * 0 = not usable
+ * -1 = not currently usable due to 6 GHz NO-IR
+ */
+-static int hostapd_is_usable_chans(struct hostapd_iface *iface)
++int hostapd_is_usable_chans(struct hostapd_iface *iface)
+ {
+ int secondary_freq;
+ struct hostapd_channel_data *pri_chan;
+diff --git a/src/ap/hw_features.h b/src/ap/hw_features.h
+index c682c6d20..eeffb1abd 100644
+--- a/src/ap/hw_features.h
++++ b/src/ap/hw_features.h
+@@ -30,6 +30,7 @@ void hostapd_stop_setup_timers(struct hostapd_iface *iface);
+ int hostapd_hw_skip_mode(struct hostapd_iface *iface,
+ struct hostapd_hw_modes *mode);
+ int hostapd_determine_mode(struct hostapd_iface *iface);
++int hostapd_is_usable_chans(struct hostapd_iface *iface);
+ #else /* NEED_AP_MLME */
+ static inline void
+ hostapd_free_hw_features(struct hostapd_hw_modes *hw_features,
+@@ -103,6 +104,11 @@ static inline int hostapd_determine_mode(struct hostapd_iface *iface)
+ return 0;
+ }
+
++static inline int hostapd_is_usable_chans(struct hostapd_iface *iface)
++{
++ return 1;
++}
++
+ #endif /* NEED_AP_MLME */
+
+ #endif /* HW_FEATURES_H */
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0003-backport-hostapd-ap-add-AFC-client-support.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0003-backport-hostapd-ap-add-AFC-client-support.patch
new file mode 100644
index 0000000..276098b
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0003-backport-hostapd-ap-add-AFC-client-support.patch
@@ -0,0 +1,1542 @@
+From 6d93e0baf90ab4b1d8957b9cf551159466c7dc07 Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Wed, 20 Mar 2024 07:18:37 +0800
+Subject: [PATCH 03/69] backport: hostapd: ap: add AFC client support
+
+Introduce Automated Frequency Coordination (AFC) support for UNII-5 and
+UNII-7 6GHz bands.
+AFC client will connect to AFCD providing AP related parameter for AFC
+coordinator (e.g. geolocation, supported frequencies, ..).
+AFC is required for Standard Power Devices (SPDs) to determine a lists
+of channels and EIRP/PSD powers that are available in the 6GHz spectrum.
+AFC hostapd client is tested with AFC DUT Test Harness [0].
+
+[0] https://github.com/Wi-FiTestSuite/AFC-DUT/tree/main
+
+Tested-by: Allen Ye <allen.ye@mediatek.com>
+Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
+---
+ hostapd/Makefile | 6 +
+ hostapd/config_file.c | 262 ++++++++++++
+ hostapd/defconfig | 3 +
+ hostapd/hostapd.conf | 42 ++
+ src/ap/afc.c | 918 ++++++++++++++++++++++++++++++++++++++++++
+ src/ap/ap_config.c | 16 +
+ src/ap/ap_config.h | 47 +++
+ src/ap/hostapd.c | 60 +++
+ src/ap/hostapd.h | 29 ++
+ src/ap/hw_features.c | 2 +
+ 10 files changed, 1385 insertions(+)
+ create mode 100644 src/ap/afc.c
+
+diff --git a/hostapd/Makefile b/hostapd/Makefile
+index b3cb68673..405e05e5f 100644
+--- a/hostapd/Makefile
++++ b/hostapd/Makefile
+@@ -103,6 +103,12 @@ CFLAGS += -DCONFIG_TAXONOMY
+ OBJS += ../src/ap/taxonomy.o
+ endif
+
++ifdef CONFIG_AFC
++CFLAGS += -DCONFIG_AFC
++OBJS += ../src/ap/afc.o
++LIBS += -ljson-c
++endif
++
+ ifdef CONFIG_MODULE_TESTS
+ CFLAGS += -DCONFIG_MODULE_TESTS
+ OBJS += hapd_module_tests.o
+diff --git a/hostapd/config_file.c b/hostapd/config_file.c
+index e9f0c5ca2..b83df99ac 100644
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -2436,6 +2436,191 @@ static int get_u16(const char *pos, int line, u16 *ret_val)
+ #endif /* CONFIG_IEEE80211BE */
+
+
++#ifdef CONFIG_AFC
++static int hostapd_afc_parse_cert_ids(struct hostapd_config *conf, char *pos)
++{
++ struct cert_id *c = NULL;
++ int i, count = 0;
++
++ while (pos && pos[0]) {
++ char *p;
++
++ c = os_realloc_array(c, count + 1, sizeof(*c));
++ if (!c)
++ return -ENOMEM;
++
++ i = count;
++ count++;
++
++ p = os_strchr(pos, ':');
++ if (!p)
++ goto error;
++
++ *p++ = '\0';
++ if (!p || !p[0])
++ goto error;
++
++ c[i].rulset = os_malloc(os_strlen(pos) + 1);
++ if (!c[i].rulset)
++ goto error;
++
++ os_strlcpy(c[i].rulset, pos, os_strlen(pos) + 1);
++ pos = p;
++ p = os_strchr(pos, ',');
++ if (p)
++ *p++ = '\0';
++
++ c[i].id = os_malloc(os_strlen(pos) + 1);
++ if (!c[i].id)
++ goto error;
++
++ os_strlcpy(c[i].id, pos, os_strlen(pos) + 1);
++ pos = p;
++ }
++
++ conf->afc.n_cert_ids = count;
++ conf->afc.cert_ids = c;
++
++ return 0;
++
++error:
++ for (i = 0; i < count; i++) {
++ os_free(c[i].rulset);
++ os_free(c[i].id);
++ }
++ os_free(c);
++
++ return -ENOMEM;
++}
++
++
++static int hostapd_afc_parse_position_data(struct afc_linear_polygon **data,
++ unsigned int *n_linear_polygon_data,
++ char *pos)
++{
++ struct afc_linear_polygon *d = NULL;
++ int i, count = 0;
++
++ while (pos && pos[0]) {
++ char *p, *end;
++
++ d = os_realloc_array(d, count + 1, sizeof(*d));
++ if (!d)
++ return -ENOMEM;
++
++ i = count;
++ count++;
++
++ p = os_strchr(pos, ':');
++ if (!p)
++ goto error;
++
++ *p++ = '\0';
++ if (!p || !p[0])
++ goto error;
++
++ d[i].longitude = strtod(pos, &end);
++ if (*end)
++ goto error;
++
++ pos = p;
++ p = os_strchr(pos, ',');
++ if (p)
++ *p++ = '\0';
++
++ d[i].latitude = strtod(pos, &end);
++ if (*end)
++ goto error;
++
++ pos = p;
++ }
++
++ *n_linear_polygon_data = count;
++ *data = d;
++
++ return 0;
++
++error:
++ os_free(d);
++ return -ENOMEM;
++}
++
++
++static int hostapd_afc_parse_freq_range(struct hostapd_config *conf, char *pos)
++{
++ struct afc_freq_range *f = NULL;
++ int i, count = 0;
++
++ while (pos && pos[0]) {
++ char *p;
++
++ f = os_realloc_array(f, count + 1, sizeof(*f));
++ if (!f)
++ return -ENOMEM;
++
++ i = count;
++ count++;
++
++ p = os_strchr(pos, ':');
++ if (!p)
++ goto error;
++
++ *p++ = '\0';
++ if (!p || !p[0])
++ goto error;
++
++ f[i].low_freq = atoi(pos);
++ pos = p;
++ p = os_strchr(pos, ',');
++ if (p)
++ *p++ = '\0';
++
++ f[i].high_freq = atoi(pos);
++ pos = p;
++ }
++
++ conf->afc.n_freq_range = count;
++ conf->afc.freq_range = f;
++
++ return 0;
++
++error:
++ os_free(f);
++ return -ENOMEM;
++}
++
++
++static int hostapd_afc_parse_op_class(struct hostapd_config *conf, char *pos)
++{
++ unsigned int *oc = NULL;
++ int i, count = 0;
++
++ while (pos && pos[0]) {
++ char *p;
++
++ oc = os_realloc_array(oc, count + 1, sizeof(*oc));
++ if (!oc)
++ return -ENOMEM;
++
++ i = count;
++ count++;
++
++ p = os_strchr(pos, ',');
++ if (p)
++ *p++ = '\0';
++
++ oc[i] = atoi(pos);
++ pos = p;
++ }
++
++ conf->afc.n_op_class = count;
++ conf->afc.op_class = oc;
++
++ return 0;
++}
++#endif /* CONFIG_AFC */
++
++
+ static int hostapd_config_fill(struct hostapd_config *conf,
+ struct hostapd_bss_config *bss,
+ const char *buf, char *pos, int line)
+@@ -3862,6 +4047,83 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ return 1;
+ }
+ bss->unsol_bcast_probe_resp_interval = val;
++#ifdef CONFIG_AFC
++ } else if (os_strcmp(buf, "afcd_sock") == 0) {
++ conf->afc.socket = os_malloc(os_strlen(pos) + 1);
++ if (!conf->afc.socket)
++ return 1;
++
++ os_strlcpy(conf->afc.socket, pos, os_strlen(pos) + 1);
++ } else if (os_strcmp(buf, "afc_request_version") == 0) {
++ conf->afc.request.version = os_malloc(os_strlen(pos) + 1);
++ if (!conf->afc.request.version)
++ return 1;
++
++ os_strlcpy(conf->afc.request.version, pos, os_strlen(pos) + 1);
++ } else if (os_strcmp(buf, "afc_request_id") == 0) {
++ conf->afc.request.id = os_malloc(os_strlen(pos) + 1);
++ if (!conf->afc.request.id)
++ return 1;
++
++ os_strlcpy(conf->afc.request.id, pos, os_strlen(pos) + 1);
++ } else if (os_strcmp(buf, "afc_serial_number") == 0) {
++ conf->afc.request.sn = os_malloc(os_strlen(pos) + 1);
++ if (!conf->afc.request.sn)
++ return 1;
++
++ os_strlcpy(conf->afc.request.sn, pos, os_strlen(pos) + 1);
++ } else if (os_strcmp(buf, "afc_cert_ids") == 0) {
++ if (hostapd_afc_parse_cert_ids(conf, pos))
++ return 1;
++ } else if (os_strcmp(buf, "afc_location_type") == 0) {
++ conf->afc.location.type = atoi(pos);
++ if (conf->afc.location.type != ELLIPSE &&
++ conf->afc.location.type != LINEAR_POLYGON &&
++ conf->afc.location.type != RADIAL_POLYGON)
++ return 1;
++ } else if (os_strcmp(buf, "afc_linear_polygon") == 0) {
++ if (hostapd_afc_parse_position_data(
++ &conf->afc.location.linear_polygon_data,
++ &conf->afc.location.n_linear_polygon_data,
++ pos))
++ return 1;
++ } else if (os_strcmp(buf, "afc_radial_polygon") == 0) {
++ if (hostapd_afc_parse_position_data(
++ (struct afc_linear_polygon **)
++ &conf->afc.location.radial_polygon_data,
++ &conf->afc.location.n_radial_polygon_data,
++ pos))
++ return 1;
++ } else if (os_strcmp(buf, "afc_major_axis") == 0) {
++ conf->afc.location.major_axis = atoi(pos);
++ } else if (os_strcmp(buf, "afc_minor_axis") == 0) {
++ conf->afc.location.minor_axis = atoi(pos);
++ } else if (os_strcmp(buf, "afc_orientation") == 0) {
++ conf->afc.location.orientation = atoi(pos);
++ } else if (os_strcmp(buf, "afc_height") == 0) {
++ char *end;
++
++ conf->afc.location.height = strtod(pos, &end);
++ if (*end)
++ return 1;
++ } else if (os_strcmp(buf, "afc_height_type") == 0) {
++ conf->afc.location.height_type = os_malloc(os_strlen(pos) + 1);
++ if (!conf->afc.location.height_type)
++ return 1;
++
++ os_strlcpy(conf->afc.location.height_type, pos,
++ os_strlen(pos) + 1);
++ } else if (os_strcmp(buf, "afc_vertical_tolerance") == 0) {
++ conf->afc.location.vertical_tolerance = atoi(pos);
++ } else if (os_strcmp(buf, "afc_min_power") == 0) {
++ conf->afc.min_power = atoi(pos);
++ } else if (os_strcmp(buf, "afc_freq_range") == 0) {
++ if (hostapd_afc_parse_freq_range(conf, pos))
++ return 1;
++ } else if (os_strcmp(buf, "afc_op_class") == 0) {
++ if (hostapd_afc_parse_op_class(conf, pos))
++ return 1;
++#endif /* CONFIG_AFC */
+ } else if (os_strcmp(buf, "mbssid") == 0) {
+ int mbssid = atoi(pos);
+ if (mbssid < 0 || mbssid > ENHANCED_MBSSID_ENABLED) {
+diff --git a/hostapd/defconfig b/hostapd/defconfig
+index 550db697b..66bf894eb 100644
+--- a/hostapd/defconfig
++++ b/hostapd/defconfig
+@@ -425,3 +425,6 @@ CONFIG_DPP2=y
+
+ # Wi-Fi Aware unsynchronized service discovery (NAN USD)
+ #CONFIG_NAN_USD=y
++
++# Enable Automated Frequency Coordination for 6GHz outdoor
++#CONFIG_AFC=y
+diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
+index 727a87770..377139947 100644
+--- a/hostapd/hostapd.conf
++++ b/hostapd/hostapd.conf
+@@ -1005,6 +1005,48 @@ wmm_ac_vo_acm=0
+ # Valid range: 0..20 TUs; default is 0 (disabled)
+ #unsol_bcast_probe_resp_interval=0
+
++##### Automated Frequency Coordination for 6GHz UNII-5 and UNII-7 bands #######
++
++# AFC daemon connection socket
++#afcd_sock=/var/run/afcd.sock
++
++# AFC request identification parameters
++#afc_request_version=1.1
++#afc_request_id=11235813
++#afc_serial_number=abcdefg
++#afc_cert_ids=US_47_CFR_PART_15_SUBPART_E:CID000
++#
++# AFC location type:
++# 0 = ellipse
++# 1 = linear polygon
++# 2 = radial polygon
++#afc_location_type=0
++#
++# AFC ellipse or linear polygon coordinations
++#afc_linear_polygon=-122.984157:37.425056
++#
++# AFC radial polygon coordinations
++#afc_radial_polygon=118.8:92.76,76.44:87.456,98.56:123.33
++#
++# AFC ellipse major/minor axis and orientation
++#afc_major_axis=100
++#afc_minor_axis=50
++#afc_orientation=70
++#
++# AFC device elevation parameters
++#afc_height=3.0
++#afc_height_type=AGL
++#afc_vertical_tolerance=7
++#
++# AFC minimum desired TX power (dbm)
++#afc_min_power=24
++#
++# AFC request frequency ranges
++#afc_freq_range=5925:6425,6525:6875
++#
++# AFC request operation classes
++#afc_op_class=131,132,133,134,136
++
+ ##### IEEE 802.11be related configuration #####################################
+
+ #ieee80211be: Whether IEEE 802.11be (EHT) is enabled
+diff --git a/src/ap/afc.c b/src/ap/afc.c
+new file mode 100644
+index 000000000..c75d5d582
+--- /dev/null
++++ b/src/ap/afc.c
+@@ -0,0 +1,918 @@
++/*
++ * Automated Frequency Coordination
++ * Copyright (c) 2024, Lorenzo Bianconi <lorenzo@kernel.org>
++ *
++ * This software may be distributed under the terms of the BSD license.
++ * See README for more details.
++ */
++
++#include <json-c/json.h>
++#include <sys/un.h>
++#include <time.h>
++
++#include "utils/includes.h"
++#include "utils/common.h"
++#include "utils/eloop.h"
++#include "hostapd.h"
++#include "acs.h"
++#include "hw_features.h"
++
++#define HOSTAPD_AFC_RETRY_TIMEOUT 180
++#define HOSTAPD_AFC_TIMEOUT 86400 /* 24h */
++#define HOSTAPD_AFC_BUFSIZE 4096
++
++static void hostapd_afc_timeout_handler(void *eloop_ctx, void *timeout_ctx);
++
++
++static struct json_object *
++hostapd_afc_build_location_request(struct hostapd_iface *iface)
++{
++ struct json_object *location_obj, *center_obj, *ellipse_obj;
++ struct json_object *elevation_obj, *str_obj;
++ struct hostapd_config *iconf = iface->conf;
++ bool is_ap_indoor = he_reg_is_indoor(iconf->he_6ghz_reg_pwr_type);
++
++ location_obj = json_object_new_object();
++ if (!location_obj)
++ return NULL;
++
++ if (iconf->afc.location.type != LINEAR_POLYGON) {
++ struct afc_linear_polygon *lp =
++ &iconf->afc.location.linear_polygon_data[0];
++
++ ellipse_obj = json_object_new_object();
++ if (!ellipse_obj)
++ goto error;
++
++ center_obj = json_object_new_object();
++ if (!center_obj)
++ goto error;
++
++ json_object_object_add(ellipse_obj, "center", center_obj);
++
++ str_obj = json_object_new_double(lp->longitude);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(center_obj, "longitude", str_obj);
++ str_obj = json_object_new_double(lp->latitude);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(center_obj, "latitude", str_obj);
++
++ }
++
++ switch (iconf->afc.location.type) {
++ case LINEAR_POLYGON: {
++ struct json_object *outer_boundary_obj;
++ int i;
++
++ outer_boundary_obj = json_object_new_object();
++ if (!outer_boundary_obj)
++ goto error;
++
++ json_object_object_add(location_obj, "linearPolygon",
++ outer_boundary_obj);
++ ellipse_obj = json_object_new_array();
++ if (!ellipse_obj)
++ goto error;
++
++ json_object_object_add(outer_boundary_obj, "outerBoundary",
++ ellipse_obj);
++ for (i = 0;
++ i < iconf->afc.location.n_linear_polygon_data; i++) {
++ struct afc_linear_polygon *lp =
++ &iconf->afc.location.linear_polygon_data[i];
++
++ center_obj = json_object_new_object();
++ if (!center_obj)
++ goto error;
++
++ json_object_array_add(ellipse_obj, center_obj);
++ str_obj = json_object_new_double(lp->longitude);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(center_obj, "longitude",
++ str_obj);
++ str_obj = json_object_new_double(lp->latitude);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(center_obj, "latitude",
++ str_obj);
++ }
++ break;
++ }
++ case RADIAL_POLYGON: {
++ struct json_object *outer_boundary_obj;
++ int i;
++
++ json_object_object_add(location_obj, "radialPolygon",
++ ellipse_obj);
++
++ outer_boundary_obj = json_object_new_array();
++ if (!outer_boundary_obj)
++ goto error;
++
++ json_object_object_add(ellipse_obj, "outerBoundary",
++ outer_boundary_obj);
++ for (i = 0;
++ i < iconf->afc.location.n_radial_polygon_data; i++) {
++ struct afc_radial_polygon *rp =
++ &iconf->afc.location.radial_polygon_data[i];
++ struct json_object *angle_obj;
++
++ angle_obj = json_object_new_object();
++ if (!angle_obj)
++ goto error;
++
++ json_object_array_add(outer_boundary_obj, angle_obj);
++
++ str_obj = json_object_new_double(rp->angle);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(angle_obj, "angle", str_obj);
++ str_obj = json_object_new_double(rp->length);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(angle_obj, "length", str_obj);
++ }
++ break;
++ }
++ case ELLIPSE:
++ default:
++ json_object_object_add(location_obj, "ellipse", ellipse_obj);
++
++ str_obj = json_object_new_int(iconf->afc.location.major_axis);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(ellipse_obj, "majorAxis", str_obj);
++ str_obj = json_object_new_int(iconf->afc.location.minor_axis);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(ellipse_obj, "minorAxis", str_obj);
++ str_obj = json_object_new_int(iconf->afc.location.orientation);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(ellipse_obj, "orientation", str_obj);
++ break;
++ }
++
++ elevation_obj = json_object_new_object();
++ if (!elevation_obj)
++ goto error;
++
++ json_object_object_add(location_obj, "elevation",
++ elevation_obj);
++ str_obj = json_object_new_double(iconf->afc.location.height);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(elevation_obj, "height", str_obj);
++ str_obj = json_object_new_string(iconf->afc.location.height_type);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(elevation_obj, "heightType", str_obj);
++ str_obj = json_object_new_int(iconf->afc.location.vertical_tolerance);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(elevation_obj, "verticalUncertainty",
++ str_obj);
++ str_obj = json_object_new_int(is_ap_indoor);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(location_obj, "indoorDeployment", str_obj);
++
++ return location_obj;
++
++error:
++ json_object_put(location_obj);
++ return NULL;
++}
++
++
++static struct json_object * hostapd_afc_get_opclass_chan_list(u8 op_class)
++{
++ struct json_object *chan_list_obj, *str_obj;
++ const struct oper_class_map *oper_class;
++ int chan_offset, chan;
++
++ oper_class = get_oper_class(NULL, op_class);
++ if (!oper_class)
++ return NULL;
++
++ chan_list_obj = json_object_new_array();
++ if (!chan_list_obj)
++ return NULL;
++
++ switch (op_class) {
++ case 132: /* 40MHz */
++ chan_offset = 2;
++ break;
++ case 133: /* 80MHz */
++ chan_offset = 6;
++ break;
++ case 134: /* 160MHz */
++ chan_offset = 14;
++ break;
++ default:
++ chan_offset = 0;
++ break;
++ }
++
++ for (chan = oper_class->min_chan; chan <= oper_class->max_chan;
++ chan += oper_class->inc) {
++ str_obj = json_object_new_int(chan + chan_offset);
++ if (!str_obj) {
++ json_object_put(chan_list_obj);
++ return NULL;
++ }
++ json_object_array_add(chan_list_obj, str_obj);
++ }
++
++ return chan_list_obj;
++}
++
++
++static struct json_object *
++hostapd_afc_build_req_chan_list(struct hostapd_iface *iface)
++{
++ struct json_object *op_class_list_obj, *str_obj;
++ struct hostapd_config *iconf = iface->conf;
++ int i;
++
++ op_class_list_obj = json_object_new_array();
++ if (!op_class_list_obj)
++ return NULL;
++
++ for (i = 0; i < iconf->afc.n_op_class; i++) {
++ struct json_object *op_class_obj, *chan_list_obj;
++ u8 op_class = iconf->afc.op_class[i];
++
++ if (!is_6ghz_op_class(op_class))
++ continue;
++
++ op_class_obj = json_object_new_object();
++ if (!op_class_obj)
++ goto error;
++
++ json_object_array_add(op_class_list_obj, op_class_obj);
++ str_obj = json_object_new_int(op_class);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(op_class_obj, "globalOperatingClass",
++ str_obj);
++
++ chan_list_obj = hostapd_afc_get_opclass_chan_list(op_class);
++ if (!chan_list_obj)
++ goto error;
++
++ json_object_object_add(op_class_obj, "channelCfi",
++ chan_list_obj);
++ }
++
++ return op_class_list_obj;
++
++error:
++ json_object_put(op_class_list_obj);
++ return NULL;
++}
++
++
++static struct json_object *
++hostapd_afc_build_request(struct hostapd_iface *iface)
++{
++ struct json_object *l1_obj, *l2_obj, *la1_obj, *la2_obj;
++ struct json_object *s2_obj, *str_obj, *location_obj;
++ struct hostapd_config *iconf = iface->conf;
++ struct json_object *op_class_list_obj;
++ int i;
++
++ l1_obj = json_object_new_object();
++ if (!l1_obj)
++ return NULL;
++
++ if (iconf->afc.request.version) {
++ str_obj = json_object_new_string(iconf->afc.request.version);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(l1_obj, "version", str_obj);
++ }
++
++ la1_obj = json_object_new_array();
++ if (!la1_obj)
++ goto error;
++
++ json_object_object_add(l1_obj, "availableSpectrumInquiryRequests",
++ la1_obj);
++ l2_obj = json_object_new_object();
++ if (!l2_obj)
++ goto error;
++
++ json_object_array_add(la1_obj, l2_obj);
++ if (iconf->afc.request.id) {
++ str_obj = json_object_new_string(iconf->afc.request.id);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(l2_obj, "requestId", str_obj);
++ }
++
++ s2_obj = json_object_new_object();
++ if (!s2_obj)
++ goto error;
++
++ json_object_object_add(l2_obj, "deviceDescriptor", s2_obj);
++ if (iconf->afc.request.sn) {
++ str_obj = json_object_new_string(iconf->afc.request.sn);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(s2_obj, "serialNumber", str_obj);
++ }
++
++ la2_obj = json_object_new_array();
++ if (!la2_obj)
++ goto error;
++
++ json_object_object_add(s2_obj, "certificationId", la2_obj);
++ for (i = 0; i < iconf->afc.n_cert_ids; i++) {
++ struct json_object *obj;
++
++ obj = json_object_new_object();
++ if (!obj)
++ goto error;
++
++ json_object_array_add(la2_obj, obj);
++ str_obj =
++ json_object_new_string(iconf->afc.cert_ids[i].rulset);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(obj, "rulesetId", str_obj);
++ str_obj = json_object_new_string(iconf->afc.cert_ids[i].id);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(obj, "id", str_obj);
++ }
++
++ location_obj = hostapd_afc_build_location_request(iface);
++ if (!location_obj)
++ goto error;
++
++ json_object_object_add(l2_obj, "location", location_obj);
++ str_obj = json_object_new_int(iconf->afc.min_power);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(l2_obj, "minDesiredPower", str_obj);
++
++ if (iconf->afc.n_freq_range) {
++ struct json_object *freq_obj;
++
++ freq_obj = json_object_new_array();
++ if (!freq_obj)
++ goto error;
++
++ json_object_object_add(l2_obj, "inquiredFrequencyRange",
++ freq_obj);
++ for (i = 0; i < iconf->afc.n_freq_range; i++) {
++ struct afc_freq_range *fr = &iconf->afc.freq_range[i];
++ struct json_object *obj;
++
++ obj = json_object_new_object();
++ if (!obj)
++ goto error;
++
++ json_object_array_add(freq_obj, obj);
++ str_obj = json_object_new_int(fr->low_freq);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(obj, "lowFrequency", str_obj);
++ str_obj = json_object_new_int(fr->high_freq);
++ if (!str_obj)
++ goto error;
++
++ json_object_object_add(obj, "highFrequency", str_obj);
++ }
++ }
++
++ op_class_list_obj = hostapd_afc_build_req_chan_list(iface);
++ if (!op_class_list_obj)
++ goto error;
++
++ json_object_object_add(l2_obj, "inquiredChannels", op_class_list_obj);
++
++ wpa_printf(MSG_DEBUG, "Pending AFC request: %s",
++ json_object_get_string(l1_obj));
++
++ return l1_obj;
++
++error:
++ json_object_put(l1_obj);
++
++ return NULL;
++}
++
++
++static int
++hostad_afc_parse_available_freq_info(struct hostapd_iface *iface,
++ struct json_object *reply_elem_obj)
++{
++ struct afc_freq_range_elem *f = NULL;
++ struct json_object *obj;
++ int i, count = 0;
++
++ if (!json_object_object_get_ex(reply_elem_obj,
++ "availableFrequencyInfo", &obj))
++ return 0;
++
++ for (i = 0; i < json_object_array_length(obj); i++) {
++ struct json_object *range_elem_obj, *freq_range_obj;
++ struct json_object *high_freq_obj, *low_freq_obj;
++ struct json_object *max_psd_obj;
++
++ range_elem_obj = json_object_array_get_idx(obj, i);
++ if (!json_object_object_get_ex(range_elem_obj,
++ "frequencyRange",
++ &freq_range_obj))
++ continue;
++
++ if (!json_object_object_get_ex(freq_range_obj,
++ "lowFrequency",
++ &low_freq_obj))
++ continue;
++
++ if (!json_object_object_get_ex(freq_range_obj,
++ "highFrequency",
++ &high_freq_obj))
++ continue;
++
++ if (!json_object_object_get_ex(range_elem_obj, "maxPsd",
++ &max_psd_obj) &&
++ !json_object_object_get_ex(range_elem_obj, "maxPSD",
++ &max_psd_obj))
++ continue;
++
++ f = os_realloc_array(f, count + 1, sizeof(*f));
++ if (!f)
++ return -ENOMEM;
++
++ f[count].low_freq = json_object_get_int(low_freq_obj);
++ f[count].high_freq = json_object_get_int(high_freq_obj);
++ f[count++].max_psd = json_object_get_int(max_psd_obj);
++ }
++ iface->afc.freq_range = f;
++ iface->afc.num_freq_range = count;
++
++ return 0;
++}
++
++
++static int hostad_afc_update_chan_info(struct afc_chan_info_elem **chan_list,
++ int *chan_list_size, u8 op_class,
++ int center_chan, int power)
++{
++ int num_low_subchan, ch, count = *chan_list_size;
++ struct afc_chan_info_elem *c = *chan_list;
++
++ switch (op_class) {
++ case 132: /* 40MHz */
++ num_low_subchan = 2;
++ break;
++ case 133: /* 80MHz */
++ num_low_subchan = 6;
++ break;
++ case 134: /* 160MHz */
++ num_low_subchan = 14;
++ break;
++ default:
++ num_low_subchan = 0;
++ break;
++ }
++
++ for (ch = center_chan - num_low_subchan;
++ ch <= center_chan + num_low_subchan; ch += 4) {
++ int i;
++
++ for (i = 0; i < count; i++) {
++ if (c[i].chan == ch)
++ break;
++ }
++
++ if (i == count) {
++ c = os_realloc_array(c, count + 1, sizeof(*c));
++ if (!c)
++ return -ENOMEM;
++
++ c[count].chan = ch;
++ c[count++].power = power;
++ }
++ }
++
++ *chan_list_size = count;
++ *chan_list = c;
++
++ return 0;
++}
++
++
++static int
++hostad_afc_parse_available_chan_info(struct hostapd_iface *iface,
++ struct json_object *reply_elem_obj)
++{
++ struct afc_chan_info_elem *c = NULL;
++ struct json_object *obj;
++ int i, count = 0;
++
++ if (!json_object_object_get_ex(reply_elem_obj,
++ "availableChannelInfo", &obj))
++ return 0;
++
++ for (i = 0; i < json_object_array_length(obj); i++) {
++ struct json_object *range_elem_obj, *op_class_obj;
++ struct json_object *chan_cfi_obj, *max_eirp_obj;
++ int ch, op_class;
++
++ range_elem_obj = json_object_array_get_idx(obj, i);
++ if (!json_object_object_get_ex(range_elem_obj,
++ "globalOperatingClass",
++ &op_class_obj))
++ continue;
++
++ if (!json_object_object_get_ex(range_elem_obj, "maxEirp",
++ &max_eirp_obj))
++ continue;
++
++ if (!json_object_object_get_ex(range_elem_obj, "channelCfi",
++ &chan_cfi_obj))
++ continue;
++
++ op_class = json_object_get_int(op_class_obj);
++ for (ch = 0;
++ ch < json_object_array_length(chan_cfi_obj); ch++) {
++ struct json_object *pwr_obj;
++ struct json_object *ch_obj;
++ int channel, power;
++
++ ch_obj = json_object_array_get_idx(chan_cfi_obj, ch);
++ if (!ch_obj)
++ continue;
++
++ pwr_obj = json_object_array_get_idx(max_eirp_obj, ch);
++ if (!pwr_obj)
++ continue;
++
++ channel = json_object_get_int(ch_obj);
++ power = json_object_get_int(pwr_obj);
++
++ hostad_afc_update_chan_info(&c, &count, op_class,
++ channel, power);
++ }
++ iface->afc.chan_info_list = c;
++ iface->afc.num_chan_info = count;
++ }
++
++ return 0;
++}
++
++
++static int hostad_afc_get_timeout(struct json_object *obj)
++{
++ time_t t, now;
++ struct tm tm;
++
++ if (sscanf(json_object_get_string(obj), "%d-%d-%dT%d:%d:%dZ",
++ &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour,
++ &tm.tm_min, &tm.tm_sec) <= 0)
++ return HOSTAPD_AFC_TIMEOUT;
++
++ tm.tm_year -= 1900;
++ tm.tm_mon -= 1;
++ tm.tm_isdst = -1;
++ t = mktime(&tm);
++ time(&now);
++
++ return now > t ? HOSTAPD_AFC_RETRY_TIMEOUT : (t - now) * 80 / 100;
++}
++
++
++static int hostapd_afc_parse_reply(struct hostapd_iface *iface, char *reply)
++{
++ struct json_object *payload_obj, *reply_obj, *version_obj;
++ struct hostapd_config *iconf = iface->conf;
++ int i, request_timeout = -1, ret = -EINVAL;
++
++ wpa_printf(MSG_DEBUG, "Received AFC reply: %s", reply);
++ payload_obj = json_tokener_parse(reply);
++ if (!payload_obj)
++ return -EINVAL;
++
++ if (!json_object_object_get_ex(payload_obj, "version", &version_obj))
++ return -EINVAL;
++
++ if (iconf->afc.request.version &&
++ os_strcmp(iconf->afc.request.version,
++ json_object_get_string(version_obj)))
++ return -EINVAL;
++
++ if (!json_object_object_get_ex(payload_obj,
++ "availableSpectrumInquiryResponses",
++ &reply_obj))
++ return -EINVAL;
++
++ for (i = 0; i < json_object_array_length(reply_obj); i++) {
++ struct json_object *reply_elem_obj, *obj, *status_obj;
++ int j, status = -EINVAL;
++
++ reply_elem_obj = json_object_array_get_idx(reply_obj, i);
++ if (!reply_elem_obj)
++ continue;
++
++ if (!json_object_object_get_ex(reply_elem_obj, "requestId",
++ &obj))
++ continue;
++
++ if (iconf->afc.request.id &&
++ os_strcmp(iconf->afc.request.id,
++ json_object_get_string(obj)))
++ continue;
++
++ if (!json_object_object_get_ex(reply_elem_obj, "rulesetId",
++ &obj))
++ continue;
++
++ for (j = 0; j < iconf->afc.n_cert_ids; j++) {
++ if (!os_strcmp(iconf->afc.cert_ids[j].rulset,
++ json_object_get_string(obj)))
++ break;
++ }
++
++ if (j == iconf->afc.n_cert_ids)
++ continue;
++
++ if (!json_object_object_get_ex(reply_elem_obj, "response",
++ &obj))
++ continue;
++
++ if (json_object_object_get_ex(obj, "shortDescription",
++ &status_obj))
++ wpa_printf(MSG_DEBUG, "AFC reply element %d: %s",
++ i, json_object_get_string(status_obj));
++
++ if (json_object_object_get_ex(obj, "responseCode",
++ &status_obj))
++ status = json_object_get_int(status_obj);
++
++ if (status < 0)
++ continue;
++
++ if (hostad_afc_parse_available_freq_info(iface,
++ reply_elem_obj) ||
++ hostad_afc_parse_available_chan_info(iface,
++ reply_elem_obj))
++ continue;
++
++ if (json_object_object_get_ex(reply_elem_obj,
++ "availabilityExpireTime",
++ &obj)) {
++ int timeout = hostad_afc_get_timeout(obj);
++
++ if (request_timeout < 0 || timeout < request_timeout)
++ request_timeout = timeout;
++ }
++
++ ret = status;
++ }
++
++ iface->afc.data_valid = true;
++ iface->afc.timeout = request_timeout;
++ if (iface->afc.timeout < 0)
++ iface->afc.timeout = HOSTAPD_AFC_RETRY_TIMEOUT;
++
++ return ret;
++}
++
++
++static int hostapd_afc_send_receive(struct hostapd_iface *iface)
++{
++ struct hostapd_config *iconf = iface->conf;
++ json_object *request_obj = NULL;
++ struct timeval sock_timeout = {
++ .tv_sec = 5,
++ };
++ struct sockaddr_un addr = {
++ .sun_family = AF_UNIX,
++#ifdef __FreeBSD__
++ .sun_len = sizeof(addr),
++#endif /* __FreeBSD__ */
++ };
++ char buf[HOSTAPD_AFC_BUFSIZE] = {};
++ const char *request;
++ int sockfd, ret;
++ fd_set read_set;
++
++ if (iface->afc.data_valid) {
++ /* AFC data already downloaded from the server */
++ return 0;
++ }
++
++ iface->afc.timeout = HOSTAPD_AFC_RETRY_TIMEOUT;
++ if (os_strlen(iconf->afc.socket) >= sizeof(addr.sun_path)) {
++ wpa_printf(MSG_ERROR, "Malformed AFC socket string %s",
++ iconf->afc.socket);
++ return -EINVAL;
++ }
++
++ os_strlcpy(addr.sun_path, iconf->afc.socket, sizeof(addr.sun_path));
++ sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
++ if (sockfd < 0) {
++ wpa_printf(MSG_ERROR, "Failed creating AFC socket");
++ return sockfd;
++ }
++
++ if (connect(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
++ wpa_printf(MSG_ERROR, "Failed connecting AFC socket");
++ ret = -EIO;
++ goto close_sock;
++ }
++
++ request_obj = hostapd_afc_build_request(iface);
++ if (!request_obj) {
++ ret = -ENOMEM;
++ goto close_sock;
++ }
++
++ request = json_object_to_json_string(request_obj);
++ if (send(sockfd, request, strlen(request), 0) < 0) {
++ wpa_printf(MSG_ERROR, "Failed sending AFC request");
++ ret = -EIO;
++ goto close_sock;
++ }
++
++ FD_ZERO(&read_set);
++ FD_SET(sockfd, &read_set);
++ if (select(sockfd + 1, &read_set, NULL, NULL, &sock_timeout) < 0) {
++ wpa_printf(MSG_ERROR, "Select failed on AFC socket");
++ ret = -errno;
++ goto close_sock;
++ }
++
++ if (!FD_ISSET(sockfd, &read_set)) {
++ ret = -EIO;
++ goto close_sock;
++ }
++
++ ret = recv(sockfd, buf, sizeof(buf), 0);
++ if (ret <= 0)
++ goto close_sock;
++
++ ret = hostapd_afc_parse_reply(iface, buf);
++close_sock:
++ json_object_put(request_obj);
++ close(sockfd);
++
++ return ret;
++}
++
++
++static bool hostapd_afc_has_usable_chans(struct hostapd_iface *iface)
++{
++ const struct oper_class_map *oper_class;
++ int ch;
++
++ oper_class = get_oper_class(NULL, iface->conf->op_class);
++ if (!oper_class)
++ return false;
++
++ for (ch = oper_class->min_chan; ch <= oper_class->max_chan;
++ ch += oper_class->inc) {
++ struct hostapd_hw_modes *mode = iface->current_mode;
++ int i;
++
++ for (i = 0; i < mode->num_channels; i++) {
++ struct hostapd_channel_data *chan = &mode->channels[i];
++
++ if (chan->chan == ch &&
++ !(chan->flag & HOSTAPD_CHAN_DISABLED))
++ return true;
++ }
++ }
++
++ return false;
++}
++
++
++int hostapd_afc_handle_request(struct hostapd_iface *iface)
++{
++ struct hostapd_config *iconf = iface->conf;
++ int ret;
++
++ /* AFC is required just for standard power AP */
++ if (!he_reg_is_sp(iconf->he_6ghz_reg_pwr_type))
++ return 1;
++
++ if (!is_6ghz_op_class(iconf->op_class) || !is_6ghz_freq(iface->freq))
++ return 1;
++
++ if (iface->state == HAPD_IFACE_ACS)
++ return 1;
++
++ ret = hostapd_afc_send_receive(iface);
++ if (ret < 0) {
++ /*
++ * If the connection to the AFCD failed, resched for a
++ * future attempt.
++ */
++ wpa_printf(MSG_ERROR, "AFC connection failed: %d", ret);
++ if (ret == -EIO)
++ ret = 0;
++ goto resched;
++ }
++
++ hostap_afc_disable_channels(iface);
++ if (!hostapd_afc_has_usable_chans(iface))
++ goto resched;
++
++ /* Trigger an ACS freq scan */
++ iconf->channel = 0;
++ iface->freq = 0;
++
++ if (acs_init(iface) != HOSTAPD_CHAN_ACS) {
++ wpa_printf(MSG_ERROR, "Could not start ACS");
++ ret = -EINVAL;
++ }
++
++resched:
++ eloop_cancel_timeout(hostapd_afc_timeout_handler, iface, NULL);
++ eloop_register_timeout(iface->afc.timeout, 0,
++ hostapd_afc_timeout_handler, iface, NULL);
++
++ return ret;
++}
++
++
++static void hostapd_afc_delete_data_from_server(struct hostapd_iface *iface)
++{
++ os_free(iface->afc.chan_info_list);
++ os_free(iface->afc.freq_range);
++
++ iface->afc.num_freq_range = 0;
++ iface->afc.num_chan_info = 0;
++
++ iface->afc.chan_info_list = NULL;
++ iface->afc.freq_range = NULL;
++
++ iface->afc.data_valid = false;
++}
++
++
++static void hostapd_afc_timeout_handler(void *eloop_ctx, void *timeout_ctx)
++{
++ struct hostapd_iface *iface = eloop_ctx;
++ bool restart_iface = true;
++
++ hostapd_afc_delete_data_from_server(iface);
++ if (iface->state != HAPD_IFACE_ENABLED) {
++ /* Hostapd is not fully enabled yet, toogle the interface */
++ goto restart_interface;
++ }
++
++ if (hostapd_afc_send_receive(iface) < 0 ||
++ hostapd_get_hw_features(iface)) {
++ restart_iface = false;
++ goto restart_interface;
++ }
++
++ if (hostapd_is_usable_chans(iface))
++ goto resched;
++
++ restart_iface = hostapd_afc_has_usable_chans(iface);
++ if (restart_iface) {
++ /* Trigger an ACS freq scan */
++ iface->conf->channel = 0;
++ iface->freq = 0;
++ }
++
++restart_interface:
++ hostapd_disable_iface(iface);
++ if (restart_iface)
++ hostapd_enable_iface(iface);
++resched:
++ eloop_register_timeout(iface->afc.timeout, 0,
++ hostapd_afc_timeout_handler, iface, NULL);
++}
+diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
+index 1a18df617..ca67aeb41 100644
+--- a/src/ap/ap_config.c
++++ b/src/ap/ap_config.c
+@@ -1035,6 +1035,22 @@ void hostapd_config_free(struct hostapd_config *conf)
+ #endif /* CONFIG_ACS */
+ wpabuf_free(conf->lci);
+ wpabuf_free(conf->civic);
++#ifdef CONFIG_AFC
++ os_free(conf->afc.socket);
++ os_free(conf->afc.request.version);
++ os_free(conf->afc.request.id);
++ os_free(conf->afc.request.sn);
++ for (i = 0; i < conf->afc.n_cert_ids; i++) {
++ os_free(conf->afc.cert_ids[i].rulset);
++ os_free(conf->afc.cert_ids[i].id);
++ }
++ os_free(conf->afc.cert_ids);
++ os_free(conf->afc.location.height_type);
++ os_free(conf->afc.location.linear_polygon_data);
++ os_free(conf->afc.location.radial_polygon_data);
++ os_free(conf->afc.freq_range);
++ os_free(conf->afc.op_class);
++#endif /* CONFIG_AFC */
+
+ os_free(conf);
+ }
+diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
+index 754d55331..2330163c4 100644
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -1225,6 +1225,53 @@ struct hostapd_config {
+ MBSSID_ENABLED = 1,
+ ENHANCED_MBSSID_ENABLED = 2,
+ } mbssid;
++
++#ifdef CONFIG_AFC
++ struct {
++ char *socket;
++ struct {
++ char *version;
++ char *id;
++ char *sn;
++ } request;
++ unsigned int n_cert_ids;
++ struct cert_id {
++ char *rulset;
++ char *id;
++ } *cert_ids;
++ struct {
++ enum afc_location_type {
++ ELLIPSE,
++ LINEAR_POLYGON,
++ RADIAL_POLYGON,
++ } type;
++ unsigned int n_linear_polygon_data;
++ struct afc_linear_polygon {
++ double longitude;
++ double latitude;
++ } *linear_polygon_data;
++ unsigned int n_radial_polygon_data;
++ struct afc_radial_polygon {
++ double length;
++ double angle;
++ } *radial_polygon_data;
++ int major_axis;
++ int minor_axis;
++ int orientation;
++ double height;
++ char *height_type;
++ int vertical_tolerance;
++ } location;
++ unsigned int n_freq_range;
++ struct afc_freq_range {
++ int low_freq;
++ int high_freq;
++ } *freq_range;
++ unsigned int n_op_class;
++ unsigned int *op_class;
++ int min_power;
++ } afc;
++#endif /* CONFIG_AFC */
+ };
+
+
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index 577e6eaad..ea884ff19 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -2417,6 +2417,16 @@ static int hostapd_setup_interface_complete_sync(struct hostapd_iface *iface,
+ }
+ #endif /* CONFIG_MESH */
+
++#ifdef CONFIG_AFC
++ /* check AFC for 6GHz channels. */
++ res = hostapd_afc_handle_request(iface);
++ if (res <= 0) {
++ if (res < 0)
++ goto fail;
++ return res;
++ }
++#endif /* CONFIG_AFC */
++
+ if (!delay_apply_cfg &&
+ hostapd_set_freq(hapd, hapd->iconf->hw_mode, iface->freq,
+ hapd->iconf->channel,
+@@ -2848,6 +2858,10 @@ void hostapd_interface_free(struct hostapd_iface *iface)
+ __func__, iface->bss[j]);
+ os_free(iface->bss[j]);
+ }
++#ifdef CONFIG_AFC
++ os_free(iface->afc.chan_info_list);
++ os_free(iface->afc.freq_range);
++#endif
+ hostapd_cleanup_iface(iface);
+ }
+
+@@ -4442,3 +4456,49 @@ u16 hostapd_get_punct_bitmap(struct hostapd_data *hapd)
+
+ return punct_bitmap;
+ }
++
++
++void hostap_afc_disable_channels(struct hostapd_iface *iface)
++{
++#ifdef CONFIG_AFC
++ struct hostapd_hw_modes *mode;
++ int i;
++
++ if (iface->num_hw_features < HOSTAPD_MODE_IEEE80211A)
++ return;
++
++ if (!he_reg_is_sp(iface->conf->he_6ghz_reg_pwr_type))
++ return;
++
++ if (!iface->afc.data_valid)
++ return;
++
++ mode = &iface->hw_features[HOSTAPD_MODE_IEEE80211A];
++ for (i = 0; i < mode->num_channels; i++) {
++ struct hostapd_channel_data *chan = &mode->channels[i];
++ int j;
++
++ if (!is_6ghz_freq(chan->freq))
++ continue;
++
++ for (j = 0; j < iface->afc.num_freq_range; j++) {
++ if (chan->freq >= iface->afc.freq_range[j].low_freq &&
++ chan->freq <= iface->afc.freq_range[j].high_freq)
++ break;
++ }
++
++ if (j != iface->afc.num_freq_range)
++ continue;
++
++ for (j = 0; j < iface->afc.num_chan_info; j++) {
++ if (chan->chan == iface->afc.chan_info_list[j].chan)
++ break;
++ }
++
++ if (j != iface->afc.num_chan_info)
++ continue;
++
++ chan->flag |= HOSTAPD_CHAN_DISABLED;
++ }
++#endif /* CONFIG_AFC */
++}
+diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
+index 9be762c24..d929ef2c4 100644
+--- a/src/ap/hostapd.h
++++ b/src/ap/hostapd.h
+@@ -675,9 +675,38 @@ struct hostapd_iface {
+
+ /* Configured freq of interface is NO_IR */
+ bool is_no_ir;
++
++#ifdef CONFIG_AFC
++ struct {
++ int timeout;
++ unsigned int num_freq_range;
++ struct afc_freq_range_elem {
++ int low_freq;
++ int high_freq;
++ /**
++ * max eirp power spectral density received from
++ * the AFC coordinator for this band
++ */
++ int max_psd;
++ } *freq_range;
++ unsigned int num_chan_info;
++ struct afc_chan_info_elem {
++ int chan;
++ /**
++ * max eirp power received from the AFC coordinator
++ * for this channel
++ */
++ int power;
++ } *chan_info_list;
++ bool data_valid;
++ } afc;
++#endif /* CONFIG_AFC */
+ };
+
+ /* hostapd.c */
++void hostap_afc_disable_channels(struct hostapd_iface *iface);
++int hostapd_afc_handle_request(struct hostapd_iface *iface);
++
+ int hostapd_for_each_interface(struct hapd_interfaces *interfaces,
+ int (*cb)(struct hostapd_iface *iface,
+ void *ctx), void *ctx);
+diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
+index e652d7504..222f3dc05 100644
+--- a/src/ap/hw_features.c
++++ b/src/ap/hw_features.c
+@@ -114,6 +114,8 @@ int hostapd_get_hw_features(struct hostapd_iface *iface)
+ iface->hw_features = modes;
+ iface->num_hw_features = num_modes;
+
++ hostap_afc_disable_channels(iface);
++
+ for (i = 0; i < num_modes; i++) {
+ struct hostapd_hw_modes *feature = &modes[i];
+ int dfs_enabled = hapd->iconf->ieee80211h &&
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0004-backport-hostapd-update-TPE-IE-according-to-AFC.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0004-backport-hostapd-update-TPE-IE-according-to-AFC.patch
new file mode 100644
index 0000000..9d62526
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0004-backport-hostapd-update-TPE-IE-according-to-AFC.patch
@@ -0,0 +1,158 @@
+From aee0d2831292c0520bcd08c67d85aea5e32794ab Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Wed, 20 Mar 2024 07:20:01 +0800
+Subject: [PATCH 04/69] backport: hostapd: update TPE IE according to AFC
+
+Update Transmit Power Envelope (TPE) IE according to the reply from AFC
+coordinator on UNII-5 or UNII-7 6GHz bands.
+
+Tested-by: Allen Ye <allen.ye@mediatek.com>
+Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
+---
+ src/ap/hostapd.c | 39 +++++++++++++++++++++++++++++++++++++
+ src/ap/hostapd.h | 2 ++
+ src/ap/ieee802_11.c | 47 ++++++++++++++++++++++++++++-----------------
+ 3 files changed, 70 insertions(+), 18 deletions(-)
+
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index ea884ff19..69bb2b4a4 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -4458,6 +4458,45 @@ u16 hostapd_get_punct_bitmap(struct hostapd_data *hapd)
+ }
+
+
++int hostap_afc_get_chan_max_eirp_power(struct hostapd_iface *iface, bool psd,
++ int *power)
++{
++#ifdef CONFIG_AFC
++ int i;
++
++ if (!he_reg_is_sp(iface->conf->he_6ghz_reg_pwr_type))
++ return -EINVAL;
++
++ if (!iface->afc.data_valid)
++ return -EINVAL;
++
++ if (psd) {
++ for (i = 0; i < iface->afc.num_freq_range; i++) {
++ struct afc_freq_range_elem *f;
++
++ f = &iface->afc.freq_range[i];
++ if (iface->freq >= f->low_freq &&
++ iface->freq <= f->high_freq) {
++ *power = 2 * f->max_psd;
++ return 0;
++ }
++ }
++ } else {
++ for (i = 0; i < iface->afc.num_chan_info; i++) {
++ struct afc_chan_info_elem *c;
++
++ c = &iface->afc.chan_info_list[i];
++ if (c->chan == iface->conf->channel) {
++ *power = 2 * c->power;
++ return 0;
++ }
++ }
++ }
++#endif /* CONFIG_AFC */
++ return -EINVAL;
++}
++
++
+ void hostap_afc_disable_channels(struct hostapd_iface *iface)
+ {
+ #ifdef CONFIG_AFC
+diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
+index d929ef2c4..e60481361 100644
+--- a/src/ap/hostapd.h
++++ b/src/ap/hostapd.h
+@@ -704,6 +704,8 @@ struct hostapd_iface {
+ };
+
+ /* hostapd.c */
++int hostap_afc_get_chan_max_eirp_power(struct hostapd_iface *iface, bool psd,
++ int *power);
+ void hostap_afc_disable_channels(struct hostapd_iface *iface);
+ int hostapd_afc_handle_request(struct hostapd_iface *iface);
+
+diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+index 17f98f59d..9fe6b127b 100644
+--- a/src/ap/ieee802_11.c
++++ b/src/ap/ieee802_11.c
+@@ -7103,42 +7103,53 @@ u8 * hostapd_eid_txpower_envelope(struct hostapd_data *hapd, u8 *eid)
+ */
+ if (is_6ghz_op_class(iconf->op_class)) {
+ enum max_tx_pwr_interpretation tx_pwr_intrpn;
++ int err, max_eirp_psd, max_eirp_power;
+
+ /* Same Maximum Transmit Power for all 20 MHz bands */
+ tx_pwr_count = 0;
+ tx_pwr_intrpn = REGULATORY_CLIENT_EIRP_PSD;
+
+ /* Default Transmit Power Envelope for Global Operating Class */
+- if (hapd->iconf->reg_def_cli_eirp_psd != -1)
+- tx_pwr = hapd->iconf->reg_def_cli_eirp_psd;
+- else
+- tx_pwr = REG_PSD_MAX_TXPOWER_FOR_DEFAULT_CLIENT * 2;
++ err = hostap_afc_get_chan_max_eirp_power(iface, true,
++ &max_eirp_psd);
++ if (err < 0) {
++ if (hapd->iconf->reg_def_cli_eirp_psd != -1)
++ max_eirp_psd = hapd->iconf->reg_def_cli_eirp_psd;
++ else
++ max_eirp_psd = REG_PSD_MAX_TXPOWER_FOR_DEFAULT_CLIENT * 2;
++ }
+
+ eid = hostapd_add_tpe_info(eid, tx_pwr_count, tx_pwr_intrpn,
+- REG_DEFAULT_CLIENT, tx_pwr);
++ REG_DEFAULT_CLIENT, max_eirp_psd);
+
+ /* Indoor Access Point must include an additional TPE for
+ * subordinate devices */
+ if (he_reg_is_indoor(iconf->he_6ghz_reg_pwr_type)) {
+- /* TODO: Extract PSD limits from channel data */
+- if (hapd->iconf->reg_sub_cli_eirp_psd != -1)
+- tx_pwr = hapd->iconf->reg_sub_cli_eirp_psd;
+- else
+- tx_pwr = REG_PSD_MAX_TXPOWER_FOR_SUBORDINATE_CLIENT * 2;
++ if (err < 0) {
++ /* non-AFC connection */
++ if (hapd->iconf->reg_sub_cli_eirp_psd != -1)
++ max_eirp_psd = hapd->iconf->reg_sub_cli_eirp_psd;
++ else
++ max_eirp_psd = REG_PSD_MAX_TXPOWER_FOR_SUBORDINATE_CLIENT * 2;
++ }
+ eid = hostapd_add_tpe_info(eid, tx_pwr_count,
+ tx_pwr_intrpn,
+ REG_SUBORDINATE_CLIENT,
+- tx_pwr);
++ max_eirp_psd);
+ }
+
+- if (iconf->reg_def_cli_eirp != -1 &&
+- he_reg_is_sp(iconf->he_6ghz_reg_pwr_type))
+- eid = hostapd_add_tpe_info(
+- eid, tx_pwr_count, REGULATORY_CLIENT_EIRP,
+- REG_DEFAULT_CLIENT,
+- hapd->iconf->reg_def_cli_eirp);
++ if (hostap_afc_get_chan_max_eirp_power(iface, false,
++ &max_eirp_power)) {
++ max_eirp_power = iconf->reg_def_cli_eirp;
++ if (max_eirp_power == -1 ||
++ !he_reg_is_sp(iconf->he_6ghz_reg_pwr_type))
++ return eid;
++ }
+
+- return eid;
++ return hostapd_add_tpe_info(eid, tx_pwr_count,
++ REGULATORY_CLIENT_EIRP,
++ REG_DEFAULT_CLIENT,
++ max_eirp_power);
+ }
+ #endif /* CONFIG_IEEE80211AX */
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0005-backport-hostapd-MLO-avoid-usage-of-mld_id-as-user-c.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0005-backport-hostapd-MLO-avoid-usage-of-mld_id-as-user-c.patch
new file mode 100644
index 0000000..2986066
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0005-backport-hostapd-MLO-avoid-usage-of-mld_id-as-user-c.patch
@@ -0,0 +1,398 @@
+From 77481b5b773f02e2a9cf11b42de22d5fef0fa017 Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Wed, 20 Mar 2024 13:24:06 +0800
+Subject: [PATCH 05/69] backport: hostapd: MLO: avoid usage of mld_id as user
+ configuration
+
+From: Sriram R <quic_srirrama@quicinc.com>
+
+Currently mld_id is provided as a user configuration to
+identify partner bss belonging to the same MLD. The same
+id is used at protocol level also to indicate the MLD ID
+of the MLD.
+
+But, in general mld_id is a relative reference of the MLD
+where 0 is used as the mld_id to represent the self MLD and
+in case of MLO MBSSID mld_id of a non transmitted BSS affiliated
+to a MLD is based on the relative bss index of the non transmitted
+BSS from the transmitted BSS. Hence mld_id need not be fetched
+from users, rather it can be identified wherever required.
+
+To verify if the partners are belonging to the same MLD the
+interface name can be checked, since all link BSS partners
+of the same MLD belongs to the same interface.
+
+Hence, remove usage of mld_id user config and instead introduce two
+functions hostapd_is_ml_partner() and hostapd_get_mld_id(). The
+former is used to verfiy if partneres belong to same MLD or not and
+the later is used the get the MLD ID of the bss.
+
+Signed-off-by: Sriram R <quic_srirrama@quicinc.com>
+Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
+---
+ hostapd/config_file.c | 2 --
+ hostapd/ctrl_iface.c | 6 +++---
+ hostapd/hostapd.conf | 3 ---
+ hostapd/main.c | 10 ++++++++--
+ src/ap/beacon.c | 5 ++---
+ src/ap/ctrl_iface_ap.c | 2 +-
+ src/ap/drv_callbacks.c | 2 +-
+ src/ap/hostapd.c | 24 +++++++++++++++++++++---
+ src/ap/hostapd.h | 6 +++++-
+ src/ap/ieee802_11.c | 16 +++++++---------
+ src/ap/ieee802_11_eht.c | 6 +++---
+ src/ap/ieee802_1x.c | 2 +-
+ src/ap/sta_info.c | 4 ++--
+ src/ap/wpa_auth_glue.c | 4 ++--
+ 14 files changed, 56 insertions(+), 36 deletions(-)
+
+diff --git a/hostapd/config_file.c b/hostapd/config_file.c
+index b83df99ac..261905368 100644
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -5306,8 +5306,6 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ conf->punct_acs_threshold = val;
+ } else if (os_strcmp(buf, "mld_ap") == 0) {
+ bss->mld_ap = !!atoi(pos);
+- } else if (os_strcmp(buf, "mld_id") == 0) {
+- bss->mld_id = atoi(pos);
+ } else if (os_strcmp(buf, "mld_addr") == 0) {
+ if (hwaddr_aton(pos, bss->mld_addr)) {
+ wpa_printf(MSG_ERROR, "Line %d: Invalid mld_addr",
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index 8a12fee88..6f2b31eaf 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -3479,7 +3479,7 @@ static int hostapd_ctrl_iface_enable_mld(struct hostapd_iface *iface)
+ struct hostapd_bss_config *h_conf = h_hapd->conf;
+
+ if (!h_conf->mld_ap ||
+- h_conf->mld_id != iface->bss[0]->conf->mld_id)
++ !hostapd_is_ml_partner(h_hapd, iface->bss[0]))
+ continue;
+
+ if (hostapd_enable_iface(h_iface)) {
+@@ -3520,7 +3520,7 @@ static int hostapd_ctrl_iface_disable_mld(struct hostapd_iface *iface)
+ struct hostapd_bss_config *h_conf = h_hapd->conf;
+
+ if (!h_conf->mld_ap ||
+- h_conf->mld_id != iface->bss[0]->conf->mld_id)
++ !hostapd_is_ml_partner(h_hapd, iface->bss[0]))
+ continue;
+
+ if (!h_hapd->mld_first_bss) {
+@@ -3541,7 +3541,7 @@ static int hostapd_ctrl_iface_disable_mld(struct hostapd_iface *iface)
+ struct hostapd_bss_config *h_conf = h_hapd->conf;
+
+ if (!h_conf->mld_ap ||
+- h_conf->mld_id != iface->bss[0]->conf->mld_id ||
++ !hostapd_is_ml_partner(h_hapd, iface->bss[0]) ||
+ !h_hapd->mld_first_bss)
+ continue;
+
+diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
+index 377139947..0d10998af 100644
+--- a/hostapd/hostapd.conf
++++ b/hostapd/hostapd.conf
+@@ -1113,9 +1113,6 @@ wmm_ac_vo_acm=0
+ # 1 = yes (MLO)
+ #mld_ap=0
+
+-# MLD ID - Affiliated MLD ID
+-#mld_id=1
+-
+ # AP MLD MAC address
+ # The configured address will be set as the interface hardware address and used
+ # as the AP MLD MAC address. If not set, the current interface hardware address
+diff --git a/hostapd/main.c b/hostapd/main.c
+index c95cf8a71..a7610b8a5 100644
+--- a/hostapd/main.c
++++ b/hostapd/main.c
+@@ -175,9 +175,15 @@ static int hostapd_driver_init(struct hostapd_iface *iface)
+ continue;
+ }
+
+- if (!hconf->mld_ap || hconf->mld_id != conf->mld_id) {
++ if (!hconf->mld_ap) {
+ wpa_printf(MSG_DEBUG,
+- "MLD: Skip non matching mld_id");
++ "MLD: Skip non MLD");
++ continue;
++ }
++
++ if (!hostapd_is_ml_partner(hapd, h_hapd)) {
++ wpa_printf(MSG_DEBUG,
++ "MLD: Skip non matching mld vif name");
+ continue;
+ }
+
+diff --git a/src/ap/beacon.c b/src/ap/beacon.c
+index e339c2002..32865f667 100644
+--- a/src/ap/beacon.c
++++ b/src/ap/beacon.c
+@@ -960,7 +960,7 @@ static void hostapd_fill_probe_resp_ml_params(struct hostapd_data *hapd,
+ * We want to include the AP MLD ID in the response if it was
+ * included in the request.
+ */
+- probed_mld_id = mld_id != -1 ? mld_id : hapd->conf->mld_id;
++ probed_mld_id = mld_id != -1 ? mld_id : hostapd_get_mld_id(hapd);
+
+ for_each_mld_link(link, i, j, hapd->iface->interfaces,
+ probed_mld_id) {
+@@ -2676,8 +2676,7 @@ int ieee802_11_set_beacon(struct hostapd_data *hapd)
+ continue;
+
+ #ifdef CONFIG_IEEE80211BE
+- if (hapd->conf->mld_ap && other->bss[0]->conf->mld_ap &&
+- hapd->conf->mld_id == other->bss[0]->conf->mld_id)
++ if (hostapd_is_ml_partner(hapd, other->bss[0]))
+ mld_ap = true;
+ #endif /* CONFIG_IEEE80211BE */
+
+diff --git a/src/ap/ctrl_iface_ap.c b/src/ap/ctrl_iface_ap.c
+index e65c3c4b2..cdd777287 100644
+--- a/src/ap/ctrl_iface_ap.c
++++ b/src/ap/ctrl_iface_ap.c
+@@ -1013,7 +1013,7 @@ int hostapd_ctrl_iface_status(struct hostapd_data *hapd, char *buf,
+ "mld_id[%d]=%d\n"
+ "mld_link_id[%d]=%d\n",
+ (int) i, MAC2STR(bss->mld_addr),
+- (int) i, bss->conf->mld_id,
++ (int) i, hostapd_get_mld_id(bss),
+ (int) i, bss->mld_link_id);
+ if (os_snprintf_error(buflen - len, ret))
+ return len;
+diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
+index 814901977..3b89c700d 100644
+--- a/src/ap/drv_callbacks.c
++++ b/src/ap/drv_callbacks.c
+@@ -1965,7 +1965,7 @@ static bool search_mld_sta(struct hostapd_data **p_hapd, const u8 *src)
+ struct hostapd_bss_config *hconf = h_hapd->conf;
+
+ if (!hconf->mld_ap ||
+- hconf->mld_id != hapd->conf->mld_id)
++ !hostapd_is_ml_partner(h_hapd, hapd))
+ continue;
+
+ h_hapd = hostapd_find_by_sta(h, src, false);
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index 69bb2b4a4..615e0d201 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -3234,8 +3234,7 @@ int hostapd_disable_iface(struct hostapd_iface *hapd_iface)
+ struct hostapd_bss_config *h_conf = h_hapd->conf;
+
+ if (!h_conf->mld_ap ||
+- h_conf->mld_id !=
+- hapd_iface->bss[0]->conf->mld_id ||
++ !hostapd_is_ml_partner(h_hapd, hapd_iface->bss[0]) ||
+ h_iface == hapd_iface)
+ continue;
+
+@@ -4430,7 +4429,7 @@ struct hostapd_data * hostapd_mld_get_link_bss(struct hostapd_data *hapd,
+ struct hostapd_data *h_hapd = h->bss[0];
+ struct hostapd_bss_config *hconf = h_hapd->conf;
+
+- if (!hconf->mld_ap || hconf->mld_id != hapd->conf->mld_id)
++ if (!hconf->mld_ap || !hostapd_is_ml_partner(hapd, h_hapd))
+ continue;
+
+ if (h_hapd->mld_link_id == link_id)
+@@ -4439,6 +4438,25 @@ struct hostapd_data * hostapd_mld_get_link_bss(struct hostapd_data *hapd,
+
+ return NULL;
+ }
++
++bool hostapd_is_ml_partner(struct hostapd_data *hapd1, struct hostapd_data *hapd2)
++{
++ if (!hapd1->conf->mld_ap || !hapd2->conf->mld_ap)
++ return false;
++
++ return !(os_strcmp(hapd1->conf->iface, hapd2->conf->iface));
++}
++
++u8 hostapd_get_mld_id(struct hostapd_data *hapd)
++{
++ if (!hapd->conf->mld_ap)
++ return 255;
++
++ /* MLD ID 0 represents self */
++ return 0;
++
++ /* TODO MLD ID for MBSS cases */
++}
+ #endif /* CONFIG_IEEE80211BE */
+
+
+diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
+index e60481361..a7035c35c 100644
+--- a/src/ap/hostapd.h
++++ b/src/ap/hostapd.h
+@@ -814,6 +814,10 @@ struct hostapd_data * hostapd_mld_get_link_bss(struct hostapd_data *hapd,
+ int hostapd_link_remove(struct hostapd_data *hapd, u32 count);
+
+ #ifdef CONFIG_IEEE80211BE
++u8 hostapd_get_mld_id(struct hostapd_data *hapd);
++bool hostapd_is_ml_partner(struct hostapd_data *hapd1,
++ struct hostapd_data *hapd2);
++
+ #define for_each_mld_link(_link, _bss_idx, _iface_idx, _ifaces, _mld_id) \
+ for (_iface_idx = 0; \
+ _iface_idx < (_ifaces)->count; \
+@@ -825,7 +829,7 @@ int hostapd_link_remove(struct hostapd_data *hapd, u32 count);
+ for (_link = \
+ (_ifaces)->iface[_iface_idx]->bss[_bss_idx]; \
+ _link && _link->conf->mld_ap && \
+- _link->conf->mld_id == _mld_id; \
++ hostapd_get_mld_id(_link) == _mld_id; \
+ _link = NULL)
+ #else /* CONFIG_IEEE80211BE */
+ #define for_each_mld_link(_link, _bss_idx, _iface_idx, _ifaces, _mld_id) \
+diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+index 9fe6b127b..ea6666301 100644
+--- a/src/ap/ieee802_11.c
++++ b/src/ap/ieee802_11.c
+@@ -4599,7 +4599,7 @@ int hostapd_process_assoc_ml_info(struct hostapd_data *hapd,
+ continue;
+
+ if (iface->bss[0]->conf->mld_ap &&
+- hapd->conf->mld_id == iface->bss[0]->conf->mld_id &&
++ hostapd_is_ml_partner(hapd, iface->bss[0]) &&
+ i == iface->bss[0]->mld_link_id)
+ break;
+ }
+@@ -5815,7 +5815,7 @@ static bool hostapd_ml_handle_disconnect(struct hostapd_data *hapd,
+ assoc_hapd->iface->interfaces->iface[i]->bss[0];
+
+ if (!tmp_hapd->conf->mld_ap ||
+- assoc_hapd->conf->mld_id != tmp_hapd->conf->mld_id)
++ !hostapd_is_ml_partner(assoc_hapd, tmp_hapd))
+ continue;
+
+ for (tmp_sta = tmp_hapd->sta_list; tmp_sta;
+@@ -6483,7 +6483,7 @@ static void hostapd_ml_handle_assoc_cb(struct hostapd_data *hapd,
+ hapd->iface->interfaces->iface[i]->bss[0];
+
+ if (!tmp_hapd->conf->mld_ap ||
+- hapd->conf->mld_id != tmp_hapd->conf->mld_id)
++ !hostapd_is_ml_partner(tmp_hapd, hapd))
+ continue;
+
+ for (tmp_sta = tmp_hapd->sta_list; tmp_sta;
+@@ -7457,8 +7457,7 @@ static size_t hostapd_eid_rnr_multi_iface_len(struct hostapd_data *hapd,
+ bool ap_mld = false;
+
+ #ifdef CONFIG_IEEE80211BE
+- if (hapd->conf->mld_ap && iface->bss[0]->conf->mld_ap &&
+- hapd->conf->mld_id == iface->bss[0]->conf->mld_id)
++ if (hostapd_is_ml_partner(hapd, iface->bss[0]))
+ ap_mld = true;
+ #endif /* CONFIG_IEEE80211BE */
+
+@@ -7631,10 +7630,10 @@ static bool hostapd_eid_rnr_bss(struct hostapd_data *hapd,
+ u8 param_ch = hapd->eht_mld_bss_param_change;
+
+ if (reporting_hapd->conf->mld_ap &&
+- bss->conf->mld_id == reporting_hapd->conf->mld_id)
++ hostapd_is_ml_partner(bss, reporting_hapd))
+ *eid++ = 0;
+ else
+- *eid++ = hapd->conf->mld_id;
++ *eid++ = hostapd_get_mld_id(hapd);
+
+ *eid++ = hapd->mld_link_id | ((param_ch & 0xF) << 4);
+ *eid = (param_ch >> 4) & 0xF;
+@@ -7732,8 +7731,7 @@ static u8 * hostapd_eid_rnr_multi_iface(struct hostapd_data *hapd, u8 *eid,
+ bool ap_mld = false;
+
+ #ifdef CONFIG_IEEE80211BE
+- if (hapd->conf->mld_ap && iface->bss[0]->conf->mld_ap &&
+- hapd->conf->mld_id == iface->bss[0]->conf->mld_id)
++ if (hostapd_is_ml_partner(hapd, iface->bss[0]))
+ ap_mld = true;
+ #endif /* CONFIG_IEEE80211BE */
+
+diff --git a/src/ap/ieee802_11_eht.c b/src/ap/ieee802_11_eht.c
+index e4590b9ff..6ffc5dd57 100644
+--- a/src/ap/ieee802_11_eht.c
++++ b/src/ap/ieee802_11_eht.c
+@@ -505,8 +505,8 @@ static u8 * hostapd_eid_eht_basic_ml_common(struct hostapd_data *hapd,
+
+ if (include_mld_id) {
+ wpa_printf(MSG_DEBUG, "MLD: AP MLD ID=0x%x",
+- hapd->conf->mld_id);
+- wpabuf_put_u8(buf, hapd->conf->mld_id);
++ hostapd_get_mld_id(hapd));
++ wpabuf_put_u8(buf, hostapd_get_mld_id(hapd));
+ }
+
+ if (!mld_info)
+@@ -1040,7 +1040,7 @@ static int hostapd_mld_validate_assoc_info(struct hostapd_data *hapd,
+ continue;
+
+ if (other_hapd->conf->mld_ap &&
+- other_hapd->conf->mld_id == hapd->conf->mld_id &&
++ hostapd_is_ml_partner(hapd, other_hapd) &&
+ link_id == other_hapd->mld_link_id)
+ break;
+ }
+diff --git a/src/ap/ieee802_1x.c b/src/ap/ieee802_1x.c
+index f13c60a9e..42eb5a173 100644
+--- a/src/ap/ieee802_1x.c
++++ b/src/ap/ieee802_1x.c
+@@ -173,7 +173,7 @@ static void ieee802_1x_ml_set_sta_authorized(struct hostapd_data *hapd,
+ hapd->iface->interfaces->iface[i]->bss[0];
+
+ if (!tmp_hapd->conf->mld_ap ||
+- hapd->conf->mld_id != tmp_hapd->conf->mld_id)
++ !hostapd_is_ml_partner(hapd, tmp_hapd))
+ continue;
+
+ for (tmp_sta = tmp_hapd->sta_list; tmp_sta;
+diff --git a/src/ap/sta_info.c b/src/ap/sta_info.c
+index dc5e3b419..97ed805ca 100644
+--- a/src/ap/sta_info.c
++++ b/src/ap/sta_info.c
+@@ -979,7 +979,7 @@ static bool ap_sta_ml_disconnect(struct hostapd_data *hapd,
+ tmp_hapd = interfaces->iface[i]->bss[0];
+
+ if (!tmp_hapd->conf->mld_ap ||
+- assoc_hapd->conf->mld_id != tmp_hapd->conf->mld_id)
++ !hostapd_is_ml_partner(tmp_hapd, assoc_hapd))
+ continue;
+
+ for (tmp_sta = tmp_hapd->sta_list; tmp_sta;
+@@ -1731,7 +1731,7 @@ static void ap_sta_remove_link_sta(struct hostapd_data *hapd,
+ unsigned int i, j;
+
+ for_each_mld_link(tmp_hapd, i, j, hapd->iface->interfaces,
+- hapd->conf->mld_id) {
++ hostapd_get_mld_id(hapd)) {
+ struct sta_info *tmp_sta;
+
+ if (hapd == tmp_hapd)
+diff --git a/src/ap/wpa_auth_glue.c b/src/ap/wpa_auth_glue.c
+index 9ce58f246..d23f21835 100644
+--- a/src/ap/wpa_auth_glue.c
++++ b/src/ap/wpa_auth_glue.c
+@@ -1557,7 +1557,7 @@ static int hostapd_wpa_auth_get_ml_rsn_info(void *ctx,
+ hapd->iface->interfaces->iface[j];
+
+ if (!iface->bss[0]->conf->mld_ap ||
+- hapd->conf->mld_id != iface->bss[0]->conf->mld_id ||
++ !hostapd_is_ml_partner(hapd, iface->bss[0]) ||
+ link_id != iface->bss[0]->mld_link_id ||
+ !iface->bss[0]->wpa_auth)
+ continue;
+@@ -1600,7 +1600,7 @@ static int hostapd_wpa_auth_get_ml_key_info(void *ctx,
+ hapd->iface->interfaces->iface[j];
+
+ if (!iface->bss[0]->conf->mld_ap ||
+- hapd->conf->mld_id != iface->bss[0]->conf->mld_id ||
++ !hostapd_is_ml_partner(hapd, iface->bss[0]) ||
+ link_id != iface->bss[0]->mld_link_id ||
+ !iface->bss[0]->wpa_auth)
+ continue;
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0006-hostapd-sync-2024-01-18-openwrt-trunk-src-folder.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0006-hostapd-sync-2024-01-18-openwrt-trunk-src-folder.patch
new file mode 100644
index 0000000..48ab42d
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0006-hostapd-sync-2024-01-18-openwrt-trunk-src-folder.patch
@@ -0,0 +1,5128 @@
+From 7d895f6fe6bedced0d4e5e4d0d8a7f18c7052640 Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Tue, 23 Jan 2024 16:46:44 +0800
+Subject: [PATCH 06/69] hostapd: sync 2024-01-18 openwrt/trunk src folder
+
+---
+ hostapd/radius.c | 715 +++++++++++++
+ src/ap/ubus.c | 2005 ++++++++++++++++++++++++++++++++++++
+ src/ap/ubus.h | 154 +++
+ src/ap/ucode.c | 813 +++++++++++++++
+ src/ap/ucode.h | 54 +
+ src/utils/build_features.h | 65 ++
+ src/utils/ucode.c | 502 +++++++++
+ src/utils/ucode.h | 30 +
+ wpa_supplicant/ubus.c | 280 +++++
+ wpa_supplicant/ubus.h | 55 +
+ wpa_supplicant/ucode.c | 299 ++++++
+ wpa_supplicant/ucode.h | 49 +
+ 12 files changed, 5021 insertions(+)
+ create mode 100644 hostapd/radius.c
+ create mode 100644 src/ap/ubus.c
+ create mode 100644 src/ap/ubus.h
+ create mode 100644 src/ap/ucode.c
+ create mode 100644 src/ap/ucode.h
+ create mode 100644 src/utils/build_features.h
+ create mode 100644 src/utils/ucode.c
+ create mode 100644 src/utils/ucode.h
+ create mode 100644 wpa_supplicant/ubus.c
+ create mode 100644 wpa_supplicant/ubus.h
+ create mode 100644 wpa_supplicant/ucode.c
+ create mode 100644 wpa_supplicant/ucode.h
+
+diff --git a/hostapd/radius.c b/hostapd/radius.c
+new file mode 100644
+index 000000000..362a22c27
+--- /dev/null
++++ b/hostapd/radius.c
+@@ -0,0 +1,715 @@
++#include "utils/includes.h"
++#include "utils/common.h"
++#include "utils/eloop.h"
++#include "crypto/crypto.h"
++#include "crypto/tls.h"
++
++#include "ap/ap_config.h"
++#include "eap_server/eap.h"
++#include "radius/radius.h"
++#include "radius/radius_server.h"
++#include "eap_register.h"
++
++#include <libubox/blobmsg_json.h>
++#include <libubox/blobmsg.h>
++#include <libubox/avl.h>
++#include <libubox/avl-cmp.h>
++#include <libubox/kvlist.h>
++
++#include <sys/stat.h>
++#include <fnmatch.h>
++
++#define VENDOR_ID_WISPR 14122
++#define VENDOR_ATTR_SIZE 6
++
++struct radius_parse_attr_data {
++ unsigned int vendor;
++ u8 type;
++ int size;
++ char format;
++ const char *data;
++};
++
++struct radius_parse_attr_state {
++ struct hostapd_radius_attr *prev;
++ struct hostapd_radius_attr *attr;
++ struct wpabuf *buf;
++ void *attrdata;
++};
++
++struct radius_user_state {
++ struct avl_node node;
++ struct eap_user data;
++};
++
++struct radius_user_data {
++ struct kvlist users;
++ struct avl_tree user_state;
++ struct blob_attr *wildcard;
++};
++
++struct radius_state {
++ struct radius_server_data *radius;
++ struct eap_config eap;
++
++ struct radius_user_data phase1, phase2;
++ const char *user_file;
++ time_t user_file_ts;
++
++ int n_attrs;
++ struct hostapd_radius_attr *attrs;
++};
++
++struct radius_config {
++ struct tls_connection_params tls;
++ struct radius_server_conf radius;
++};
++
++enum {
++ USER_ATTR_PASSWORD,
++ USER_ATTR_HASH,
++ USER_ATTR_SALT,
++ USER_ATTR_METHODS,
++ USER_ATTR_RADIUS,
++ USER_ATTR_VLAN,
++ USER_ATTR_MAX_RATE_UP,
++ USER_ATTR_MAX_RATE_DOWN,
++ __USER_ATTR_MAX
++};
++
++static void radius_tls_event(void *ctx, enum tls_event ev,
++ union tls_event_data *data)
++{
++ switch (ev) {
++ case TLS_CERT_CHAIN_SUCCESS:
++ wpa_printf(MSG_DEBUG, "radius: remote certificate verification success");
++ break;
++ case TLS_CERT_CHAIN_FAILURE:
++ wpa_printf(MSG_INFO, "radius: certificate chain failure: reason=%d depth=%d subject='%s' err='%s'",
++ data->cert_fail.reason,
++ data->cert_fail.depth,
++ data->cert_fail.subject,
++ data->cert_fail.reason_txt);
++ break;
++ case TLS_PEER_CERTIFICATE:
++ wpa_printf(MSG_DEBUG, "radius: peer certificate: depth=%d serial_num=%s subject=%s",
++ data->peer_cert.depth,
++ data->peer_cert.serial_num ? data->peer_cert.serial_num : "N/A",
++ data->peer_cert.subject);
++ break;
++ case TLS_ALERT:
++ if (data->alert.is_local)
++ wpa_printf(MSG_DEBUG, "radius: local TLS alert: %s",
++ data->alert.description);
++ else
++ wpa_printf(MSG_DEBUG, "radius: remote TLS alert: %s",
++ data->alert.description);
++ break;
++ case TLS_UNSAFE_RENEGOTIATION_DISABLED:
++ /* Not applicable to TLS server */
++ break;
++ }
++}
++
++static void radius_userdata_init(struct radius_user_data *u)
++{
++ kvlist_init(&u->users, kvlist_blob_len);
++ avl_init(&u->user_state, avl_strcmp, false, NULL);
++}
++
++static void radius_userdata_free(struct radius_user_data *u)
++{
++ struct radius_user_state *s, *tmp;
++
++ kvlist_free(&u->users);
++ free(u->wildcard);
++ u->wildcard = NULL;
++ avl_remove_all_elements(&u->user_state, s, node, tmp)
++ free(s);
++}
++
++static void
++radius_userdata_load(struct radius_user_data *u, struct blob_attr *data)
++{
++ enum {
++ USERSTATE_USERS,
++ USERSTATE_WILDCARD,
++ __USERSTATE_MAX,
++ };
++ static const struct blobmsg_policy policy[__USERSTATE_MAX] = {
++ [USERSTATE_USERS] = { "users", BLOBMSG_TYPE_TABLE },
++ [USERSTATE_WILDCARD] = { "wildcard", BLOBMSG_TYPE_ARRAY },
++ };
++ struct blob_attr *tb[__USERSTATE_MAX], *cur;
++ int rem;
++
++ if (!data)
++ return;
++
++ blobmsg_parse(policy, __USERSTATE_MAX, tb, blobmsg_data(data), blobmsg_len(data));
++
++ blobmsg_for_each_attr(cur, tb[USERSTATE_USERS], rem)
++ kvlist_set(&u->users, blobmsg_name(cur), cur);
++
++ if (tb[USERSTATE_WILDCARD])
++ u->wildcard = blob_memdup(tb[USERSTATE_WILDCARD]);
++}
++
++static void
++load_userfile(struct radius_state *s)
++{
++ enum {
++ USERDATA_PHASE1,
++ USERDATA_PHASE2,
++ __USERDATA_MAX
++ };
++ static const struct blobmsg_policy policy[__USERDATA_MAX] = {
++ [USERDATA_PHASE1] = { "phase1", BLOBMSG_TYPE_TABLE },
++ [USERDATA_PHASE2] = { "phase2", BLOBMSG_TYPE_TABLE },
++ };
++ struct blob_attr *tb[__USERDATA_MAX], *cur;
++ static struct blob_buf b;
++ struct stat st;
++ int rem;
++
++ if (stat(s->user_file, &st))
++ return;
++
++ if (s->user_file_ts == st.st_mtime)
++ return;
++
++ s->user_file_ts = st.st_mtime;
++ radius_userdata_free(&s->phase1);
++ radius_userdata_free(&s->phase2);
++
++ blob_buf_init(&b, 0);
++ blobmsg_add_json_from_file(&b, s->user_file);
++ blobmsg_parse(policy, __USERDATA_MAX, tb, blob_data(b.head), blob_len(b.head));
++ radius_userdata_load(&s->phase1, tb[USERDATA_PHASE1]);
++ radius_userdata_load(&s->phase2, tb[USERDATA_PHASE2]);
++
++ blob_buf_free(&b);
++}
++
++static struct blob_attr *
++radius_user_get(struct radius_user_data *s, const char *name)
++{
++ struct blob_attr *cur;
++ int rem;
++
++ cur = kvlist_get(&s->users, name);
++ if (cur)
++ return cur;
++
++ blobmsg_for_each_attr(cur, s->wildcard, rem) {
++ static const struct blobmsg_policy policy = {
++ "name", BLOBMSG_TYPE_STRING
++ };
++ struct blob_attr *pattern;
++
++ if (blobmsg_type(cur) != BLOBMSG_TYPE_TABLE)
++ continue;
++
++ blobmsg_parse(&policy, 1, &pattern, blobmsg_data(cur), blobmsg_len(cur));
++ if (!name)
++ continue;
++
++ if (!fnmatch(blobmsg_get_string(pattern), name, 0))
++ return cur;
++ }
++
++ return NULL;
++}
++
++static struct radius_parse_attr_data *
++radius_parse_attr(struct blob_attr *attr)
++{
++ static const struct blobmsg_policy policy[4] = {
++ { .type = BLOBMSG_TYPE_INT32 },
++ { .type = BLOBMSG_TYPE_INT32 },
++ { .type = BLOBMSG_TYPE_STRING },
++ { .type = BLOBMSG_TYPE_STRING },
++ };
++ static struct radius_parse_attr_data data;
++ struct blob_attr *tb[4];
++ const char *format;
++
++ blobmsg_parse_array(policy, ARRAY_SIZE(policy), tb, blobmsg_data(attr), blobmsg_len(attr));
++
++ if (!tb[0] || !tb[1] || !tb[2] || !tb[3])
++ return NULL;
++
++ format = blobmsg_get_string(tb[2]);
++ if (strlen(format) != 1)
++ return NULL;
++
++ data.vendor = blobmsg_get_u32(tb[0]);
++ data.type = blobmsg_get_u32(tb[1]);
++ data.format = format[0];
++ data.data = blobmsg_get_string(tb[3]);
++ data.size = strlen(data.data);
++
++ switch (data.format) {
++ case 's':
++ break;
++ case 'x':
++ if (data.size & 1)
++ return NULL;
++ data.size /= 2;
++ break;
++ case 'd':
++ data.size = 4;
++ break;
++ default:
++ return NULL;
++ }
++
++ return &data;
++}
++
++static void
++radius_count_attrs(struct blob_attr **tb, int *n_attr, size_t *attr_size)
++{
++ struct blob_attr *data = tb[USER_ATTR_RADIUS];
++ struct blob_attr *cur;
++ int rem;
++
++ blobmsg_for_each_attr(cur, data, rem) {
++ struct radius_parse_attr_data *data;
++ size_t prev = *attr_size;
++
++ data = radius_parse_attr(cur);
++ if (!data)
++ continue;
++
++ *attr_size += data->size;
++ if (data->vendor)
++ *attr_size += VENDOR_ATTR_SIZE;
++
++ (*n_attr)++;
++ }
++
++ *n_attr += !!tb[USER_ATTR_VLAN] * 3 +
++ !!tb[USER_ATTR_MAX_RATE_UP] +
++ !!tb[USER_ATTR_MAX_RATE_DOWN];
++ *attr_size += !!tb[USER_ATTR_VLAN] * (4 + 4 + 5) +
++ !!tb[USER_ATTR_MAX_RATE_UP] * (4 + VENDOR_ATTR_SIZE) +
++ !!tb[USER_ATTR_MAX_RATE_DOWN] * (4 + VENDOR_ATTR_SIZE);
++}
++
++static void *
++radius_add_attr(struct radius_parse_attr_state *state,
++ u32 vendor, u8 type, u8 len)
++{
++ struct hostapd_radius_attr *attr;
++ struct wpabuf *buf;
++ void *val;
++
++ val = state->attrdata;
++
++ buf = state->buf++;
++ buf->buf = val;
++
++ attr = state->attr++;
++ attr->val = buf;
++ attr->type = type;
++
++ if (state->prev)
++ state->prev->next = attr;
++ state->prev = attr;
++
++ if (vendor) {
++ u8 *vendor_hdr = val + 4;
++
++ WPA_PUT_BE32(val, vendor);
++ vendor_hdr[0] = type;
++ vendor_hdr[1] = len + 2;
++
++ len += VENDOR_ATTR_SIZE;
++ val += VENDOR_ATTR_SIZE;
++ attr->type = RADIUS_ATTR_VENDOR_SPECIFIC;
++ }
++
++ buf->size = buf->used = len;
++ state->attrdata += len;
++
++ return val;
++}
++
++static void
++radius_parse_attrs(struct blob_attr **tb, struct radius_parse_attr_state *state)
++{
++ struct blob_attr *data = tb[USER_ATTR_RADIUS];
++ struct hostapd_radius_attr *prev = NULL;
++ struct blob_attr *cur;
++ int len, rem;
++ void *val;
++
++ if ((cur = tb[USER_ATTR_VLAN]) != NULL && blobmsg_get_u32(cur) < 4096) {
++ char buf[5];
++
++ val = radius_add_attr(state, 0, RADIUS_ATTR_TUNNEL_TYPE, 4);
++ WPA_PUT_BE32(val, RADIUS_TUNNEL_TYPE_VLAN);
++
++ val = radius_add_attr(state, 0, RADIUS_ATTR_TUNNEL_MEDIUM_TYPE, 4);
++ WPA_PUT_BE32(val, RADIUS_TUNNEL_MEDIUM_TYPE_802);
++
++ len = snprintf(buf, sizeof(buf), "%d", blobmsg_get_u32(cur));
++ val = radius_add_attr(state, 0, RADIUS_ATTR_TUNNEL_PRIVATE_GROUP_ID, len);
++ memcpy(val, buf, len);
++ }
++
++ if ((cur = tb[USER_ATTR_MAX_RATE_UP]) != NULL) {
++ val = radius_add_attr(state, VENDOR_ID_WISPR, 7, 4);
++ WPA_PUT_BE32(val, blobmsg_get_u32(cur));
++ }
++
++ if ((cur = tb[USER_ATTR_MAX_RATE_DOWN]) != NULL) {
++ val = radius_add_attr(state, VENDOR_ID_WISPR, 8, 4);
++ WPA_PUT_BE32(val, blobmsg_get_u32(cur));
++ }
++
++ blobmsg_for_each_attr(cur, data, rem) {
++ struct radius_parse_attr_data *data;
++ void *val;
++ int size;
++
++ data = radius_parse_attr(cur);
++ if (!data)
++ continue;
++
++ val = radius_add_attr(state, data->vendor, data->type, data->size);
++ switch (data->format) {
++ case 's':
++ memcpy(val, data->data, data->size);
++ break;
++ case 'x':
++ hexstr2bin(data->data, val, data->size);
++ break;
++ case 'd':
++ WPA_PUT_BE32(val, atoi(data->data));
++ break;
++ }
++ }
++}
++
++static void
++radius_user_parse_methods(struct eap_user *eap, struct blob_attr *data)
++{
++ struct blob_attr *cur;
++ int rem, n = 0;
++
++ if (!data)
++ return;
++
++ blobmsg_for_each_attr(cur, data, rem) {
++ const char *method;
++
++ if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
++ continue;
++
++ if (n == EAP_MAX_METHODS)
++ break;
++
++ method = blobmsg_get_string(cur);
++ eap->methods[n].method = eap_server_get_type(method, &eap->methods[n].vendor);
++ if (eap->methods[n].vendor == EAP_VENDOR_IETF &&
++ eap->methods[n].method == EAP_TYPE_NONE) {
++ if (!strcmp(method, "TTLS-PAP")) {
++ eap->ttls_auth |= EAP_TTLS_AUTH_PAP;
++ continue;
++ }
++ if (!strcmp(method, "TTLS-CHAP")) {
++ eap->ttls_auth |= EAP_TTLS_AUTH_CHAP;
++ continue;
++ }
++ if (!strcmp(method, "TTLS-MSCHAP")) {
++ eap->ttls_auth |= EAP_TTLS_AUTH_MSCHAP;
++ continue;
++ }
++ if (!strcmp(method, "TTLS-MSCHAPV2")) {
++ eap->ttls_auth |= EAP_TTLS_AUTH_MSCHAPV2;
++ continue;
++ }
++ }
++ n++;
++ }
++}
++
++static struct eap_user *
++radius_user_get_state(struct radius_user_data *u, struct blob_attr *data,
++ const char *id)
++{
++ static const struct blobmsg_policy policy[__USER_ATTR_MAX] = {
++ [USER_ATTR_PASSWORD] = { "password", BLOBMSG_TYPE_STRING },
++ [USER_ATTR_HASH] = { "hash", BLOBMSG_TYPE_STRING },
++ [USER_ATTR_SALT] = { "salt", BLOBMSG_TYPE_STRING },
++ [USER_ATTR_METHODS] = { "methods", BLOBMSG_TYPE_ARRAY },
++ [USER_ATTR_RADIUS] = { "radius", BLOBMSG_TYPE_ARRAY },
++ [USER_ATTR_VLAN] = { "vlan-id", BLOBMSG_TYPE_INT32 },
++ [USER_ATTR_MAX_RATE_UP] = { "max-rate-up", BLOBMSG_TYPE_INT32 },
++ [USER_ATTR_MAX_RATE_DOWN] = { "max-rate-down", BLOBMSG_TYPE_INT32 },
++ };
++ struct blob_attr *tb[__USER_ATTR_MAX], *cur;
++ char *password_buf, *salt_buf, *name_buf;
++ struct radius_parse_attr_state astate = {};
++ struct hostapd_radius_attr *attr;
++ struct radius_user_state *state;
++ int pw_len = 0, salt_len = 0;
++ struct eap_user *eap;
++ struct wpabuf *val;
++ size_t attrsize = 0;
++ void *attrdata;
++ int n_attr = 0;
++
++ state = avl_find_element(&u->user_state, id, state, node);
++ if (state)
++ return &state->data;
++
++ blobmsg_parse(policy, __USER_ATTR_MAX, tb, blobmsg_data(data), blobmsg_len(data));
++
++ if ((cur = tb[USER_ATTR_SALT]) != NULL)
++ salt_len = strlen(blobmsg_get_string(cur)) / 2;
++ if ((cur = tb[USER_ATTR_HASH]) != NULL)
++ pw_len = strlen(blobmsg_get_string(cur)) / 2;
++ else if ((cur = tb[USER_ATTR_PASSWORD]) != NULL)
++ pw_len = blobmsg_len(cur) - 1;
++ radius_count_attrs(tb, &n_attr, &attrsize);
++
++ state = calloc_a(sizeof(*state), &name_buf, strlen(id) + 1,
++ &password_buf, pw_len,
++ &salt_buf, salt_len,
++ &astate.attr, n_attr * sizeof(*astate.attr),
++ &astate.buf, n_attr * sizeof(*astate.buf),
++ &astate.attrdata, attrsize);
++ eap = &state->data;
++ eap->salt = salt_len ? salt_buf : NULL;
++ eap->salt_len = salt_len;
++ eap->password = pw_len ? password_buf : NULL;
++ eap->password_len = pw_len;
++ eap->force_version = -1;
++
++ if ((cur = tb[USER_ATTR_SALT]) != NULL)
++ hexstr2bin(blobmsg_get_string(cur), salt_buf, salt_len);
++ if ((cur = tb[USER_ATTR_PASSWORD]) != NULL)
++ memcpy(password_buf, blobmsg_get_string(cur), pw_len);
++ else if ((cur = tb[USER_ATTR_HASH]) != NULL) {
++ hexstr2bin(blobmsg_get_string(cur), password_buf, pw_len);
++ eap->password_hash = 1;
++ }
++ radius_user_parse_methods(eap, tb[USER_ATTR_METHODS]);
++
++ if (n_attr > 0) {
++ cur = tb[USER_ATTR_RADIUS];
++ eap->accept_attr = astate.attr;
++ radius_parse_attrs(tb, &astate);
++ }
++
++ state->node.key = strcpy(name_buf, id);
++ avl_insert(&u->user_state, &state->node);
++
++ return &state->data;
++
++free:
++ free(state);
++ return NULL;
++}
++
++static int radius_get_eap_user(void *ctx, const u8 *identity,
++ size_t identity_len, int phase2,
++ struct eap_user *user)
++{
++ struct radius_state *s = ctx;
++ struct radius_user_data *u = phase2 ? &s->phase2 : &s->phase1;
++ struct blob_attr *entry;
++ struct eap_user *data;
++ char *id;
++
++ if (identity_len > 512)
++ return -1;
++
++ load_userfile(s);
++
++ id = alloca(identity_len + 1);
++ memcpy(id, identity, identity_len);
++ id[identity_len] = 0;
++
++ entry = radius_user_get(u, id);
++ if (!entry)
++ return -1;
++
++ if (!user)
++ return 0;
++
++ data = radius_user_get_state(u, entry, id);
++ if (!data)
++ return -1;
++
++ *user = *data;
++ if (user->password_len > 0)
++ user->password = os_memdup(user->password, user->password_len);
++ if (user->salt_len > 0)
++ user->salt = os_memdup(user->salt, user->salt_len);
++ user->phase2 = phase2;
++
++ return 0;
++}
++
++static int radius_setup(struct radius_state *s, struct radius_config *c)
++{
++ struct eap_config *eap = &s->eap;
++ struct tls_config conf = {
++ .event_cb = radius_tls_event,
++ .tls_flags = TLS_CONN_DISABLE_TLSv1_3,
++ .cb_ctx = s,
++ };
++
++ eap->eap_server = 1;
++ eap->max_auth_rounds = 100;
++ eap->max_auth_rounds_short = 50;
++ eap->ssl_ctx = tls_init(&conf);
++ if (!eap->ssl_ctx) {
++ wpa_printf(MSG_INFO, "TLS init failed\n");
++ return 1;
++ }
++
++ if (tls_global_set_params(eap->ssl_ctx, &c->tls)) {
++ wpa_printf(MSG_INFO, "failed to set TLS parameters\n");
++ return 1;
++ }
++
++ c->radius.eap_cfg = eap;
++ c->radius.conf_ctx = s;
++ c->radius.get_eap_user = radius_get_eap_user;
++ s->radius = radius_server_init(&c->radius);
++ if (!s->radius) {
++ wpa_printf(MSG_INFO, "failed to initialize radius server\n");
++ return 1;
++ }
++
++ return 0;
++}
++
++static int radius_init(struct radius_state *s)
++{
++ memset(s, 0, sizeof(*s));
++ radius_userdata_init(&s->phase1);
++ radius_userdata_init(&s->phase2);
++}
++
++static void radius_deinit(struct radius_state *s)
++{
++ if (s->radius)
++ radius_server_deinit(s->radius);
++
++ if (s->eap.ssl_ctx)
++ tls_deinit(s->eap.ssl_ctx);
++
++ radius_userdata_free(&s->phase1);
++ radius_userdata_free(&s->phase2);
++}
++
++static int usage(const char *progname)
++{
++ fprintf(stderr, "Usage: %s <options>\n",
++ progname);
++}
++
++int radius_main(int argc, char **argv)
++{
++ static struct radius_state state = {};
++ static struct radius_config config = {};
++ const char *progname = argv[0];
++ int ret = 0;
++ int ch;
++
++ wpa_debug_setup_stdout();
++ wpa_debug_level = 0;
++
++ if (eloop_init()) {
++ wpa_printf(MSG_ERROR, "Failed to initialize event loop");
++ return 1;
++ }
++
++ eap_server_register_methods();
++ radius_init(&state);
++
++ while ((ch = getopt(argc, argv, "6C:c:d:i:k:K:p:P:s:u:")) != -1) {
++ switch (ch) {
++ case '6':
++ config.radius.ipv6 = 1;
++ break;
++ case 'C':
++ config.tls.ca_cert = optarg;
++ break;
++ case 'c':
++ if (config.tls.client_cert2)
++ return usage(progname);
++
++ if (config.tls.client_cert)
++ config.tls.client_cert2 = optarg;
++ else
++ config.tls.client_cert = optarg;
++ break;
++ case 'd':
++ config.tls.dh_file = optarg;
++ break;
++ case 'i':
++ state.eap.server_id = optarg;
++ state.eap.server_id_len = strlen(optarg);
++ break;
++ case 'k':
++ if (config.tls.private_key2)
++ return usage(progname);
++
++ if (config.tls.private_key)
++ config.tls.private_key2 = optarg;
++ else
++ config.tls.private_key = optarg;
++ break;
++ case 'K':
++ if (config.tls.private_key_passwd2)
++ return usage(progname);
++
++ if (config.tls.private_key_passwd)
++ config.tls.private_key_passwd2 = optarg;
++ else
++ config.tls.private_key_passwd = optarg;
++ break;
++ case 'p':
++ config.radius.auth_port = atoi(optarg);
++ break;
++ case 'P':
++ config.radius.acct_port = atoi(optarg);
++ break;
++ case 's':
++ config.radius.client_file = optarg;
++ break;
++ case 'u':
++ state.user_file = optarg;
++ break;
++ default:
++ return usage(progname);
++ }
++ }
++
++ if (!config.tls.client_cert || !config.tls.private_key ||
++ !config.radius.client_file || !state.eap.server_id ||
++ !state.user_file) {
++ wpa_printf(MSG_INFO, "missing options\n");
++ goto out;
++ }
++
++ ret = radius_setup(&state, &config);
++ if (ret)
++ goto out;
++
++ load_userfile(&state);
++ eloop_run();
++
++out:
++ radius_deinit(&state);
++ os_program_deinit();
++
++ return ret;
++}
+diff --git a/src/ap/ubus.c b/src/ap/ubus.c
+new file mode 100644
+index 000000000..f2041a0c9
+--- /dev/null
++++ b/src/ap/ubus.c
+@@ -0,0 +1,2005 @@
++/*
++ * hostapd / ubus support
++ * Copyright (c) 2013, Felix Fietkau <nbd@nbd.name>
++ *
++ * This software may be distributed under the terms of the BSD license.
++ * See README for more details.
++ */
++
++#include "utils/includes.h"
++#include "utils/common.h"
++#include "utils/eloop.h"
++#include "utils/wpabuf.h"
++#include "common/ieee802_11_defs.h"
++#include "common/hw_features_common.h"
++#include "hostapd.h"
++#include "neighbor_db.h"
++#include "wps_hostapd.h"
++#include "sta_info.h"
++#include "ubus.h"
++#include "ap_drv_ops.h"
++#include "beacon.h"
++#include "rrm.h"
++#include "wnm_ap.h"
++#include "taxonomy.h"
++#include "airtime_policy.h"
++#include "hw_features.h"
++
++static struct ubus_context *ctx;
++static struct blob_buf b;
++static int ctx_ref;
++
++static inline struct hostapd_data *get_hapd_from_object(struct ubus_object *obj)
++{
++ return container_of(obj, struct hostapd_data, ubus.obj);
++}
++
++struct ubus_banned_client {
++ struct avl_node avl;
++ u8 addr[ETH_ALEN];
++};
++
++static void ubus_reconnect_timeout(void *eloop_data, void *user_ctx)
++{
++ if (ubus_reconnect(ctx, NULL)) {
++ eloop_register_timeout(1, 0, ubus_reconnect_timeout, ctx, NULL);
++ return;
++ }
++
++ ubus_add_uloop(ctx);
++}
++
++static void hostapd_ubus_connection_lost(struct ubus_context *ctx)
++{
++ uloop_fd_delete(&ctx->sock);
++ eloop_register_timeout(1, 0, ubus_reconnect_timeout, ctx, NULL);
++}
++
++static bool hostapd_ubus_init(void)
++{
++ if (ctx)
++ return true;
++
++ eloop_add_uloop();
++ ctx = ubus_connect(NULL);
++ if (!ctx)
++ return false;
++
++ ctx->connection_lost = hostapd_ubus_connection_lost;
++ ubus_add_uloop(ctx);
++
++ return true;
++}
++
++static void hostapd_ubus_ref_inc(void)
++{
++ ctx_ref++;
++}
++
++static void hostapd_ubus_ref_dec(void)
++{
++ ctx_ref--;
++ if (!ctx)
++ return;
++
++ if (ctx_ref)
++ return;
++
++ uloop_fd_delete(&ctx->sock);
++ ubus_free(ctx);
++ ctx = NULL;
++}
++
++void hostapd_ubus_add_iface(struct hostapd_iface *iface)
++{
++ if (!hostapd_ubus_init())
++ return;
++}
++
++void hostapd_ubus_free_iface(struct hostapd_iface *iface)
++{
++ if (!ctx)
++ return;
++}
++
++static void hostapd_notify_ubus(struct ubus_object *obj, char *bssname, char *event)
++{
++ char *event_type;
++
++ if (!ctx || !obj)
++ return;
++
++ if (asprintf(&event_type, "bss.%s", event) < 0)
++ return;
++
++ blob_buf_init(&b, 0);
++ blobmsg_add_string(&b, "name", bssname);
++ ubus_notify(ctx, obj, event_type, b.head, -1);
++ free(event_type);
++}
++
++static void
++hostapd_bss_del_ban(void *eloop_data, void *user_ctx)
++{
++ struct ubus_banned_client *ban = eloop_data;
++ struct hostapd_data *hapd = user_ctx;
++
++ avl_delete(&hapd->ubus.banned, &ban->avl);
++ free(ban);
++}
++
++static void
++hostapd_bss_ban_client(struct hostapd_data *hapd, u8 *addr, int time)
++{
++ struct ubus_banned_client *ban;
++
++ if (time < 0)
++ time = 0;
++
++ ban = avl_find_element(&hapd->ubus.banned, addr, ban, avl);
++ if (!ban) {
++ if (!time)
++ return;
++
++ ban = os_zalloc(sizeof(*ban));
++ memcpy(ban->addr, addr, sizeof(ban->addr));
++ ban->avl.key = ban->addr;
++ avl_insert(&hapd->ubus.banned, &ban->avl);
++ } else {
++ eloop_cancel_timeout(hostapd_bss_del_ban, ban, hapd);
++ if (!time) {
++ hostapd_bss_del_ban(ban, hapd);
++ return;
++ }
++ }
++
++ eloop_register_timeout(0, time * 1000, hostapd_bss_del_ban, ban, hapd);
++}
++
++static int
++hostapd_bss_reload(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++
++ return hostapd_reload_config(hapd->iface);
++}
++
++
++static void
++hostapd_parse_vht_map_blobmsg(uint16_t map)
++{
++ char label[4];
++ int16_t val;
++ int i;
++
++ for (i = 0; i < 8; i++) {
++ snprintf(label, 4, "%dss", i + 1);
++
++ val = (map & (BIT(1) | BIT(0))) + 7;
++ blobmsg_add_u16(&b, label, val == 10 ? -1 : val);
++ map = map >> 2;
++ }
++}
++
++static void
++hostapd_parse_vht_capab_blobmsg(struct ieee80211_vht_capabilities *vhtc)
++{
++ void *supported_mcs;
++ void *map;
++ int i;
++
++ static const struct {
++ const char *name;
++ uint32_t flag;
++ } vht_capas[] = {
++ { "su_beamformee", VHT_CAP_SU_BEAMFORMEE_CAPABLE },
++ { "mu_beamformee", VHT_CAP_MU_BEAMFORMEE_CAPABLE },
++ };
++
++ for (i = 0; i < ARRAY_SIZE(vht_capas); i++)
++ blobmsg_add_u8(&b, vht_capas[i].name,
++ !!(vhtc->vht_capabilities_info & vht_capas[i].flag));
++
++ supported_mcs = blobmsg_open_table(&b, "mcs_map");
++
++ /* RX map */
++ map = blobmsg_open_table(&b, "rx");
++ hostapd_parse_vht_map_blobmsg(le_to_host16(vhtc->vht_supported_mcs_set.rx_map));
++ blobmsg_close_table(&b, map);
++
++ /* TX map */
++ map = blobmsg_open_table(&b, "tx");
++ hostapd_parse_vht_map_blobmsg(le_to_host16(vhtc->vht_supported_mcs_set.tx_map));
++ blobmsg_close_table(&b, map);
++
++ blobmsg_close_table(&b, supported_mcs);
++}
++
++static void
++hostapd_parse_capab_blobmsg(struct sta_info *sta)
++{
++ void *r, *v;
++
++ v = blobmsg_open_table(&b, "capabilities");
++
++ if (sta->vht_capabilities) {
++ r = blobmsg_open_table(&b, "vht");
++ hostapd_parse_vht_capab_blobmsg(sta->vht_capabilities);
++ blobmsg_close_table(&b, r);
++ }
++
++ /* ToDo: Add HT / HE capability parsing */
++
++ blobmsg_close_table(&b, v);
++}
++
++static int
++hostapd_bss_get_clients(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++ struct hostap_sta_driver_data sta_driver_data;
++ struct sta_info *sta;
++ void *list, *c;
++ char mac_buf[20];
++ static const struct {
++ const char *name;
++ uint32_t flag;
++ } sta_flags[] = {
++ { "auth", WLAN_STA_AUTH },
++ { "assoc", WLAN_STA_ASSOC },
++ { "authorized", WLAN_STA_AUTHORIZED },
++ { "preauth", WLAN_STA_PREAUTH },
++ { "wds", WLAN_STA_WDS },
++ { "wmm", WLAN_STA_WMM },
++ { "ht", WLAN_STA_HT },
++ { "vht", WLAN_STA_VHT },
++ { "he", WLAN_STA_HE },
++ { "wps", WLAN_STA_WPS },
++ { "mfp", WLAN_STA_MFP },
++ };
++
++ blob_buf_init(&b, 0);
++ blobmsg_add_u32(&b, "freq", hapd->iface->freq);
++ list = blobmsg_open_table(&b, "clients");
++ for (sta = hapd->sta_list; sta; sta = sta->next) {
++ void *r;
++ int i;
++
++ sprintf(mac_buf, MACSTR, MAC2STR(sta->addr));
++ c = blobmsg_open_table(&b, mac_buf);
++ for (i = 0; i < ARRAY_SIZE(sta_flags); i++)
++ blobmsg_add_u8(&b, sta_flags[i].name,
++ !!(sta->flags & sta_flags[i].flag));
++
++#ifdef CONFIG_MBO
++ blobmsg_add_u8(&b, "mbo", !!(sta->cell_capa));
++#endif
++
++ r = blobmsg_open_array(&b, "rrm");
++ for (i = 0; i < ARRAY_SIZE(sta->rrm_enabled_capa); i++)
++ blobmsg_add_u32(&b, "", sta->rrm_enabled_capa[i]);
++ blobmsg_close_array(&b, r);
++
++ r = blobmsg_open_array(&b, "extended_capabilities");
++ /* Check if client advertises extended capabilities */
++ if (sta->ext_capability && sta->ext_capability[0] > 0) {
++ for (i = 0; i < sta->ext_capability[0]; i++) {
++ blobmsg_add_u32(&b, "", sta->ext_capability[1 + i]);
++ }
++ }
++ blobmsg_close_array(&b, r);
++
++ blobmsg_add_u32(&b, "aid", sta->aid);
++#ifdef CONFIG_TAXONOMY
++ r = blobmsg_alloc_string_buffer(&b, "signature", 1024);
++ if (retrieve_sta_taxonomy(hapd, sta, r, 1024) > 0)
++ blobmsg_add_string_buffer(&b);
++#endif
++
++ /* Driver information */
++ if (hostapd_drv_read_sta_data(hapd, &sta_driver_data, sta->addr) >= 0) {
++ r = blobmsg_open_table(&b, "bytes");
++ blobmsg_add_u64(&b, "rx", sta_driver_data.rx_bytes);
++ blobmsg_add_u64(&b, "tx", sta_driver_data.tx_bytes);
++ blobmsg_close_table(&b, r);
++ r = blobmsg_open_table(&b, "airtime");
++ blobmsg_add_u64(&b, "rx", sta_driver_data.rx_airtime);
++ blobmsg_add_u64(&b, "tx", sta_driver_data.tx_airtime);
++ blobmsg_close_table(&b, r);
++ r = blobmsg_open_table(&b, "packets");
++ blobmsg_add_u32(&b, "rx", sta_driver_data.rx_packets);
++ blobmsg_add_u32(&b, "tx", sta_driver_data.tx_packets);
++ blobmsg_close_table(&b, r);
++ r = blobmsg_open_table(&b, "rate");
++ /* Rate in kbits */
++ blobmsg_add_u32(&b, "rx", sta_driver_data.current_rx_rate * 100);
++ blobmsg_add_u32(&b, "tx", sta_driver_data.current_tx_rate * 100);
++ blobmsg_close_table(&b, r);
++ blobmsg_add_u32(&b, "signal", sta_driver_data.signal);
++ }
++
++ hostapd_parse_capab_blobmsg(sta);
++
++ blobmsg_close_table(&b, c);
++ }
++ blobmsg_close_array(&b, list);
++ ubus_send_reply(ctx, req, b.head);
++
++ return 0;
++}
++
++static int
++hostapd_bss_get_features(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++
++ blob_buf_init(&b, 0);
++ blobmsg_add_u8(&b, "ht_supported", ht_supported(hapd->iface->hw_features));
++ blobmsg_add_u8(&b, "vht_supported", vht_supported(hapd->iface->hw_features));
++ ubus_send_reply(ctx, req, b.head);
++
++ return 0;
++}
++
++static int
++hostapd_bss_get_status(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++ void *airtime_table, *dfs_table, *rrm_table, *wnm_table;
++ struct os_reltime now;
++ char ssid[SSID_MAX_LEN + 1];
++ char phy_name[17];
++ size_t ssid_len = SSID_MAX_LEN;
++ u8 channel = 0, op_class = 0;
++
++ if (hapd->conf->ssid.ssid_len < SSID_MAX_LEN)
++ ssid_len = hapd->conf->ssid.ssid_len;
++
++ ieee80211_freq_to_channel_ext(hapd->iface->freq,
++ hapd->iconf->secondary_channel,
++ hostapd_get_oper_chwidth(hapd->iconf),
++ &op_class, &channel);
++
++ blob_buf_init(&b, 0);
++ blobmsg_add_string(&b, "status", hostapd_state_text(hapd->iface->state));
++ blobmsg_printf(&b, "bssid", MACSTR, MAC2STR(hapd->conf->bssid));
++
++ memset(ssid, 0, SSID_MAX_LEN + 1);
++ memcpy(ssid, hapd->conf->ssid.ssid, ssid_len);
++ blobmsg_add_string(&b, "ssid", ssid);
++
++ blobmsg_add_u32(&b, "freq", hapd->iface->freq);
++ blobmsg_add_u32(&b, "channel", channel);
++ blobmsg_add_u32(&b, "op_class", op_class);
++ blobmsg_add_u32(&b, "beacon_interval", hapd->iconf->beacon_int);
++#ifdef CONFIG_IEEE80211AX
++ blobmsg_add_u32(&b, "bss_color", hapd->iface->conf->he_op.he_bss_color_disabled ? -1 :
++ hapd->iface->conf->he_op.he_bss_color);
++#else
++ blobmsg_add_u32(&b, "bss_color", -1);
++#endif
++
++ snprintf(phy_name, 17, "%s", hapd->iface->phy);
++ blobmsg_add_string(&b, "phy", phy_name);
++
++ /* RRM */
++ rrm_table = blobmsg_open_table(&b, "rrm");
++ blobmsg_add_u64(&b, "neighbor_report_tx", hapd->openwrt_stats.rrm.neighbor_report_tx);
++ blobmsg_close_table(&b, rrm_table);
++
++ /* WNM */
++ wnm_table = blobmsg_open_table(&b, "wnm");
++ blobmsg_add_u64(&b, "bss_transition_query_rx", hapd->openwrt_stats.wnm.bss_transition_query_rx);
++ blobmsg_add_u64(&b, "bss_transition_request_tx", hapd->openwrt_stats.wnm.bss_transition_request_tx);
++ blobmsg_add_u64(&b, "bss_transition_response_rx", hapd->openwrt_stats.wnm.bss_transition_response_rx);
++ blobmsg_close_table(&b, wnm_table);
++
++ /* Airtime */
++ airtime_table = blobmsg_open_table(&b, "airtime");
++ blobmsg_add_u64(&b, "time", hapd->iface->last_channel_time);
++ blobmsg_add_u64(&b, "time_busy", hapd->iface->last_channel_time_busy);
++ blobmsg_add_u16(&b, "utilization", hapd->iface->channel_utilization);
++ blobmsg_close_table(&b, airtime_table);
++
++ /* DFS */
++ dfs_table = blobmsg_open_table(&b, "dfs");
++ blobmsg_add_u32(&b, "cac_seconds", hapd->iface->dfs_cac_ms / 1000);
++ blobmsg_add_u8(&b, "cac_active", !!(hapd->iface->cac_started));
++ os_reltime_age(&hapd->iface->dfs_cac_start, &now);
++ blobmsg_add_u32(&b, "cac_seconds_left",
++ hapd->iface->cac_started ? hapd->iface->dfs_cac_ms / 1000 - now.sec : 0);
++ blobmsg_close_table(&b, dfs_table);
++
++ ubus_send_reply(ctx, req, b.head);
++
++ return 0;
++}
++
++enum {
++ NOTIFY_RESPONSE,
++ __NOTIFY_MAX
++};
++
++static const struct blobmsg_policy notify_policy[__NOTIFY_MAX] = {
++ [NOTIFY_RESPONSE] = { "notify_response", BLOBMSG_TYPE_INT32 },
++};
++
++static int
++hostapd_notify_response(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ struct blob_attr *tb[__NOTIFY_MAX];
++ struct hostapd_data *hapd = get_hapd_from_object(obj);
++ struct wpabuf *elems;
++ const char *pos;
++ size_t len;
++
++ blobmsg_parse(notify_policy, __NOTIFY_MAX, tb,
++ blob_data(msg), blob_len(msg));
++
++ if (!tb[NOTIFY_RESPONSE])
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ hapd->ubus.notify_response = blobmsg_get_u32(tb[NOTIFY_RESPONSE]);
++
++ return UBUS_STATUS_OK;
++}
++
++enum {
++ DEL_CLIENT_ADDR,
++ DEL_CLIENT_REASON,
++ DEL_CLIENT_DEAUTH,
++ DEL_CLIENT_BAN_TIME,
++ __DEL_CLIENT_MAX
++};
++
++static const struct blobmsg_policy del_policy[__DEL_CLIENT_MAX] = {
++ [DEL_CLIENT_ADDR] = { "addr", BLOBMSG_TYPE_STRING },
++ [DEL_CLIENT_REASON] = { "reason", BLOBMSG_TYPE_INT32 },
++ [DEL_CLIENT_DEAUTH] = { "deauth", BLOBMSG_TYPE_INT8 },
++ [DEL_CLIENT_BAN_TIME] = { "ban_time", BLOBMSG_TYPE_INT32 },
++};
++
++static int
++hostapd_bss_del_client(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ struct blob_attr *tb[__DEL_CLIENT_MAX];
++ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++ struct sta_info *sta;
++ bool deauth = false;
++ int reason;
++ u8 addr[ETH_ALEN];
++
++ blobmsg_parse(del_policy, __DEL_CLIENT_MAX, tb, blob_data(msg), blob_len(msg));
++
++ if (!tb[DEL_CLIENT_ADDR])
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ if (hwaddr_aton(blobmsg_data(tb[DEL_CLIENT_ADDR]), addr))
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ if (tb[DEL_CLIENT_REASON])
++ reason = blobmsg_get_u32(tb[DEL_CLIENT_REASON]);
++
++ if (tb[DEL_CLIENT_DEAUTH])
++ deauth = blobmsg_get_bool(tb[DEL_CLIENT_DEAUTH]);
++
++ sta = ap_get_sta(hapd, addr);
++ if (sta) {
++ if (deauth) {
++ hostapd_drv_sta_deauth(hapd, addr, reason);
++ ap_sta_deauthenticate(hapd, sta, reason);
++ } else {
++ hostapd_drv_sta_disassoc(hapd, addr, reason);
++ ap_sta_disassociate(hapd, sta, reason);
++ }
++ }
++
++ if (tb[DEL_CLIENT_BAN_TIME])
++ hostapd_bss_ban_client(hapd, addr, blobmsg_get_u32(tb[DEL_CLIENT_BAN_TIME]));
++
++ return 0;
++}
++
++static void
++blobmsg_add_macaddr(struct blob_buf *buf, const char *name, const u8 *addr)
++{
++ char *s;
++
++ s = blobmsg_alloc_string_buffer(buf, name, 20);
++ sprintf(s, MACSTR, MAC2STR(addr));
++ blobmsg_add_string_buffer(buf);
++}
++
++static int
++hostapd_bss_list_bans(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++ struct ubus_banned_client *ban;
++ void *c;
++
++ blob_buf_init(&b, 0);
++ c = blobmsg_open_array(&b, "clients");
++ avl_for_each_element(&hapd->ubus.banned, ban, avl)
++ blobmsg_add_macaddr(&b, NULL, ban->addr);
++ blobmsg_close_array(&b, c);
++ ubus_send_reply(ctx, req, b.head);
++
++ return 0;
++}
++
++#ifdef CONFIG_WPS
++static int
++hostapd_bss_wps_start(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ int rc;
++ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++
++ rc = hostapd_wps_button_pushed(hapd, NULL);
++
++ if (rc != 0)
++ return UBUS_STATUS_NOT_SUPPORTED;
++
++ return 0;
++}
++
++
++static const char * pbc_status_enum_str(enum pbc_status status)
++{
++ switch (status) {
++ case WPS_PBC_STATUS_DISABLE:
++ return "Disabled";
++ case WPS_PBC_STATUS_ACTIVE:
++ return "Active";
++ case WPS_PBC_STATUS_TIMEOUT:
++ return "Timed-out";
++ case WPS_PBC_STATUS_OVERLAP:
++ return "Overlap";
++ default:
++ return "Unknown";
++ }
++}
++
++static int
++hostapd_bss_wps_status(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ int rc;
++ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++
++ blob_buf_init(&b, 0);
++
++ blobmsg_add_string(&b, "pbc_status", pbc_status_enum_str(hapd->wps_stats.pbc_status));
++ blobmsg_add_string(&b, "last_wps_result",
++ (hapd->wps_stats.status == WPS_STATUS_SUCCESS ?
++ "Success":
++ (hapd->wps_stats.status == WPS_STATUS_FAILURE ?
++ "Failed" : "None")));
++
++ /* If status == Failure - Add possible Reasons */
++ if(hapd->wps_stats.status == WPS_STATUS_FAILURE &&
++ hapd->wps_stats.failure_reason > 0)
++ blobmsg_add_string(&b, "reason", wps_ei_str(hapd->wps_stats.failure_reason));
++
++ if (hapd->wps_stats.status)
++ blobmsg_printf(&b, "peer_address", MACSTR, MAC2STR(hapd->wps_stats.peer_addr));
++
++ ubus_send_reply(ctx, req, b.head);
++
++ return 0;
++}
++
++static int
++hostapd_bss_wps_cancel(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ int rc;
++ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++
++ rc = hostapd_wps_cancel(hapd);
++
++ if (rc != 0)
++ return UBUS_STATUS_NOT_SUPPORTED;
++
++ return 0;
++}
++#endif /* CONFIG_WPS */
++
++static int
++hostapd_bss_update_beacon(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ int rc;
++ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++
++ rc = ieee802_11_set_beacon(hapd);
++
++ if (rc != 0)
++ return UBUS_STATUS_NOT_SUPPORTED;
++
++ return 0;
++}
++
++enum {
++ CONFIG_IFACE,
++ CONFIG_FILE,
++ __CONFIG_MAX
++};
++
++enum {
++ CSA_FREQ,
++ CSA_BCN_COUNT,
++ CSA_CENTER_FREQ1,
++ CSA_CENTER_FREQ2,
++ CSA_BANDWIDTH,
++ CSA_SEC_CHANNEL_OFFSET,
++ CSA_HT,
++ CSA_VHT,
++ CSA_HE,
++ CSA_BLOCK_TX,
++ CSA_FORCE,
++ __CSA_MAX
++};
++
++static const struct blobmsg_policy csa_policy[__CSA_MAX] = {
++ [CSA_FREQ] = { "freq", BLOBMSG_TYPE_INT32 },
++ [CSA_BCN_COUNT] = { "bcn_count", BLOBMSG_TYPE_INT32 },
++ [CSA_CENTER_FREQ1] = { "center_freq1", BLOBMSG_TYPE_INT32 },
++ [CSA_CENTER_FREQ2] = { "center_freq2", BLOBMSG_TYPE_INT32 },
++ [CSA_BANDWIDTH] = { "bandwidth", BLOBMSG_TYPE_INT32 },
++ [CSA_SEC_CHANNEL_OFFSET] = { "sec_channel_offset", BLOBMSG_TYPE_INT32 },
++ [CSA_HT] = { "ht", BLOBMSG_TYPE_BOOL },
++ [CSA_VHT] = { "vht", BLOBMSG_TYPE_BOOL },
++ [CSA_HE] = { "he", BLOBMSG_TYPE_BOOL },
++ [CSA_BLOCK_TX] = { "block_tx", BLOBMSG_TYPE_BOOL },
++ [CSA_FORCE] = { "force", BLOBMSG_TYPE_BOOL },
++};
++
++
++static void switch_chan_fallback_cb(void *eloop_data, void *user_ctx)
++{
++ struct hostapd_iface *iface = eloop_data;
++ struct hostapd_freq_params *freq_params = user_ctx;
++
++ hostapd_switch_channel_fallback(iface, freq_params);
++}
++
++#ifdef NEED_AP_MLME
++static int
++hostapd_switch_chan(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ struct blob_attr *tb[__CSA_MAX];
++ struct hostapd_data *hapd = get_hapd_from_object(obj);
++ struct hostapd_config *iconf = hapd->iface->conf;
++ struct hostapd_freq_params *freq_params;
++ struct hostapd_hw_modes *mode = hapd->iface->current_mode;
++ struct csa_settings css = {
++ .freq_params = {
++ .ht_enabled = iconf->ieee80211n,
++ .vht_enabled = iconf->ieee80211ac,
++ .he_enabled = iconf->ieee80211ax,
++ .sec_channel_offset = iconf->secondary_channel,
++ }
++ };
++ u8 chwidth = hostapd_get_oper_chwidth(iconf);
++ u8 seg0 = 0, seg1 = 0;
++ int ret = UBUS_STATUS_OK;
++ int i;
++
++ blobmsg_parse(csa_policy, __CSA_MAX, tb, blob_data(msg), blob_len(msg));
++
++ if (!tb[CSA_FREQ])
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ switch (iconf->vht_oper_chwidth) {
++ case CHANWIDTH_USE_HT:
++ if (iconf->secondary_channel)
++ css.freq_params.bandwidth = 40;
++ else
++ css.freq_params.bandwidth = 20;
++ break;
++ case CHANWIDTH_160MHZ:
++ css.freq_params.bandwidth = 160;
++ break;
++ default:
++ css.freq_params.bandwidth = 80;
++ break;
++ }
++
++ css.freq_params.freq = blobmsg_get_u32(tb[CSA_FREQ]);
++
++#define SET_CSA_SETTING(name, field, type) \
++ do { \
++ if (tb[name]) \
++ css.field = blobmsg_get_ ## type(tb[name]); \
++ } while(0)
++
++ SET_CSA_SETTING(CSA_BCN_COUNT, cs_count, u32);
++ SET_CSA_SETTING(CSA_CENTER_FREQ1, freq_params.center_freq1, u32);
++ SET_CSA_SETTING(CSA_CENTER_FREQ2, freq_params.center_freq2, u32);
++ SET_CSA_SETTING(CSA_BANDWIDTH, freq_params.bandwidth, u32);
++ SET_CSA_SETTING(CSA_SEC_CHANNEL_OFFSET, freq_params.sec_channel_offset, u32);
++ SET_CSA_SETTING(CSA_HT, freq_params.ht_enabled, bool);
++ SET_CSA_SETTING(CSA_VHT, freq_params.vht_enabled, bool);
++ SET_CSA_SETTING(CSA_HE, freq_params.he_enabled, bool);
++ SET_CSA_SETTING(CSA_BLOCK_TX, block_tx, bool);
++
++ css.freq_params.channel = hostapd_hw_get_channel(hapd, css.freq_params.freq);
++ if (!css.freq_params.channel)
++ return UBUS_STATUS_NOT_SUPPORTED;
++
++ switch (css.freq_params.bandwidth) {
++ case 160:
++ chwidth = CHANWIDTH_160MHZ;
++ break;
++ case 80:
++ chwidth = css.freq_params.center_freq2 ? CHANWIDTH_80P80MHZ : CHANWIDTH_80MHZ;
++ break;
++ default:
++ chwidth = CHANWIDTH_USE_HT;
++ break;
++ }
++
++ hostapd_set_freq_params(&css.freq_params, iconf->hw_mode,
++ css.freq_params.freq,
++ css.freq_params.channel, iconf->enable_edmg,
++ iconf->edmg_channel,
++ css.freq_params.ht_enabled,
++ css.freq_params.vht_enabled,
++ css.freq_params.he_enabled,
++ css.freq_params.eht_enabled,
++ css.freq_params.sec_channel_offset,
++ chwidth, seg0, seg1,
++ iconf->vht_capab,
++ mode ? &mode->he_capab[IEEE80211_MODE_AP] :
++ NULL,
++ mode ? &mode->eht_capab[IEEE80211_MODE_AP] :
++ NULL, hostapd_get_punct_bitmap(hapd));
++
++ for (i = 0; i < hapd->iface->num_bss; i++) {
++ struct hostapd_data *bss = hapd->iface->bss[i];
++
++ if (hostapd_switch_channel(bss, &css) != 0)
++ ret = UBUS_STATUS_NOT_SUPPORTED;
++ }
++
++ if (!ret || !tb[CSA_FORCE] || !blobmsg_get_bool(tb[CSA_FORCE]))
++ return ret;
++
++ freq_params = malloc(sizeof(*freq_params));
++ memcpy(freq_params, &css.freq_params, sizeof(*freq_params));
++ eloop_register_timeout(0, 1, switch_chan_fallback_cb,
++ hapd->iface, freq_params);
++
++ return 0;
++#undef SET_CSA_SETTING
++}
++#endif
++
++enum {
++ VENDOR_ELEMENTS,
++ __VENDOR_ELEMENTS_MAX
++};
++
++static const struct blobmsg_policy ve_policy[__VENDOR_ELEMENTS_MAX] = {
++ /* vendor elements are provided as hex-string */
++ [VENDOR_ELEMENTS] = { "vendor_elements", BLOBMSG_TYPE_STRING },
++};
++
++static int
++hostapd_vendor_elements(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ struct blob_attr *tb[__VENDOR_ELEMENTS_MAX];
++ struct hostapd_data *hapd = get_hapd_from_object(obj);
++ struct hostapd_bss_config *bss = hapd->conf;
++ struct wpabuf *elems;
++ const char *pos;
++ size_t len;
++
++ blobmsg_parse(ve_policy, __VENDOR_ELEMENTS_MAX, tb,
++ blob_data(msg), blob_len(msg));
++
++ if (!tb[VENDOR_ELEMENTS])
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ pos = blobmsg_data(tb[VENDOR_ELEMENTS]);
++ len = os_strlen(pos);
++ if (len & 0x01)
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ len /= 2;
++ if (len == 0) {
++ wpabuf_free(bss->vendor_elements);
++ bss->vendor_elements = NULL;
++ return 0;
++ }
++
++ elems = wpabuf_alloc(len);
++ if (elems == NULL)
++ return 1;
++
++ if (hexstr2bin(pos, wpabuf_put(elems, len), len)) {
++ wpabuf_free(elems);
++ return UBUS_STATUS_INVALID_ARGUMENT;
++ }
++
++ wpabuf_free(bss->vendor_elements);
++ bss->vendor_elements = elems;
++
++ /* update beacons if vendor elements were set successfully */
++ if (ieee802_11_update_beacons(hapd->iface) != 0)
++ return UBUS_STATUS_NOT_SUPPORTED;
++ return UBUS_STATUS_OK;
++}
++
++static void
++hostapd_rrm_print_nr(struct hostapd_neighbor_entry *nr)
++{
++ const u8 *data;
++ char *str;
++ int len;
++
++ blobmsg_printf(&b, "", MACSTR, MAC2STR(nr->bssid));
++
++ str = blobmsg_alloc_string_buffer(&b, "", nr->ssid.ssid_len + 1);
++ memcpy(str, nr->ssid.ssid, nr->ssid.ssid_len);
++ str[nr->ssid.ssid_len] = 0;
++ blobmsg_add_string_buffer(&b);
++
++ len = wpabuf_len(nr->nr);
++ str = blobmsg_alloc_string_buffer(&b, "", 2 * len + 1);
++ wpa_snprintf_hex(str, 2 * len + 1, wpabuf_head_u8(nr->nr), len);
++ blobmsg_add_string_buffer(&b);
++}
++
++enum {
++ BSS_MGMT_EN_NEIGHBOR,
++ BSS_MGMT_EN_BEACON,
++ BSS_MGMT_EN_LINK_MEASUREMENT,
++#ifdef CONFIG_WNM_AP
++ BSS_MGMT_EN_BSS_TRANSITION,
++#endif
++ __BSS_MGMT_EN_MAX
++};
++
++static bool
++__hostapd_bss_mgmt_enable_f(struct hostapd_data *hapd, int flag)
++{
++ struct hostapd_bss_config *bss = hapd->conf;
++ uint32_t flags;
++
++ switch (flag) {
++ case BSS_MGMT_EN_NEIGHBOR:
++ if (bss->radio_measurements[0] &
++ WLAN_RRM_CAPS_NEIGHBOR_REPORT)
++ return false;
++
++ bss->radio_measurements[0] |=
++ WLAN_RRM_CAPS_NEIGHBOR_REPORT;
++ hostapd_neighbor_set_own_report(hapd);
++ return true;
++ case BSS_MGMT_EN_BEACON:
++ flags = WLAN_RRM_CAPS_BEACON_REPORT_PASSIVE |
++ WLAN_RRM_CAPS_BEACON_REPORT_ACTIVE |
++ WLAN_RRM_CAPS_BEACON_REPORT_TABLE;
++
++ if (bss->radio_measurements[0] & flags == flags)
++ return false;
++
++ bss->radio_measurements[0] |= (u8) flags;
++ return true;
++ case BSS_MGMT_EN_LINK_MEASUREMENT:
++ flags = WLAN_RRM_CAPS_LINK_MEASUREMENT;
++
++ if (bss->radio_measurements[0] & flags == flags)
++ return false;
++
++ bss->radio_measurements[0] |= (u8) flags;
++ return true;
++#ifdef CONFIG_WNM_AP
++ case BSS_MGMT_EN_BSS_TRANSITION:
++ if (bss->bss_transition)
++ return false;
++
++ bss->bss_transition = 1;
++ return true;
++#endif
++ }
++}
++
++static void
++__hostapd_bss_mgmt_enable(struct hostapd_data *hapd, uint32_t flags)
++{
++ bool update = false;
++ int i;
++
++ for (i = 0; i < __BSS_MGMT_EN_MAX; i++) {
++ if (!(flags & (1 << i)))
++ continue;
++
++ update |= __hostapd_bss_mgmt_enable_f(hapd, i);
++ }
++
++ if (update)
++ ieee802_11_update_beacons(hapd->iface);
++}
++
++
++static const struct blobmsg_policy bss_mgmt_enable_policy[__BSS_MGMT_EN_MAX] = {
++ [BSS_MGMT_EN_NEIGHBOR] = { "neighbor_report", BLOBMSG_TYPE_BOOL },
++ [BSS_MGMT_EN_BEACON] = { "beacon_report", BLOBMSG_TYPE_BOOL },
++ [BSS_MGMT_EN_LINK_MEASUREMENT] = { "link_measurement", BLOBMSG_TYPE_BOOL },
++#ifdef CONFIG_WNM_AP
++ [BSS_MGMT_EN_BSS_TRANSITION] = { "bss_transition", BLOBMSG_TYPE_BOOL },
++#endif
++};
++
++static int
++hostapd_bss_mgmt_enable(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++
++{
++ struct hostapd_data *hapd = get_hapd_from_object(obj);
++ struct blob_attr *tb[__BSS_MGMT_EN_MAX];
++ struct blob_attr *cur;
++ uint32_t flags = 0;
++ int i;
++ bool neigh = false, beacon = false;
++
++ blobmsg_parse(bss_mgmt_enable_policy, __BSS_MGMT_EN_MAX, tb, blob_data(msg), blob_len(msg));
++
++ for (i = 0; i < ARRAY_SIZE(tb); i++) {
++ if (!tb[i] || !blobmsg_get_bool(tb[i]))
++ continue;
++
++ flags |= (1 << i);
++ }
++
++ __hostapd_bss_mgmt_enable(hapd, flags);
++
++ return 0;
++}
++
++
++static void
++hostapd_rrm_nr_enable(struct hostapd_data *hapd)
++{
++ __hostapd_bss_mgmt_enable(hapd, 1 << BSS_MGMT_EN_NEIGHBOR);
++}
++
++static int
++hostapd_rrm_nr_get_own(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ struct hostapd_data *hapd = get_hapd_from_object(obj);
++ struct hostapd_neighbor_entry *nr;
++ void *c;
++
++ hostapd_rrm_nr_enable(hapd);
++
++ nr = hostapd_neighbor_get(hapd, hapd->own_addr, NULL);
++ if (!nr)
++ return UBUS_STATUS_NOT_FOUND;
++
++ blob_buf_init(&b, 0);
++
++ c = blobmsg_open_array(&b, "value");
++ hostapd_rrm_print_nr(nr);
++ blobmsg_close_array(&b, c);
++
++ ubus_send_reply(ctx, req, b.head);
++
++ return 0;
++}
++
++static int
++hostapd_rrm_nr_list(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ struct hostapd_data *hapd = get_hapd_from_object(obj);
++ struct hostapd_neighbor_entry *nr;
++ void *c;
++
++ hostapd_rrm_nr_enable(hapd);
++ blob_buf_init(&b, 0);
++
++ c = blobmsg_open_array(&b, "list");
++ dl_list_for_each(nr, &hapd->nr_db, struct hostapd_neighbor_entry, list) {
++ void *cur;
++
++ if (!memcmp(nr->bssid, hapd->own_addr, ETH_ALEN))
++ continue;
++
++ cur = blobmsg_open_array(&b, NULL);
++ hostapd_rrm_print_nr(nr);
++ blobmsg_close_array(&b, cur);
++ }
++ blobmsg_close_array(&b, c);
++
++ ubus_send_reply(ctx, req, b.head);
++
++ return 0;
++}
++
++enum {
++ NR_SET_LIST,
++ __NR_SET_LIST_MAX
++};
++
++static const struct blobmsg_policy nr_set_policy[__NR_SET_LIST_MAX] = {
++ [NR_SET_LIST] = { "list", BLOBMSG_TYPE_ARRAY },
++};
++
++
++static void
++hostapd_rrm_nr_clear(struct hostapd_data *hapd)
++{
++ struct hostapd_neighbor_entry *nr;
++
++restart:
++ dl_list_for_each(nr, &hapd->nr_db, struct hostapd_neighbor_entry, list) {
++ if (!memcmp(nr->bssid, hapd->own_addr, ETH_ALEN))
++ continue;
++
++ hostapd_neighbor_remove(hapd, nr->bssid, &nr->ssid);
++ goto restart;
++ }
++}
++
++static int
++hostapd_rrm_nr_set(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ static const struct blobmsg_policy nr_e_policy[] = {
++ { .type = BLOBMSG_TYPE_STRING },
++ { .type = BLOBMSG_TYPE_STRING },
++ { .type = BLOBMSG_TYPE_STRING },
++ };
++ struct hostapd_data *hapd = get_hapd_from_object(obj);
++ struct blob_attr *tb_l[__NR_SET_LIST_MAX];
++ struct blob_attr *tb[ARRAY_SIZE(nr_e_policy)];
++ struct blob_attr *cur;
++ int rem;
++
++ hostapd_rrm_nr_enable(hapd);
++
++ blobmsg_parse(nr_set_policy, __NR_SET_LIST_MAX, tb_l, blob_data(msg), blob_len(msg));
++ if (!tb_l[NR_SET_LIST])
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ hostapd_rrm_nr_clear(hapd);
++ blobmsg_for_each_attr(cur, tb_l[NR_SET_LIST], rem) {
++ struct wpa_ssid_value ssid;
++ struct wpabuf *data;
++ u8 bssid[ETH_ALEN];
++ char *s, *nr_s;
++
++ blobmsg_parse_array(nr_e_policy, ARRAY_SIZE(nr_e_policy), tb, blobmsg_data(cur), blobmsg_data_len(cur));
++ if (!tb[0] || !tb[1] || !tb[2])
++ goto invalid;
++
++ /* Neighbor Report binary */
++ nr_s = blobmsg_get_string(tb[2]);
++ data = wpabuf_parse_bin(nr_s);
++ if (!data)
++ goto invalid;
++
++ /* BSSID */
++ s = blobmsg_get_string(tb[0]);
++ if (strlen(s) == 0) {
++ /* Copy BSSID from neighbor report */
++ if (hwaddr_compact_aton(nr_s, bssid))
++ goto invalid;
++ } else if (hwaddr_aton(s, bssid)) {
++ goto invalid;
++ }
++
++ /* SSID */
++ s = blobmsg_get_string(tb[1]);
++ if (strlen(s) == 0) {
++ /* Copy SSID from hostapd BSS conf */
++ memcpy(&ssid, &hapd->conf->ssid, sizeof(ssid));
++ } else {
++ ssid.ssid_len = strlen(s);
++ if (ssid.ssid_len > sizeof(ssid.ssid))
++ goto invalid;
++
++ memcpy(&ssid, s, ssid.ssid_len);
++ }
++
++ hostapd_neighbor_set(hapd, bssid, &ssid, data, NULL, NULL, 0, 0);
++ wpabuf_free(data);
++ continue;
++
++invalid:
++ return UBUS_STATUS_INVALID_ARGUMENT;
++ }
++
++ return 0;
++}
++
++enum {
++ BEACON_REQ_ADDR,
++ BEACON_REQ_MODE,
++ BEACON_REQ_OP_CLASS,
++ BEACON_REQ_CHANNEL,
++ BEACON_REQ_DURATION,
++ BEACON_REQ_BSSID,
++ BEACON_REQ_SSID,
++ __BEACON_REQ_MAX,
++};
++
++static const struct blobmsg_policy beacon_req_policy[__BEACON_REQ_MAX] = {
++ [BEACON_REQ_ADDR] = { "addr", BLOBMSG_TYPE_STRING },
++ [BEACON_REQ_OP_CLASS] { "op_class", BLOBMSG_TYPE_INT32 },
++ [BEACON_REQ_CHANNEL] { "channel", BLOBMSG_TYPE_INT32 },
++ [BEACON_REQ_DURATION] { "duration", BLOBMSG_TYPE_INT32 },
++ [BEACON_REQ_MODE] { "mode", BLOBMSG_TYPE_INT32 },
++ [BEACON_REQ_BSSID] { "bssid", BLOBMSG_TYPE_STRING },
++ [BEACON_REQ_SSID] { "ssid", BLOBMSG_TYPE_STRING },
++};
++
++static int
++hostapd_rrm_beacon_req(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *ureq, const char *method,
++ struct blob_attr *msg)
++{
++ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++ struct blob_attr *tb[__BEACON_REQ_MAX];
++ struct blob_attr *cur;
++ struct wpabuf *req;
++ u8 bssid[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
++ u8 addr[ETH_ALEN];
++ int mode, rem, ret;
++ int buf_len = 13;
++
++ blobmsg_parse(beacon_req_policy, __BEACON_REQ_MAX, tb, blob_data(msg), blob_len(msg));
++
++ if (!tb[BEACON_REQ_ADDR] || !tb[BEACON_REQ_MODE] || !tb[BEACON_REQ_DURATION] ||
++ !tb[BEACON_REQ_OP_CLASS] || !tb[BEACON_REQ_CHANNEL])
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ if (tb[BEACON_REQ_SSID])
++ buf_len += blobmsg_data_len(tb[BEACON_REQ_SSID]) + 2 - 1;
++
++ mode = blobmsg_get_u32(tb[BEACON_REQ_MODE]);
++ if (hwaddr_aton(blobmsg_data(tb[BEACON_REQ_ADDR]), addr))
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ if (tb[BEACON_REQ_BSSID] &&
++ hwaddr_aton(blobmsg_data(tb[BEACON_REQ_BSSID]), bssid))
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ req = wpabuf_alloc(buf_len);
++ if (!req)
++ return UBUS_STATUS_UNKNOWN_ERROR;
++
++ /* 1: regulatory class */
++ wpabuf_put_u8(req, blobmsg_get_u32(tb[BEACON_REQ_OP_CLASS]));
++
++ /* 2: channel number */
++ wpabuf_put_u8(req, blobmsg_get_u32(tb[BEACON_REQ_CHANNEL]));
++
++ /* 3-4: randomization interval */
++ wpabuf_put_le16(req, 0);
++
++ /* 5-6: duration */
++ wpabuf_put_le16(req, blobmsg_get_u32(tb[BEACON_REQ_DURATION]));
++
++ /* 7: mode */
++ wpabuf_put_u8(req, blobmsg_get_u32(tb[BEACON_REQ_MODE]));
++
++ /* 8-13: BSSID */
++ wpabuf_put_data(req, bssid, ETH_ALEN);
++
++ if ((cur = tb[BEACON_REQ_SSID]) != NULL) {
++ wpabuf_put_u8(req, WLAN_EID_SSID);
++ wpabuf_put_u8(req, blobmsg_data_len(cur) - 1);
++ wpabuf_put_data(req, blobmsg_data(cur), blobmsg_data_len(cur) - 1);
++ }
++
++ ret = hostapd_send_beacon_req(hapd, addr, 0, req);
++ if (ret < 0)
++ return -ret;
++
++ return 0;
++}
++
++enum {
++ LM_REQ_ADDR,
++ LM_REQ_TX_POWER_USED,
++ LM_REQ_TX_POWER_MAX,
++ __LM_REQ_MAX,
++};
++
++static const struct blobmsg_policy lm_req_policy[__LM_REQ_MAX] = {
++ [LM_REQ_ADDR] = { "addr", BLOBMSG_TYPE_STRING },
++ [LM_REQ_TX_POWER_USED] = { "tx-power-used", BLOBMSG_TYPE_INT32 },
++ [LM_REQ_TX_POWER_MAX] = { "tx-power-max", BLOBMSG_TYPE_INT32 },
++};
++
++static int
++hostapd_rrm_lm_req(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *ureq, const char *method,
++ struct blob_attr *msg)
++{
++ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++ struct blob_attr *tb[__LM_REQ_MAX];
++ struct wpabuf *buf;
++ u8 addr[ETH_ALEN];
++ int ret;
++ int8_t txp_used, txp_max;
++
++ txp_used = 0;
++ txp_max = 0;
++
++ blobmsg_parse(lm_req_policy, __LM_REQ_MAX, tb, blob_data(msg), blob_len(msg));
++
++ if (!tb[LM_REQ_ADDR])
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ if (tb[LM_REQ_TX_POWER_USED])
++ txp_used = (int8_t) blobmsg_get_u32(tb[LM_REQ_TX_POWER_USED]);
++
++ if (tb[LM_REQ_TX_POWER_MAX])
++ txp_max = (int8_t) blobmsg_get_u32(tb[LM_REQ_TX_POWER_MAX]);
++
++ if (hwaddr_aton(blobmsg_data(tb[LM_REQ_ADDR]), addr))
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ buf = wpabuf_alloc(5);
++ if (!buf)
++ return UBUS_STATUS_UNKNOWN_ERROR;
++
++ wpabuf_put_u8(buf, WLAN_ACTION_RADIO_MEASUREMENT);
++ wpabuf_put_u8(buf, WLAN_RRM_LINK_MEASUREMENT_REQUEST);
++ wpabuf_put_u8(buf, 1);
++ /* TX-Power used */
++ wpabuf_put_u8(buf, txp_used);
++ /* Max TX Power */
++ wpabuf_put_u8(buf, txp_max);
++
++ ret = hostapd_drv_send_action(hapd, hapd->iface->freq, 0, addr,
++ wpabuf_head(buf), wpabuf_len(buf));
++
++ wpabuf_free(buf);
++ if (ret < 0)
++ return -ret;
++
++ return 0;
++}
++
++
++void hostapd_ubus_handle_link_measurement(struct hostapd_data *hapd, const u8 *data, size_t len)
++{
++ const struct ieee80211_mgmt *mgmt = (const struct ieee80211_mgmt *) data;
++ const u8 *pos, *end;
++ u8 token;
++
++ end = data + len;
++ token = mgmt->u.action.u.rrm.dialog_token;
++ pos = mgmt->u.action.u.rrm.variable;
++
++ if (end - pos < 8)
++ return;
++
++ if (!hapd->ubus.obj.has_subscribers)
++ return;
++
++ blob_buf_init(&b, 0);
++ blobmsg_add_macaddr(&b, "address", mgmt->sa);
++ blobmsg_add_u16(&b, "dialog-token", token);
++ blobmsg_add_u16(&b, "rx-antenna-id", pos[4]);
++ blobmsg_add_u16(&b, "tx-antenna-id", pos[5]);
++ blobmsg_add_u16(&b, "rcpi", pos[6]);
++ blobmsg_add_u16(&b, "rsni", pos[7]);
++
++ ubus_notify(ctx, &hapd->ubus.obj, "link-measurement-report", b.head, -1);
++}
++
++
++#ifdef CONFIG_WNM_AP
++
++static int
++hostapd_bss_tr_send(struct hostapd_data *hapd, u8 *addr, bool disassoc_imminent, bool abridged,
++ u16 disassoc_timer, u8 validity_period, u8 dialog_token,
++ struct blob_attr *neighbors, u8 mbo_reason, u8 cell_pref, u8 reassoc_delay)
++{
++ struct blob_attr *cur;
++ struct sta_info *sta;
++ int nr_len = 0;
++ int rem;
++ u8 *nr = NULL;
++ u8 req_mode = 0;
++ u8 mbo[10];
++ size_t mbo_len = 0;
++
++ sta = ap_get_sta(hapd, addr);
++ if (!sta)
++ return UBUS_STATUS_NOT_FOUND;
++
++ if (neighbors) {
++ u8 *nr_cur;
++
++ if (blobmsg_check_array(neighbors,
++ BLOBMSG_TYPE_STRING) < 0)
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ blobmsg_for_each_attr(cur, neighbors, rem) {
++ int len = strlen(blobmsg_get_string(cur));
++
++ if (len % 2)
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ nr_len += (len / 2) + 2;
++ }
++
++ if (nr_len) {
++ nr = os_zalloc(nr_len);
++ if (!nr)
++ return UBUS_STATUS_UNKNOWN_ERROR;
++ }
++
++ nr_cur = nr;
++ blobmsg_for_each_attr(cur, neighbors, rem) {
++ int len = strlen(blobmsg_get_string(cur)) / 2;
++
++ *nr_cur++ = WLAN_EID_NEIGHBOR_REPORT;
++ *nr_cur++ = (u8) len;
++ if (hexstr2bin(blobmsg_data(cur), nr_cur, len)) {
++ free(nr);
++ return UBUS_STATUS_INVALID_ARGUMENT;
++ }
++
++ nr_cur += len;
++ }
++ }
++
++ if (nr)
++ req_mode |= WNM_BSS_TM_REQ_PREF_CAND_LIST_INCLUDED;
++
++ if (abridged)
++ req_mode |= WNM_BSS_TM_REQ_ABRIDGED;
++
++ if (disassoc_imminent)
++ req_mode |= WNM_BSS_TM_REQ_DISASSOC_IMMINENT;
++
++#ifdef CONFIG_MBO
++ u8 *mbo_pos = mbo;
++
++ if (mbo_reason > MBO_TRANSITION_REASON_PREMIUM_AP)
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ if (cell_pref != 0 && cell_pref != 1 && cell_pref != 255)
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ if (reassoc_delay > 65535 || (reassoc_delay && !disassoc_imminent))
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ *mbo_pos++ = MBO_ATTR_ID_TRANSITION_REASON;
++ *mbo_pos++ = 1;
++ *mbo_pos++ = mbo_reason;
++ *mbo_pos++ = MBO_ATTR_ID_CELL_DATA_PREF;
++ *mbo_pos++ = 1;
++ *mbo_pos++ = cell_pref;
++
++ if (reassoc_delay) {
++ *mbo_pos++ = MBO_ATTR_ID_ASSOC_RETRY_DELAY;
++ *mbo_pos++ = 2;
++ WPA_PUT_LE16(mbo_pos, reassoc_delay);
++ mbo_pos += 2;
++ }
++
++ mbo_len = mbo_pos - mbo;
++#endif
++
++ if (wnm_send_bss_tm_req(hapd, sta, req_mode, disassoc_timer, validity_period, NULL,
++ dialog_token, NULL, nr, nr_len, mbo_len ? mbo : NULL, mbo_len))
++ return UBUS_STATUS_UNKNOWN_ERROR;
++
++ return 0;
++}
++
++enum {
++ BSS_TR_ADDR,
++ BSS_TR_DA_IMMINENT,
++ BSS_TR_DA_TIMER,
++ BSS_TR_VALID_PERIOD,
++ BSS_TR_NEIGHBORS,
++ BSS_TR_ABRIDGED,
++ BSS_TR_DIALOG_TOKEN,
++#ifdef CONFIG_MBO
++ BSS_TR_MBO_REASON,
++ BSS_TR_CELL_PREF,
++ BSS_TR_REASSOC_DELAY,
++#endif
++ __BSS_TR_DISASSOC_MAX
++};
++
++static const struct blobmsg_policy bss_tr_policy[__BSS_TR_DISASSOC_MAX] = {
++ [BSS_TR_ADDR] = { "addr", BLOBMSG_TYPE_STRING },
++ [BSS_TR_DA_IMMINENT] = { "disassociation_imminent", BLOBMSG_TYPE_BOOL },
++ [BSS_TR_DA_TIMER] = { "disassociation_timer", BLOBMSG_TYPE_INT32 },
++ [BSS_TR_VALID_PERIOD] = { "validity_period", BLOBMSG_TYPE_INT32 },
++ [BSS_TR_NEIGHBORS] = { "neighbors", BLOBMSG_TYPE_ARRAY },
++ [BSS_TR_ABRIDGED] = { "abridged", BLOBMSG_TYPE_BOOL },
++ [BSS_TR_DIALOG_TOKEN] = { "dialog_token", BLOBMSG_TYPE_INT32 },
++#ifdef CONFIG_MBO
++ [BSS_TR_MBO_REASON] = { "mbo_reason", BLOBMSG_TYPE_INT32 },
++ [BSS_TR_CELL_PREF] = { "cell_pref", BLOBMSG_TYPE_INT32 },
++ [BSS_TR_REASSOC_DELAY] = { "reassoc_delay", BLOBMSG_TYPE_INT32 },
++#endif
++};
++
++static int
++hostapd_bss_transition_request(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *ureq, const char *method,
++ struct blob_attr *msg)
++{
++ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++ struct blob_attr *tb[__BSS_TR_DISASSOC_MAX];
++ struct sta_info *sta;
++ u32 da_timer = 0;
++ u32 valid_period = 0;
++ u8 addr[ETH_ALEN];
++ u32 dialog_token = 1;
++ bool abridged;
++ bool da_imminent;
++ u8 mbo_reason;
++ u8 cell_pref;
++ u8 reassoc_delay;
++
++ blobmsg_parse(bss_tr_policy, __BSS_TR_DISASSOC_MAX, tb, blob_data(msg), blob_len(msg));
++
++ if (!tb[BSS_TR_ADDR])
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ if (hwaddr_aton(blobmsg_data(tb[BSS_TR_ADDR]), addr))
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ if (tb[BSS_TR_DA_TIMER])
++ da_timer = blobmsg_get_u32(tb[BSS_TR_DA_TIMER]);
++
++ if (tb[BSS_TR_VALID_PERIOD])
++ valid_period = blobmsg_get_u32(tb[BSS_TR_VALID_PERIOD]);
++
++ if (tb[BSS_TR_DIALOG_TOKEN])
++ dialog_token = blobmsg_get_u32(tb[BSS_TR_DIALOG_TOKEN]);
++
++ da_imminent = !!(tb[BSS_TR_DA_IMMINENT] && blobmsg_get_bool(tb[BSS_TR_DA_IMMINENT]));
++ abridged = !!(tb[BSS_TR_ABRIDGED] && blobmsg_get_bool(tb[BSS_TR_ABRIDGED]));
++
++#ifdef CONFIG_MBO
++ if (tb[BSS_TR_MBO_REASON])
++ mbo_reason = blobmsg_get_u32(tb[BSS_TR_MBO_REASON]);
++
++ if (tb[BSS_TR_CELL_PREF])
++ cell_pref = blobmsg_get_u32(tb[BSS_TR_CELL_PREF]);
++
++ if (tb[BSS_TR_REASSOC_DELAY])
++ reassoc_delay = blobmsg_get_u32(tb[BSS_TR_REASSOC_DELAY]);
++#endif
++
++ return hostapd_bss_tr_send(hapd, addr, da_imminent, abridged, da_timer, valid_period,
++ dialog_token, tb[BSS_TR_NEIGHBORS], mbo_reason, cell_pref, reassoc_delay);
++}
++#endif
++
++#ifdef CONFIG_AIRTIME_POLICY
++enum {
++ UPDATE_AIRTIME_STA,
++ UPDATE_AIRTIME_WEIGHT,
++ __UPDATE_AIRTIME_MAX,
++};
++
++
++static const struct blobmsg_policy airtime_policy[__UPDATE_AIRTIME_MAX] = {
++ [UPDATE_AIRTIME_STA] = { "sta", BLOBMSG_TYPE_STRING },
++ [UPDATE_AIRTIME_WEIGHT] = { "weight", BLOBMSG_TYPE_INT32 },
++};
++
++static int
++hostapd_bss_update_airtime(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *ureq, const char *method,
++ struct blob_attr *msg)
++{
++ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++ struct blob_attr *tb[__UPDATE_AIRTIME_MAX];
++ struct sta_info *sta = NULL;
++ u8 addr[ETH_ALEN];
++ int weight;
++
++ blobmsg_parse(airtime_policy, __UPDATE_AIRTIME_MAX, tb, blob_data(msg), blob_len(msg));
++
++ if (!tb[UPDATE_AIRTIME_WEIGHT])
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ weight = blobmsg_get_u32(tb[UPDATE_AIRTIME_WEIGHT]);
++
++ if (!tb[UPDATE_AIRTIME_STA]) {
++ if (!weight)
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ hapd->conf->airtime_weight = weight;
++ return 0;
++ }
++
++ if (hwaddr_aton(blobmsg_data(tb[UPDATE_AIRTIME_STA]), addr))
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ sta = ap_get_sta(hapd, addr);
++ if (!sta)
++ return UBUS_STATUS_NOT_FOUND;
++
++ sta->dyn_airtime_weight = weight;
++ airtime_policy_new_sta(hapd, sta);
++
++ return 0;
++}
++#endif
++
++#ifdef CONFIG_TAXONOMY
++static const struct blobmsg_policy addr_policy[] = {
++ { "address", BLOBMSG_TYPE_STRING }
++};
++
++static bool
++hostapd_add_b64_data(const char *name, const struct wpabuf *buf)
++{
++ char *str;
++
++ if (!buf)
++ return false;
++
++ str = blobmsg_alloc_string_buffer(&b, name, B64_ENCODE_LEN(wpabuf_len(buf)));
++ b64_encode(wpabuf_head(buf), wpabuf_len(buf), str, B64_ENCODE_LEN(wpabuf_len(buf)));
++ blobmsg_add_string_buffer(&b);
++
++ return true;
++}
++
++static int
++hostapd_bss_get_sta_ies(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++ struct blob_attr *tb;
++ struct sta_info *sta;
++ u8 addr[ETH_ALEN];
++
++ blobmsg_parse(addr_policy, 1, &tb, blobmsg_data(msg), blobmsg_len(msg));
++
++ if (!tb || hwaddr_aton(blobmsg_data(tb), addr))
++ return UBUS_STATUS_INVALID_ARGUMENT;
++
++ sta = ap_get_sta(hapd, addr);
++ if (!sta || (!sta->probe_ie_taxonomy && !sta->assoc_ie_taxonomy))
++ return UBUS_STATUS_NOT_FOUND;
++
++ blob_buf_init(&b, 0);
++ hostapd_add_b64_data("probe_ie", sta->probe_ie_taxonomy);
++ hostapd_add_b64_data("assoc_ie", sta->assoc_ie_taxonomy);
++ ubus_send_reply(ctx, req, b.head);
++
++ return 0;
++}
++#endif
++
++
++static const struct ubus_method bss_methods[] = {
++ UBUS_METHOD_NOARG("reload", hostapd_bss_reload),
++ UBUS_METHOD_NOARG("get_clients", hostapd_bss_get_clients),
++#ifdef CONFIG_TAXONOMY
++ UBUS_METHOD("get_sta_ies", hostapd_bss_get_sta_ies, addr_policy),
++#endif
++ UBUS_METHOD_NOARG("get_status", hostapd_bss_get_status),
++ UBUS_METHOD("del_client", hostapd_bss_del_client, del_policy),
++#ifdef CONFIG_AIRTIME_POLICY
++ UBUS_METHOD("update_airtime", hostapd_bss_update_airtime, airtime_policy),
++#endif
++ UBUS_METHOD_NOARG("list_bans", hostapd_bss_list_bans),
++#ifdef CONFIG_WPS
++ UBUS_METHOD_NOARG("wps_start", hostapd_bss_wps_start),
++ UBUS_METHOD_NOARG("wps_status", hostapd_bss_wps_status),
++ UBUS_METHOD_NOARG("wps_cancel", hostapd_bss_wps_cancel),
++#endif
++ UBUS_METHOD_NOARG("update_beacon", hostapd_bss_update_beacon),
++ UBUS_METHOD_NOARG("get_features", hostapd_bss_get_features),
++#ifdef NEED_AP_MLME
++ UBUS_METHOD("switch_chan", hostapd_switch_chan, csa_policy),
++#endif
++ UBUS_METHOD("set_vendor_elements", hostapd_vendor_elements, ve_policy),
++ UBUS_METHOD("notify_response", hostapd_notify_response, notify_policy),
++ UBUS_METHOD("bss_mgmt_enable", hostapd_bss_mgmt_enable, bss_mgmt_enable_policy),
++ UBUS_METHOD_NOARG("rrm_nr_get_own", hostapd_rrm_nr_get_own),
++ UBUS_METHOD_NOARG("rrm_nr_list", hostapd_rrm_nr_list),
++ UBUS_METHOD("rrm_nr_set", hostapd_rrm_nr_set, nr_set_policy),
++ UBUS_METHOD("rrm_beacon_req", hostapd_rrm_beacon_req, beacon_req_policy),
++ UBUS_METHOD("link_measurement_req", hostapd_rrm_lm_req, lm_req_policy),
++#ifdef CONFIG_WNM_AP
++ UBUS_METHOD("bss_transition_request", hostapd_bss_transition_request, bss_tr_policy),
++#endif
++};
++
++static struct ubus_object_type bss_object_type =
++ UBUS_OBJECT_TYPE("hostapd_bss", bss_methods);
++
++static int avl_compare_macaddr(const void *k1, const void *k2, void *ptr)
++{
++ return memcmp(k1, k2, ETH_ALEN);
++}
++
++void hostapd_ubus_add_bss(struct hostapd_data *hapd)
++{
++ struct ubus_object *obj = &hapd->ubus.obj;
++ char *name;
++ int ret;
++
++#ifdef CONFIG_MESH
++ if (hapd->conf->mesh & MESH_ENABLED)
++ return;
++#endif
++
++ if (!hostapd_ubus_init())
++ return;
++
++ if (asprintf(&name, "hostapd.%s", hapd->conf->iface) < 0)
++ return;
++
++ avl_init(&hapd->ubus.banned, avl_compare_macaddr, false, NULL);
++ obj->name = name;
++ obj->type = &bss_object_type;
++ obj->methods = bss_object_type.methods;
++ obj->n_methods = bss_object_type.n_methods;
++ ret = ubus_add_object(ctx, obj);
++ hostapd_ubus_ref_inc();
++}
++
++void hostapd_ubus_free_bss(struct hostapd_data *hapd)
++{
++ struct ubus_object *obj = &hapd->ubus.obj;
++ char *name = (char *) obj->name;
++
++#ifdef CONFIG_MESH
++ if (hapd->conf->mesh & MESH_ENABLED)
++ return;
++#endif
++
++ if (!ctx)
++ return;
++
++ if (obj->id) {
++ ubus_remove_object(ctx, obj);
++ hostapd_ubus_ref_dec();
++ }
++
++ free(name);
++}
++
++static void
++hostapd_ubus_vlan_action(struct hostapd_data *hapd, struct hostapd_vlan *vlan,
++ const char *action)
++{
++ struct vlan_description *desc = &vlan->vlan_desc;
++ void *c;
++ int i;
++
++ if (!hapd->ubus.obj.has_subscribers)
++ return;
++
++ blob_buf_init(&b, 0);
++ blobmsg_add_string(&b, "ifname", vlan->ifname);
++ blobmsg_add_string(&b, "bridge", vlan->bridge);
++ blobmsg_add_u32(&b, "vlan_id", vlan->vlan_id);
++
++ if (desc->notempty) {
++ blobmsg_add_u32(&b, "untagged", desc->untagged);
++ c = blobmsg_open_array(&b, "tagged");
++ for (i = 0; i < ARRAY_SIZE(desc->tagged) && desc->tagged[i]; i++)
++ blobmsg_add_u32(&b, "", desc->tagged[i]);
++ blobmsg_close_array(&b, c);
++ }
++
++ ubus_notify(ctx, &hapd->ubus.obj, action, b.head, -1);
++}
++
++void hostapd_ubus_add_vlan(struct hostapd_data *hapd, struct hostapd_vlan *vlan)
++{
++ hostapd_ubus_vlan_action(hapd, vlan, "vlan_add");
++}
++
++void hostapd_ubus_remove_vlan(struct hostapd_data *hapd, struct hostapd_vlan *vlan)
++{
++ hostapd_ubus_vlan_action(hapd, vlan, "vlan_remove");
++}
++
++struct ubus_event_req {
++ struct ubus_notify_request nreq;
++ int resp;
++};
++
++static void
++ubus_event_cb(struct ubus_notify_request *req, int idx, int ret)
++{
++ struct ubus_event_req *ureq = container_of(req, struct ubus_event_req, nreq);
++
++ ureq->resp = ret;
++}
++
++int hostapd_ubus_handle_event(struct hostapd_data *hapd, struct hostapd_ubus_request *req)
++{
++ struct ubus_banned_client *ban;
++ const char *types[HOSTAPD_UBUS_TYPE_MAX] = {
++ [HOSTAPD_UBUS_PROBE_REQ] = "probe",
++ [HOSTAPD_UBUS_AUTH_REQ] = "auth",
++ [HOSTAPD_UBUS_ASSOC_REQ] = "assoc",
++ };
++ const char *type = "mgmt";
++ struct ubus_event_req ureq = {};
++ const u8 *addr;
++
++ if (req->mgmt_frame)
++ addr = req->mgmt_frame->sa;
++ else
++ addr = req->addr;
++
++ ban = avl_find_element(&hapd->ubus.banned, addr, ban, avl);
++ if (ban)
++ return WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA;
++
++ if (!hapd->ubus.obj.has_subscribers)
++ return WLAN_STATUS_SUCCESS;
++
++ if (req->type < ARRAY_SIZE(types))
++ type = types[req->type];
++
++ blob_buf_init(&b, 0);
++ blobmsg_add_macaddr(&b, "address", addr);
++ if (req->mgmt_frame)
++ blobmsg_add_macaddr(&b, "target", req->mgmt_frame->da);
++ if (req->ssi_signal)
++ blobmsg_add_u32(&b, "signal", req->ssi_signal);
++ blobmsg_add_u32(&b, "freq", hapd->iface->freq);
++
++ if (req->elems) {
++ if(req->elems->ht_capabilities)
++ {
++ struct ieee80211_ht_capabilities *ht_capabilities;
++ void *ht_cap, *ht_cap_mcs_set, *mcs_set;
++
++
++ ht_capabilities = (struct ieee80211_ht_capabilities*) req->elems->ht_capabilities;
++ ht_cap = blobmsg_open_table(&b, "ht_capabilities");
++ blobmsg_add_u16(&b, "ht_capabilities_info", ht_capabilities->ht_capabilities_info);
++ ht_cap_mcs_set = blobmsg_open_table(&b, "supported_mcs_set");
++ blobmsg_add_u16(&b, "a_mpdu_params", ht_capabilities->a_mpdu_params);
++ blobmsg_add_u16(&b, "ht_extended_capabilities", ht_capabilities->ht_extended_capabilities);
++ blobmsg_add_u32(&b, "tx_bf_capability_info", ht_capabilities->tx_bf_capability_info);
++ blobmsg_add_u16(&b, "asel_capabilities", ht_capabilities->asel_capabilities);
++ mcs_set = blobmsg_open_array(&b, "supported_mcs_set");
++ for (int i = 0; i < 16; i++) {
++ blobmsg_add_u16(&b, NULL, (u16) ht_capabilities->supported_mcs_set[i]);
++ }
++ blobmsg_close_array(&b, mcs_set);
++ blobmsg_close_table(&b, ht_cap_mcs_set);
++ blobmsg_close_table(&b, ht_cap);
++ }
++ if(req->elems->vht_capabilities)
++ {
++ struct ieee80211_vht_capabilities *vht_capabilities;
++ void *vht_cap, *vht_cap_mcs_set;
++
++ vht_capabilities = (struct ieee80211_vht_capabilities*) req->elems->vht_capabilities;
++ vht_cap = blobmsg_open_table(&b, "vht_capabilities");
++ blobmsg_add_u32(&b, "vht_capabilities_info", vht_capabilities->vht_capabilities_info);
++ vht_cap_mcs_set = blobmsg_open_table(&b, "vht_supported_mcs_set");
++ blobmsg_add_u16(&b, "rx_map", vht_capabilities->vht_supported_mcs_set.rx_map);
++ blobmsg_add_u16(&b, "rx_highest", vht_capabilities->vht_supported_mcs_set.rx_highest);
++ blobmsg_add_u16(&b, "tx_map", vht_capabilities->vht_supported_mcs_set.tx_map);
++ blobmsg_add_u16(&b, "tx_highest", vht_capabilities->vht_supported_mcs_set.tx_highest);
++ blobmsg_close_table(&b, vht_cap_mcs_set);
++ blobmsg_close_table(&b, vht_cap);
++ }
++ }
++
++ if (!hapd->ubus.notify_response) {
++ ubus_notify(ctx, &hapd->ubus.obj, type, b.head, -1);
++ return WLAN_STATUS_SUCCESS;
++ }
++
++ if (ubus_notify_async(ctx, &hapd->ubus.obj, type, b.head, &ureq.nreq))
++ return WLAN_STATUS_SUCCESS;
++
++ ureq.nreq.status_cb = ubus_event_cb;
++ ubus_complete_request(ctx, &ureq.nreq.req, 100);
++
++ if (ureq.resp)
++ return ureq.resp;
++
++ return WLAN_STATUS_SUCCESS;
++}
++
++void hostapd_ubus_notify(struct hostapd_data *hapd, const char *type, const u8 *addr)
++{
++ if (!hapd->ubus.obj.has_subscribers)
++ return;
++
++ if (!addr)
++ return;
++
++ blob_buf_init(&b, 0);
++ blobmsg_add_macaddr(&b, "address", addr);
++
++ ubus_notify(ctx, &hapd->ubus.obj, type, b.head, -1);
++}
++
++void hostapd_ubus_notify_authorized(struct hostapd_data *hapd, struct sta_info *sta,
++ const char *auth_alg)
++{
++ if (!hapd->ubus.obj.has_subscribers)
++ return;
++
++ blob_buf_init(&b, 0);
++ blobmsg_add_macaddr(&b, "address", sta->addr);
++ if (auth_alg)
++ blobmsg_add_string(&b, "auth-alg", auth_alg);
++
++ ubus_notify(ctx, &hapd->ubus.obj, "sta-authorized", b.head, -1);
++}
++
++void hostapd_ubus_notify_beacon_report(
++ struct hostapd_data *hapd, const u8 *addr, u8 token, u8 rep_mode,
++ struct rrm_measurement_beacon_report *rep, size_t len)
++{
++ if (!hapd->ubus.obj.has_subscribers)
++ return;
++
++ if (!addr || !rep)
++ return;
++
++ blob_buf_init(&b, 0);
++ blobmsg_add_macaddr(&b, "address", addr);
++ blobmsg_add_u16(&b, "op-class", rep->op_class);
++ blobmsg_add_u16(&b, "channel", rep->channel);
++ blobmsg_add_u64(&b, "start-time", rep->start_time);
++ blobmsg_add_u16(&b, "duration", rep->duration);
++ blobmsg_add_u16(&b, "report-info", rep->report_info);
++ blobmsg_add_u16(&b, "rcpi", rep->rcpi);
++ blobmsg_add_u16(&b, "rsni", rep->rsni);
++ blobmsg_add_macaddr(&b, "bssid", rep->bssid);
++ blobmsg_add_u16(&b, "antenna-id", rep->antenna_id);
++ blobmsg_add_u16(&b, "parent-tsf", rep->parent_tsf);
++ blobmsg_add_u16(&b, "rep-mode", rep_mode);
++
++ ubus_notify(ctx, &hapd->ubus.obj, "beacon-report", b.head, -1);
++}
++
++void hostapd_ubus_notify_radar_detected(struct hostapd_iface *iface, int frequency,
++ int chan_width, int cf1, int cf2)
++{
++ struct hostapd_data *hapd;
++ int i;
++
++ if (!ctx)
++ return;
++
++ blob_buf_init(&b, 0);
++ blobmsg_add_u16(&b, "frequency", frequency);
++ blobmsg_add_u16(&b, "width", chan_width);
++ blobmsg_add_u16(&b, "center1", cf1);
++ blobmsg_add_u16(&b, "center2", cf2);
++
++ for (i = 0; i < iface->num_bss; i++) {
++ hapd = iface->bss[i];
++ ubus_notify(ctx, &hapd->ubus.obj, "radar-detected", b.head, -1);
++ }
++}
++
++#ifdef CONFIG_WNM_AP
++static void hostapd_ubus_notify_bss_transition_add_candidate_list(
++ const u8 *candidate_list, u16 candidate_list_len)
++{
++ char *cl_str;
++ int i;
++
++ if (candidate_list_len == 0)
++ return;
++
++ cl_str = blobmsg_alloc_string_buffer(&b, "candidate-list", candidate_list_len * 2 + 1);
++ for (i = 0; i < candidate_list_len; i++)
++ snprintf(&cl_str[i*2], 3, "%02X", candidate_list[i]);
++ blobmsg_add_string_buffer(&b);
++
++}
++#endif
++
++void hostapd_ubus_notify_bss_transition_response(
++ struct hostapd_data *hapd, const u8 *addr, u8 dialog_token, u8 status_code,
++ u8 bss_termination_delay, const u8 *target_bssid,
++ const u8 *candidate_list, u16 candidate_list_len)
++{
++#ifdef CONFIG_WNM_AP
++ u16 i;
++
++ if (!hapd->ubus.obj.has_subscribers)
++ return;
++
++ if (!addr)
++ return;
++
++ blob_buf_init(&b, 0);
++ blobmsg_add_macaddr(&b, "address", addr);
++ blobmsg_add_u8(&b, "dialog-token", dialog_token);
++ blobmsg_add_u8(&b, "status-code", status_code);
++ blobmsg_add_u8(&b, "bss-termination-delay", bss_termination_delay);
++ if (target_bssid)
++ blobmsg_add_macaddr(&b, "target-bssid", target_bssid);
++
++ hostapd_ubus_notify_bss_transition_add_candidate_list(candidate_list, candidate_list_len);
++
++ ubus_notify(ctx, &hapd->ubus.obj, "bss-transition-response", b.head, -1);
++#endif
++}
++
++int hostapd_ubus_notify_bss_transition_query(
++ struct hostapd_data *hapd, const u8 *addr, u8 dialog_token, u8 reason,
++ const u8 *candidate_list, u16 candidate_list_len)
++{
++#ifdef CONFIG_WNM_AP
++ struct ubus_event_req ureq = {};
++ char *cl_str;
++ u16 i;
++
++ if (!hapd->ubus.obj.has_subscribers)
++ return 0;
++
++ if (!addr)
++ return 0;
++
++ blob_buf_init(&b, 0);
++ blobmsg_add_macaddr(&b, "address", addr);
++ blobmsg_add_u8(&b, "dialog-token", dialog_token);
++ blobmsg_add_u8(&b, "reason", reason);
++ hostapd_ubus_notify_bss_transition_add_candidate_list(candidate_list, candidate_list_len);
++
++ if (!hapd->ubus.notify_response) {
++ ubus_notify(ctx, &hapd->ubus.obj, "bss-transition-query", b.head, -1);
++ return 0;
++ }
++
++ if (ubus_notify_async(ctx, &hapd->ubus.obj, "bss-transition-query", b.head, &ureq.nreq))
++ return 0;
++
++ ureq.nreq.status_cb = ubus_event_cb;
++ ubus_complete_request(ctx, &ureq.nreq.req, 100);
++
++ return ureq.resp;
++#endif
++}
+diff --git a/src/ap/ubus.h b/src/ap/ubus.h
+new file mode 100644
+index 000000000..b0f7c44ab
+--- /dev/null
++++ b/src/ap/ubus.h
+@@ -0,0 +1,154 @@
++/*
++ * hostapd / ubus support
++ * Copyright (c) 2013, Felix Fietkau <nbd@nbd.name>
++ *
++ * This software may be distributed under the terms of the BSD license.
++ * See README for more details.
++ */
++#ifndef __HOSTAPD_UBUS_H
++#define __HOSTAPD_UBUS_H
++
++enum hostapd_ubus_event_type {
++ HOSTAPD_UBUS_PROBE_REQ,
++ HOSTAPD_UBUS_AUTH_REQ,
++ HOSTAPD_UBUS_ASSOC_REQ,
++ HOSTAPD_UBUS_TYPE_MAX
++};
++
++struct hostapd_ubus_request {
++ enum hostapd_ubus_event_type type;
++ const struct ieee80211_mgmt *mgmt_frame;
++ const struct ieee802_11_elems *elems;
++ int ssi_signal; /* dBm */
++ const u8 *addr;
++};
++
++struct hostapd_iface;
++struct hostapd_data;
++struct hapd_interfaces;
++struct rrm_measurement_beacon_report;
++
++#ifdef UBUS_SUPPORT
++
++#include <libubox/avl.h>
++#include <libubus.h>
++
++struct hostapd_ubus_bss {
++ struct ubus_object obj;
++ struct avl_tree banned;
++ int notify_response;
++};
++
++void hostapd_ubus_add_iface(struct hostapd_iface *iface);
++void hostapd_ubus_free_iface(struct hostapd_iface *iface);
++void hostapd_ubus_add_bss(struct hostapd_data *hapd);
++void hostapd_ubus_free_bss(struct hostapd_data *hapd);
++void hostapd_ubus_add_vlan(struct hostapd_data *hapd, struct hostapd_vlan *vlan);
++void hostapd_ubus_remove_vlan(struct hostapd_data *hapd, struct hostapd_vlan *vlan);
++
++int hostapd_ubus_handle_event(struct hostapd_data *hapd, struct hostapd_ubus_request *req);
++void hostapd_ubus_handle_link_measurement(struct hostapd_data *hapd, const u8 *data, size_t len);
++void hostapd_ubus_notify(struct hostapd_data *hapd, const char *type, const u8 *mac);
++void hostapd_ubus_notify_beacon_report(struct hostapd_data *hapd,
++ const u8 *addr, u8 token, u8 rep_mode,
++ struct rrm_measurement_beacon_report *rep,
++ size_t len);
++void hostapd_ubus_notify_radar_detected(struct hostapd_iface *iface, int frequency,
++ int chan_width, int cf1, int cf2);
++
++void hostapd_ubus_notify_bss_transition_response(
++ struct hostapd_data *hapd, const u8 *addr, u8 dialog_token, u8 status_code,
++ u8 bss_termination_delay, const u8 *target_bssid,
++ const u8 *candidate_list, u16 candidate_list_len);
++void hostapd_ubus_add(struct hapd_interfaces *interfaces);
++void hostapd_ubus_free(struct hapd_interfaces *interfaces);
++int hostapd_ubus_notify_bss_transition_query(
++ struct hostapd_data *hapd, const u8 *addr, u8 dialog_token, u8 reason,
++ const u8 *candidate_list, u16 candidate_list_len);
++void hostapd_ubus_notify_authorized(struct hostapd_data *hapd, struct sta_info *sta,
++ const char *auth_alg);
++
++#else
++
++struct hostapd_ubus_bss {};
++
++static inline void hostapd_ubus_add_iface(struct hostapd_iface *iface)
++{
++}
++
++static inline void hostapd_ubus_free_iface(struct hostapd_iface *iface)
++{
++}
++
++static inline void hostapd_ubus_add_bss(struct hostapd_data *hapd)
++{
++}
++
++static inline void hostapd_ubus_free_bss(struct hostapd_data *hapd)
++{
++}
++
++static inline void hostapd_ubus_add_vlan(struct hostapd_data *hapd, struct hostapd_vlan *vlan)
++{
++}
++
++static inline void hostapd_ubus_remove_vlan(struct hostapd_data *hapd, struct hostapd_vlan *vlan)
++{
++}
++
++static inline int hostapd_ubus_handle_event(struct hostapd_data *hapd, struct hostapd_ubus_request *req)
++{
++ return 0;
++}
++
++static inline void hostapd_ubus_handle_link_measurement(struct hostapd_data *hapd, const u8 *data, size_t len)
++{
++}
++
++static inline void hostapd_ubus_notify(struct hostapd_data *hapd, const char *type, const u8 *mac)
++{
++}
++
++static inline void hostapd_ubus_notify_beacon_report(struct hostapd_data *hapd,
++ const u8 *addr, u8 token,
++ u8 rep_mode,
++ struct rrm_measurement_beacon_report *rep,
++ size_t len)
++{
++}
++static inline void hostapd_ubus_notify_radar_detected(struct hostapd_iface *iface, int frequency,
++ int chan_width, int cf1, int cf2)
++{
++}
++
++static inline void hostapd_ubus_notify_bss_transition_response(
++ struct hostapd_data *hapd, const u8 *addr, u8 dialog_token, u8 status_code,
++ u8 bss_termination_delay, const u8 *target_bssid,
++ const u8 *candidate_list, u16 candidate_list_len)
++{
++}
++
++static inline void hostapd_ubus_add(struct hapd_interfaces *interfaces)
++{
++}
++
++static inline void hostapd_ubus_free(struct hapd_interfaces *interfaces)
++{
++}
++
++static inline int hostapd_ubus_notify_bss_transition_query(
++ struct hostapd_data *hapd, const u8 *addr, u8 dialog_token, u8 reason,
++ const u8 *candidate_list, u16 candidate_list_len)
++{
++ return 0;
++}
++
++static inline void
++hostapd_ubus_notify_authorized(struct hostapd_data *hapd, struct sta_info *sta,
++ const char *auth_alg)
++{
++}
++
++#endif
++
++#endif
+diff --git a/src/ap/ucode.c b/src/ap/ucode.c
+new file mode 100644
+index 000000000..16d1b5153
+--- /dev/null
++++ b/src/ap/ucode.c
+@@ -0,0 +1,813 @@
++#include <sys/un.h>
++
++#include "utils/includes.h"
++#include "utils/common.h"
++#include "utils/ucode.h"
++#include "hostapd.h"
++#include "beacon.h"
++#include "hw_features.h"
++#include "ap_drv_ops.h"
++#include "dfs.h"
++#include "acs.h"
++#include <libubox/uloop.h>
++
++static uc_resource_type_t *global_type, *bss_type, *iface_type;
++static struct hapd_interfaces *interfaces;
++static uc_value_t *global, *bss_registry, *iface_registry;
++static uc_vm_t *vm;
++
++static uc_value_t *
++hostapd_ucode_bss_get_uval(struct hostapd_data *hapd)
++{
++ uc_value_t *val;
++
++ if (hapd->ucode.idx)
++ return wpa_ucode_registry_get(bss_registry, hapd->ucode.idx);
++
++ val = uc_resource_new(bss_type, hapd);
++ hapd->ucode.idx = wpa_ucode_registry_add(bss_registry, val);
++
++ return val;
++}
++
++static uc_value_t *
++hostapd_ucode_iface_get_uval(struct hostapd_iface *hapd)
++{
++ uc_value_t *val;
++
++ if (hapd->ucode.idx)
++ return wpa_ucode_registry_get(iface_registry, hapd->ucode.idx);
++
++ val = uc_resource_new(iface_type, hapd);
++ hapd->ucode.idx = wpa_ucode_registry_add(iface_registry, val);
++
++ return val;
++}
++
++static void
++hostapd_ucode_update_bss_list(struct hostapd_iface *iface, uc_value_t *if_bss, uc_value_t *bss)
++{
++ uc_value_t *list;
++ int i;
++
++ list = ucv_array_new(vm);
++ for (i = 0; i < iface->num_bss; i++) {
++ struct hostapd_data *hapd = iface->bss[i];
++ uc_value_t *val = hostapd_ucode_bss_get_uval(hapd);
++
++ ucv_array_set(list, i, ucv_get(ucv_string_new(hapd->conf->iface)));
++ ucv_object_add(bss, hapd->conf->iface, ucv_get(val));
++ }
++ ucv_object_add(if_bss, iface->phy, ucv_get(list));
++}
++
++static void
++hostapd_ucode_update_interfaces(void)
++{
++ uc_value_t *ifs = ucv_object_new(vm);
++ uc_value_t *if_bss = ucv_array_new(vm);
++ uc_value_t *bss = ucv_object_new(vm);
++ int i;
++
++ for (i = 0; i < interfaces->count; i++) {
++ struct hostapd_iface *iface = interfaces->iface[i];
++
++ ucv_object_add(ifs, iface->phy, ucv_get(hostapd_ucode_iface_get_uval(iface)));
++ hostapd_ucode_update_bss_list(iface, if_bss, bss);
++ }
++
++ ucv_object_add(ucv_prototype_get(global), "interfaces", ucv_get(ifs));
++ ucv_object_add(ucv_prototype_get(global), "interface_bss", ucv_get(if_bss));
++ ucv_object_add(ucv_prototype_get(global), "bss", ucv_get(bss));
++ ucv_gc(vm);
++}
++
++static uc_value_t *
++uc_hostapd_add_iface(uc_vm_t *vm, size_t nargs)
++{
++ uc_value_t *iface = uc_fn_arg(0);
++ int ret;
++
++ if (ucv_type(iface) != UC_STRING)
++ return ucv_int64_new(-1);
++
++ ret = hostapd_add_iface(interfaces, ucv_string_get(iface));
++ hostapd_ucode_update_interfaces();
++
++ return ucv_int64_new(ret);
++}
++
++static uc_value_t *
++uc_hostapd_remove_iface(uc_vm_t *vm, size_t nargs)
++{
++ uc_value_t *iface = uc_fn_arg(0);
++
++ if (ucv_type(iface) != UC_STRING)
++ return NULL;
++
++ hostapd_remove_iface(interfaces, ucv_string_get(iface));
++ hostapd_ucode_update_interfaces();
++
++ return NULL;
++}
++
++static struct hostapd_vlan *
++bss_conf_find_vlan(struct hostapd_bss_config *bss, int id)
++{
++ struct hostapd_vlan *vlan;
++
++ for (vlan = bss->vlan; vlan; vlan = vlan->next)
++ if (vlan->vlan_id == id)
++ return vlan;
++
++ return NULL;
++}
++
++static int
++bss_conf_rename_vlan(struct hostapd_data *hapd, struct hostapd_vlan *vlan,
++ const char *ifname)
++{
++ if (!strcmp(ifname, vlan->ifname))
++ return 0;
++
++ hostapd_drv_if_rename(hapd, WPA_IF_AP_VLAN, vlan->ifname, ifname);
++ os_strlcpy(vlan->ifname, ifname, sizeof(vlan->ifname));
++
++ return 0;
++}
++
++static int
++bss_reload_vlans(struct hostapd_data *hapd, struct hostapd_bss_config *bss)
++{
++ struct hostapd_bss_config *old_bss = hapd->conf;
++ struct hostapd_vlan *vlan, *vlan_new, *wildcard;
++ char ifname[IFNAMSIZ + 1], vlan_ifname[IFNAMSIZ + 1], *pos;
++ int ret;
++
++ vlan = bss_conf_find_vlan(old_bss, VLAN_ID_WILDCARD);
++ wildcard = bss_conf_find_vlan(bss, VLAN_ID_WILDCARD);
++ if (!!vlan != !!wildcard)
++ return -1;
++
++ if (vlan && wildcard && strcmp(vlan->ifname, wildcard->ifname) != 0)
++ strcpy(vlan->ifname, wildcard->ifname);
++ else
++ wildcard = NULL;
++
++ for (vlan = bss->vlan; vlan; vlan = vlan->next) {
++ if (vlan->vlan_id == VLAN_ID_WILDCARD ||
++ vlan->dynamic_vlan > 0)
++ continue;
++
++ if (!bss_conf_find_vlan(old_bss, vlan->vlan_id))
++ return -1;
++ }
++
++ for (vlan = old_bss->vlan; vlan; vlan = vlan->next) {
++ if (vlan->vlan_id == VLAN_ID_WILDCARD)
++ continue;
++
++ if (vlan->dynamic_vlan == 0) {
++ vlan_new = bss_conf_find_vlan(bss, vlan->vlan_id);
++ if (!vlan_new)
++ return -1;
++
++ if (bss_conf_rename_vlan(hapd, vlan, vlan_new->ifname))
++ return -1;
++
++ continue;
++ }
++
++ if (!wildcard)
++ continue;
++
++ os_strlcpy(ifname, wildcard->ifname, sizeof(ifname));
++ pos = os_strchr(ifname, '#');
++ if (!pos)
++ return -1;
++
++ *pos++ = '\0';
++ ret = os_snprintf(vlan_ifname, sizeof(vlan_ifname), "%s%d%s",
++ ifname, vlan->vlan_id, pos);
++ if (os_snprintf_error(sizeof(vlan_ifname), ret))
++ return -1;
++
++ if (bss_conf_rename_vlan(hapd, vlan, vlan_ifname))
++ return -1;
++ }
++
++ return 0;
++}
++
++static uc_value_t *
++uc_hostapd_bss_set_config(uc_vm_t *vm, size_t nargs)
++{
++ struct hostapd_data *hapd = uc_fn_thisval("hostapd.bss");
++ struct hostapd_bss_config *old_bss;
++ struct hostapd_iface *iface;
++ struct hostapd_config *conf;
++ uc_value_t *file = uc_fn_arg(0);
++ uc_value_t *index = uc_fn_arg(1);
++ uc_value_t *files_only = uc_fn_arg(2);
++ unsigned int i, idx = 0;
++ int ret = -1;
++
++ if (!hapd || ucv_type(file) != UC_STRING)
++ goto out;
++
++ if (ucv_type(index) == UC_INTEGER)
++ idx = ucv_int64_get(index);
++
++ iface = hapd->iface;
++ conf = interfaces->config_read_cb(ucv_string_get(file));
++ if (!conf)
++ goto out;
++
++ if (idx > conf->num_bss || !conf->bss[idx])
++ goto free;
++
++ if (ucv_boolean_get(files_only)) {
++ struct hostapd_bss_config *bss = conf->bss[idx];
++ struct hostapd_bss_config *old_bss = hapd->conf;
++
++#define swap_field(name) \
++ do { \
++ void *ptr = old_bss->name; \
++ old_bss->name = bss->name; \
++ bss->name = ptr; \
++ } while (0)
++
++ swap_field(ssid.wpa_psk_file);
++ ret = bss_reload_vlans(hapd, bss);
++ goto done;
++ }
++
++ hostapd_bss_deinit_no_free(hapd);
++ hostapd_drv_stop_ap(hapd);
++ hostapd_free_hapd_data(hapd);
++
++ old_bss = hapd->conf;
++ for (i = 0; i < iface->conf->num_bss; i++)
++ if (iface->conf->bss[i] == hapd->conf)
++ iface->conf->bss[i] = conf->bss[idx];
++ hapd->conf = conf->bss[idx];
++ conf->bss[idx] = old_bss;
++
++ hostapd_setup_bss(hapd, hapd == iface->bss[0], true);
++ hostapd_ucode_update_interfaces();
++
++done:
++ ret = 0;
++free:
++ hostapd_config_free(conf);
++out:
++ return ucv_int64_new(ret);
++}
++
++static void
++hostapd_remove_iface_bss_conf(struct hostapd_config *iconf,
++ struct hostapd_bss_config *conf)
++{
++ int i;
++
++ for (i = 0; i < iconf->num_bss; i++)
++ if (iconf->bss[i] == conf)
++ break;
++
++ if (i == iconf->num_bss)
++ return;
++
++ for (i++; i < iconf->num_bss; i++)
++ iconf->bss[i - 1] = iconf->bss[i];
++ iconf->num_bss--;
++}
++
++
++static uc_value_t *
++uc_hostapd_bss_delete(uc_vm_t *vm, size_t nargs)
++{
++ struct hostapd_data *hapd = uc_fn_thisval("hostapd.bss");
++ struct hostapd_iface *iface;
++ int i, idx;
++
++ if (!hapd)
++ return NULL;
++
++ iface = hapd->iface;
++ if (iface->num_bss == 1) {
++ wpa_printf(MSG_ERROR, "trying to delete last bss of an iface: %s\n", hapd->conf->iface);
++ return NULL;
++ }
++
++ for (idx = 0; idx < iface->num_bss; idx++)
++ if (iface->bss[idx] == hapd)
++ break;
++
++ if (idx == iface->num_bss)
++ return NULL;
++
++ for (i = idx + 1; i < iface->num_bss; i++)
++ iface->bss[i - 1] = iface->bss[i];
++
++ iface->num_bss--;
++
++ iface->bss[0]->interface_added = 0;
++ hostapd_drv_set_first_bss(iface->bss[0]);
++ hapd->interface_added = 1;
++
++ hostapd_drv_stop_ap(hapd);
++ hostapd_bss_deinit(hapd);
++ hostapd_remove_iface_bss_conf(iface->conf, hapd->conf);
++ hostapd_config_free_bss(hapd->conf);
++ os_free(hapd);
++
++ hostapd_ucode_update_interfaces();
++ ucv_gc(vm);
++
++ return NULL;
++}
++
++static uc_value_t *
++uc_hostapd_iface_add_bss(uc_vm_t *vm, size_t nargs)
++{
++ struct hostapd_iface *iface = uc_fn_thisval("hostapd.iface");
++ struct hostapd_bss_config *bss;
++ struct hostapd_config *conf;
++ struct hostapd_data *hapd;
++ uc_value_t *file = uc_fn_arg(0);
++ uc_value_t *index = uc_fn_arg(1);
++ unsigned int idx = 0;
++ uc_value_t *ret = NULL;
++
++ if (!iface || ucv_type(file) != UC_STRING)
++ goto out;
++
++ if (ucv_type(index) == UC_INTEGER)
++ idx = ucv_int64_get(index);
++
++ conf = interfaces->config_read_cb(ucv_string_get(file));
++ if (!conf || idx > conf->num_bss || !conf->bss[idx])
++ goto out;
++
++ bss = conf->bss[idx];
++ hapd = hostapd_alloc_bss_data(iface, iface->conf, bss);
++ if (!hapd)
++ goto out;
++
++ hapd->driver = iface->bss[0]->driver;
++ hapd->drv_priv = iface->bss[0]->drv_priv;
++ if (interfaces->ctrl_iface_init &&
++ interfaces->ctrl_iface_init(hapd) < 0)
++ goto free_hapd;
++
++ if (iface->state == HAPD_IFACE_ENABLED &&
++ hostapd_setup_bss(hapd, -1, true))
++ goto deinit_ctrl;
++
++ iface->bss = os_realloc_array(iface->bss, iface->num_bss + 1,
++ sizeof(*iface->bss));
++ iface->bss[iface->num_bss++] = hapd;
++
++ iface->conf->bss = os_realloc_array(iface->conf->bss,
++ iface->conf->num_bss + 1,
++ sizeof(*iface->conf->bss));
++ iface->conf->bss[iface->conf->num_bss] = bss;
++ conf->bss[idx] = NULL;
++ ret = hostapd_ucode_bss_get_uval(hapd);
++ hostapd_ucode_update_interfaces();
++ goto out;
++
++deinit_ctrl:
++ if (interfaces->ctrl_iface_deinit)
++ interfaces->ctrl_iface_deinit(hapd);
++free_hapd:
++ hostapd_free_hapd_data(hapd);
++ os_free(hapd);
++out:
++ hostapd_config_free(conf);
++ return ret;
++}
++
++static uc_value_t *
++uc_hostapd_iface_set_bss_order(uc_vm_t *vm, size_t nargs)
++{
++ struct hostapd_iface *iface = uc_fn_thisval("hostapd.iface");
++ uc_value_t *bss_list = uc_fn_arg(0);
++ struct hostapd_data **new_bss;
++ struct hostapd_bss_config **new_conf;
++
++ if (!iface)
++ return NULL;
++
++ if (ucv_type(bss_list) != UC_ARRAY ||
++ ucv_array_length(bss_list) != iface->num_bss)
++ return NULL;
++
++ new_bss = calloc(iface->num_bss, sizeof(*new_bss));
++ new_conf = calloc(iface->num_bss, sizeof(*new_conf));
++ for (size_t i = 0; i < iface->num_bss; i++) {
++ struct hostapd_data *bss;
++
++ bss = ucv_resource_data(ucv_array_get(bss_list, i), "hostapd.bss");
++ if (bss->iface != iface)
++ goto free;
++
++ for (size_t k = 0; k < i; k++)
++ if (new_bss[k] == bss)
++ goto free;
++
++ new_bss[i] = bss;
++ new_conf[i] = bss->conf;
++ }
++
++ new_bss[0]->interface_added = 0;
++ for (size_t i = 1; i < iface->num_bss; i++)
++ new_bss[i]->interface_added = 1;
++
++ free(iface->bss);
++ iface->bss = new_bss;
++
++ free(iface->conf->bss);
++ iface->conf->bss = new_conf;
++ iface->conf->num_bss = iface->num_bss;
++ hostapd_drv_set_first_bss(iface->bss[0]);
++
++ return ucv_boolean_new(true);
++
++free:
++ free(new_bss);
++ free(new_conf);
++ return NULL;
++}
++
++static uc_value_t *
++uc_hostapd_bss_ctrl(uc_vm_t *vm, size_t nargs)
++{
++ struct hostapd_data *hapd = uc_fn_thisval("hostapd.bss");
++ uc_value_t *arg = uc_fn_arg(0);
++ struct sockaddr_storage from = {};
++ static char reply[4096];
++ int reply_len;
++
++ if (!hapd || !interfaces->ctrl_iface_recv ||
++ ucv_type(arg) != UC_STRING)
++ return NULL;
++
++ reply_len = interfaces->ctrl_iface_recv(hapd, ucv_string_get(arg),
++ reply, sizeof(reply),
++ &from, sizeof(from));
++ if (reply_len < 0)
++ return NULL;
++
++ if (reply_len && reply[reply_len - 1] == '\n')
++ reply_len--;
++
++ return ucv_string_new_length(reply, reply_len);
++}
++
++static void
++uc_hostapd_disable_iface(struct hostapd_iface *iface)
++{
++ switch (iface->state) {
++ case HAPD_IFACE_DISABLED:
++ break;
++#ifdef CONFIG_ACS
++ case HAPD_IFACE_ACS:
++ acs_cleanup(iface);
++ iface->scan_cb = NULL;
++ /* fallthrough */
++#endif
++ default:
++ hostapd_disable_iface(iface);
++ break;
++ }
++}
++
++static uc_value_t *
++uc_hostapd_iface_stop(uc_vm_t *vm, size_t nargs)
++{
++ struct hostapd_iface *iface = uc_fn_thisval("hostapd.iface");
++ int i;
++
++ if (!iface)
++ return NULL;
++
++ if (iface->state != HAPD_IFACE_ENABLED)
++ uc_hostapd_disable_iface(iface);
++
++ for (i = 0; i < iface->num_bss; i++) {
++ struct hostapd_data *hapd = iface->bss[i];
++
++ hostapd_drv_stop_ap(hapd);
++ hapd->beacon_set_done = 0;
++ }
++
++ return NULL;
++}
++
++static uc_value_t *
++uc_hostapd_iface_start(uc_vm_t *vm, size_t nargs)
++{
++ struct hostapd_iface *iface = uc_fn_thisval("hostapd.iface");
++ uc_value_t *info = uc_fn_arg(0);
++ struct hostapd_config *conf;
++ bool changed = false;
++ uint64_t intval;
++ int i;
++
++ if (!iface)
++ return NULL;
++
++ if (!info) {
++ iface->freq = 0;
++ goto out;
++ }
++
++ if (ucv_type(info) != UC_OBJECT)
++ return NULL;
++
++#define UPDATE_VAL(field, name) \
++ if ((intval = ucv_int64_get(ucv_object_get(info, name, NULL))) && \
++ !errno && intval != conf->field) do { \
++ conf->field = intval; \
++ changed = true; \
++ } while(0)
++
++ conf = iface->conf;
++ UPDATE_VAL(op_class, "op_class");
++ UPDATE_VAL(hw_mode, "hw_mode");
++ UPDATE_VAL(channel, "channel");
++ UPDATE_VAL(secondary_channel, "sec_channel");
++ if (!changed &&
++ (iface->bss[0]->beacon_set_done ||
++ iface->state == HAPD_IFACE_DFS))
++ return ucv_boolean_new(true);
++
++ intval = ucv_int64_get(ucv_object_get(info, "center_seg0_idx", NULL));
++ if (!errno)
++ hostapd_set_oper_centr_freq_seg0_idx(conf, intval);
++
++ intval = ucv_int64_get(ucv_object_get(info, "center_seg1_idx", NULL));
++ if (!errno)
++ hostapd_set_oper_centr_freq_seg1_idx(conf, intval);
++
++ intval = ucv_int64_get(ucv_object_get(info, "oper_chwidth", NULL));
++ if (!errno)
++ hostapd_set_oper_chwidth(conf, intval);
++
++ intval = ucv_int64_get(ucv_object_get(info, "frequency", NULL));
++ if (!errno)
++ iface->freq = intval;
++ else
++ iface->freq = 0;
++ conf->acs = 0;
++
++out:
++ switch (iface->state) {
++ case HAPD_IFACE_ENABLED:
++ if (!hostapd_is_dfs_required(iface) ||
++ hostapd_is_dfs_chan_available(iface))
++ break;
++ wpa_printf(MSG_INFO, "DFS CAC required on new channel, restart interface");
++ /* fallthrough */
++ default:
++ uc_hostapd_disable_iface(iface);
++ break;
++ }
++
++ if (conf->channel && !iface->freq)
++ iface->freq = hostapd_hw_get_freq(iface->bss[0], conf->channel);
++
++ if (iface->state != HAPD_IFACE_ENABLED) {
++ hostapd_enable_iface(iface);
++ return ucv_boolean_new(true);
++ }
++
++ for (i = 0; i < iface->num_bss; i++) {
++ struct hostapd_data *hapd = iface->bss[i];
++ int ret;
++
++ hapd->conf->start_disabled = 0;
++ hostapd_set_freq(hapd, conf->hw_mode, iface->freq,
++ conf->channel,
++ conf->enable_edmg,
++ conf->edmg_channel,
++ conf->ieee80211n,
++ conf->ieee80211ac,
++ conf->ieee80211ax,
++ conf->ieee80211be,
++ conf->secondary_channel,
++ hostapd_get_oper_chwidth(conf),
++ hostapd_get_oper_centr_freq_seg0_idx(conf),
++ hostapd_get_oper_centr_freq_seg1_idx(conf));
++
++ ieee802_11_set_beacon(hapd);
++ }
++
++ return ucv_boolean_new(true);
++}
++
++static uc_value_t *
++uc_hostapd_iface_switch_channel(uc_vm_t *vm, size_t nargs)
++{
++ struct hostapd_iface *iface = uc_fn_thisval("hostapd.iface");
++ uc_value_t *info = uc_fn_arg(0);
++ struct hostapd_config *conf;
++ struct csa_settings csa = {};
++ uint64_t intval;
++ int i, ret = 0;
++
++ if (!iface || ucv_type(info) != UC_OBJECT)
++ return NULL;
++
++ conf = iface->conf;
++ if ((intval = ucv_int64_get(ucv_object_get(info, "csa_count", NULL))) && !errno)
++ csa.cs_count = intval;
++ if ((intval = ucv_int64_get(ucv_object_get(info, "sec_channel", NULL))) && !errno)
++ csa.freq_params.sec_channel_offset = intval;
++
++ csa.freq_params.ht_enabled = conf->ieee80211n;
++ csa.freq_params.vht_enabled = conf->ieee80211ac;
++ csa.freq_params.he_enabled = conf->ieee80211ax;
++#ifdef CONFIG_IEEE80211BE
++ csa.freq_params.eht_enabled = conf->ieee80211be;
++#endif
++ intval = ucv_int64_get(ucv_object_get(info, "oper_chwidth", NULL));
++ if (errno)
++ intval = hostapd_get_oper_chwidth(conf);
++ if (intval)
++ csa.freq_params.bandwidth = 40 << intval;
++ else
++ csa.freq_params.bandwidth = csa.freq_params.sec_channel_offset ? 40 : 20;
++
++ if ((intval = ucv_int64_get(ucv_object_get(info, "frequency", NULL))) && !errno)
++ csa.freq_params.freq = intval;
++ if ((intval = ucv_int64_get(ucv_object_get(info, "center_freq1", NULL))) && !errno)
++ csa.freq_params.center_freq1 = intval;
++ if ((intval = ucv_int64_get(ucv_object_get(info, "center_freq2", NULL))) && !errno)
++ csa.freq_params.center_freq2 = intval;
++
++ for (i = 0; i < iface->num_bss; i++)
++ ret = hostapd_switch_channel(iface->bss[i], &csa);
++
++ return ucv_boolean_new(!ret);
++}
++
++static uc_value_t *
++uc_hostapd_bss_rename(uc_vm_t *vm, size_t nargs)
++{
++ struct hostapd_data *hapd = uc_fn_thisval("hostapd.bss");
++ uc_value_t *ifname_arg = uc_fn_arg(0);
++ char prev_ifname[IFNAMSIZ + 1];
++ struct sta_info *sta;
++ const char *ifname;
++ int ret;
++
++ if (!hapd || ucv_type(ifname_arg) != UC_STRING)
++ return NULL;
++
++ os_strlcpy(prev_ifname, hapd->conf->iface, sizeof(prev_ifname));
++ ifname = ucv_string_get(ifname_arg);
++
++ hostapd_ubus_free_bss(hapd);
++ if (interfaces->ctrl_iface_deinit)
++ interfaces->ctrl_iface_deinit(hapd);
++
++ ret = hostapd_drv_if_rename(hapd, WPA_IF_AP_BSS, NULL, ifname);
++ if (ret)
++ goto out;
++
++ for (sta = hapd->sta_list; sta; sta = sta->next) {
++ char cur_name[IFNAMSIZ + 1], new_name[IFNAMSIZ + 1];
++
++ if (!(sta->flags & WLAN_STA_WDS) || sta->pending_wds_enable)
++ continue;
++
++ snprintf(cur_name, sizeof(cur_name), "%s.sta%d", prev_ifname, sta->aid);
++ snprintf(new_name, sizeof(new_name), "%s.sta%d", ifname, sta->aid);
++ hostapd_drv_if_rename(hapd, WPA_IF_AP_VLAN, cur_name, new_name);
++ }
++
++ if (!strncmp(hapd->conf->ssid.vlan, hapd->conf->iface, sizeof(hapd->conf->ssid.vlan)))
++ os_strlcpy(hapd->conf->ssid.vlan, ifname, sizeof(hapd->conf->ssid.vlan));
++ os_strlcpy(hapd->conf->iface, ifname, sizeof(hapd->conf->iface));
++ hostapd_ubus_add_bss(hapd);
++
++ hostapd_ucode_update_interfaces();
++out:
++ if (interfaces->ctrl_iface_init)
++ interfaces->ctrl_iface_init(hapd);
++
++ return ret ? NULL : ucv_boolean_new(true);
++}
++
++
++int hostapd_ucode_init(struct hapd_interfaces *ifaces)
++{
++ static const uc_function_list_t global_fns[] = {
++ { "printf", uc_wpa_printf },
++ { "getpid", uc_wpa_getpid },
++ { "sha1", uc_wpa_sha1 },
++ { "freq_info", uc_wpa_freq_info },
++ { "add_iface", uc_hostapd_add_iface },
++ { "remove_iface", uc_hostapd_remove_iface },
++ { "udebug_set", uc_wpa_udebug_set },
++ };
++ static const uc_function_list_t bss_fns[] = {
++ { "ctrl", uc_hostapd_bss_ctrl },
++ { "set_config", uc_hostapd_bss_set_config },
++ { "rename", uc_hostapd_bss_rename },
++ { "delete", uc_hostapd_bss_delete },
++ };
++ static const uc_function_list_t iface_fns[] = {
++ { "set_bss_order", uc_hostapd_iface_set_bss_order },
++ { "add_bss", uc_hostapd_iface_add_bss },
++ { "stop", uc_hostapd_iface_stop },
++ { "start", uc_hostapd_iface_start },
++ { "switch_channel", uc_hostapd_iface_switch_channel },
++ };
++ uc_value_t *data, *proto;
++
++ interfaces = ifaces;
++ vm = wpa_ucode_create_vm();
++
++ global_type = uc_type_declare(vm, "hostapd.global", global_fns, NULL);
++ bss_type = uc_type_declare(vm, "hostapd.bss", bss_fns, NULL);
++ iface_type = uc_type_declare(vm, "hostapd.iface", iface_fns, NULL);
++
++ bss_registry = ucv_array_new(vm);
++ uc_vm_registry_set(vm, "hostap.bss_registry", bss_registry);
++
++ iface_registry = ucv_array_new(vm);
++ uc_vm_registry_set(vm, "hostap.iface_registry", iface_registry);
++
++ global = wpa_ucode_global_init("hostapd", global_type);
++
++ if (wpa_ucode_run(HOSTAPD_UC_PATH "hostapd.uc"))
++ goto free_vm;
++ ucv_gc(vm);
++
++ return 0;
++
++free_vm:
++ wpa_ucode_free_vm();
++ return -1;
++}
++
++void hostapd_ucode_free(void)
++{
++ if (wpa_ucode_call_prepare("shutdown") == 0)
++ ucv_put(wpa_ucode_call(0));
++ wpa_ucode_free_vm();
++}
++
++void hostapd_ucode_free_iface(struct hostapd_iface *iface)
++{
++ wpa_ucode_registry_remove(iface_registry, iface->ucode.idx);
++}
++
++void hostapd_ucode_add_bss(struct hostapd_data *hapd)
++{
++ uc_value_t *val;
++
++ if (wpa_ucode_call_prepare("bss_add"))
++ return;
++
++ val = hostapd_ucode_bss_get_uval(hapd);
++ uc_value_push(ucv_get(ucv_string_new(hapd->conf->iface)));
++ uc_value_push(ucv_get(val));
++ ucv_put(wpa_ucode_call(2));
++ ucv_gc(vm);
++}
++
++void hostapd_ucode_reload_bss(struct hostapd_data *hapd)
++{
++ uc_value_t *val;
++
++ if (wpa_ucode_call_prepare("bss_reload"))
++ return;
++
++ val = hostapd_ucode_bss_get_uval(hapd);
++ uc_value_push(ucv_get(ucv_string_new(hapd->conf->iface)));
++ uc_value_push(ucv_get(val));
++ ucv_put(wpa_ucode_call(2));
++ ucv_gc(vm);
++}
++
++void hostapd_ucode_free_bss(struct hostapd_data *hapd)
++{
++ uc_value_t *val;
++
++ val = wpa_ucode_registry_remove(bss_registry, hapd->ucode.idx);
++ if (!val)
++ return;
++
++ hapd->ucode.idx = 0;
++ if (wpa_ucode_call_prepare("bss_remove"))
++ return;
++
++ uc_value_push(ucv_string_new(hapd->conf->iface));
++ uc_value_push(ucv_get(val));
++ ucv_put(wpa_ucode_call(2));
++ ucv_gc(vm);
++}
+diff --git a/src/ap/ucode.h b/src/ap/ucode.h
+new file mode 100644
+index 000000000..d00b78716
+--- /dev/null
++++ b/src/ap/ucode.h
+@@ -0,0 +1,54 @@
++#ifndef __HOSTAPD_AP_UCODE_H
++#define __HOSTAPD_AP_UCODE_H
++
++#include "utils/ucode.h"
++
++struct hostapd_data;
++
++struct hostapd_ucode_bss {
++#ifdef UCODE_SUPPORT
++ int idx;
++#endif
++};
++
++struct hostapd_ucode_iface {
++#ifdef UCODE_SUPPORT
++ int idx;
++#endif
++};
++
++#ifdef UCODE_SUPPORT
++
++int hostapd_ucode_init(struct hapd_interfaces *ifaces);
++
++void hostapd_ucode_free(void);
++void hostapd_ucode_free_iface(struct hostapd_iface *iface);
++void hostapd_ucode_add_bss(struct hostapd_data *hapd);
++void hostapd_ucode_free_bss(struct hostapd_data *hapd);
++void hostapd_ucode_reload_bss(struct hostapd_data *hapd);
++
++#else
++
++static inline int hostapd_ucode_init(struct hapd_interfaces *ifaces)
++{
++ return -EINVAL;
++}
++static inline void hostapd_ucode_free(void)
++{
++}
++static inline void hostapd_ucode_free_iface(struct hostapd_iface *iface)
++{
++}
++static inline void hostapd_ucode_reload_bss(struct hostapd_data *hapd)
++{
++}
++static inline void hostapd_ucode_add_bss(struct hostapd_data *hapd)
++{
++}
++static inline void hostapd_ucode_free_bss(struct hostapd_data *hapd)
++{
++}
++
++#endif
++
++#endif
+diff --git a/src/utils/build_features.h b/src/utils/build_features.h
+new file mode 100644
+index 000000000..553769ece
+--- /dev/null
++++ b/src/utils/build_features.h
+@@ -0,0 +1,65 @@
++#ifndef BUILD_FEATURES_H
++#define BUILD_FEATURES_H
++
++static inline int has_feature(const char *feat)
++{
++#if defined(IEEE8021X_EAPOL) || (defined(HOSTAPD) && !defined(CONFIG_NO_RADIUS))
++ if (!strcmp(feat, "eap"))
++ return 1;
++#endif
++#ifdef CONFIG_IEEE80211AC
++ if (!strcmp(feat, "11ac"))
++ return 1;
++#endif
++#ifdef CONFIG_IEEE80211AX
++ if (!strcmp(feat, "11ax"))
++ return 1;
++#endif
++#ifdef CONFIG_IEEE80211R
++ if (!strcmp(feat, "11r"))
++ return 1;
++#endif
++#ifdef CONFIG_ACS
++ if (!strcmp(feat, "acs"))
++ return 1;
++#endif
++#ifdef CONFIG_SAE
++ if (!strcmp(feat, "sae"))
++ return 1;
++#endif
++#ifdef CONFIG_OWE
++ if (!strcmp(feat, "owe"))
++ return 1;
++#endif
++#ifdef CONFIG_SUITEB192
++ if (!strcmp(feat, "suiteb192"))
++ return 1;
++#endif
++#ifdef CONFIG_WEP
++ if (!strcmp(feat, "wep"))
++ return 1;
++#endif
++#ifdef CONFIG_HS20
++ if (!strcmp(feat, "hs20"))
++ return 1;
++#endif
++#ifdef CONFIG_WPS
++ if (!strcmp(feat, "wps"))
++ return 1;
++#endif
++#ifdef CONFIG_FILS
++ if (!strcmp(feat, "fils"))
++ return 1;
++#endif
++#ifdef CONFIG_OCV
++ if (!strcmp(feat, "ocv"))
++ return 1;
++#endif
++#ifdef CONFIG_MESH
++ if (!strcmp(feat, "mesh"))
++ return 1;
++#endif
++ return 0;
++}
++
++#endif /* BUILD_FEATURES_H */
+diff --git a/src/utils/ucode.c b/src/utils/ucode.c
+new file mode 100644
+index 000000000..29c753c32
+--- /dev/null
++++ b/src/utils/ucode.c
+@@ -0,0 +1,502 @@
++#include <unistd.h>
++#include "ucode.h"
++#include "utils/eloop.h"
++#include "crypto/crypto.h"
++#include "crypto/sha1.h"
++#include "common/ieee802_11_common.h"
++#include <linux/netlink.h>
++#include <linux/genetlink.h>
++#include <linux/nl80211.h>
++#include <libubox/uloop.h>
++#include <ucode/compiler.h>
++#include <udebug.h>
++
++static uc_value_t *registry;
++static uc_vm_t vm;
++static struct uloop_timeout gc_timer;
++static struct udebug ud;
++static struct udebug_buf ud_log, ud_nl[3];
++static const struct udebug_buf_meta meta_log = {
++ .name = "wpa_log",
++ .format = UDEBUG_FORMAT_STRING,
++};
++static const struct udebug_buf_meta meta_nl_ll = {
++ .name = "wpa_nl_ctrl",
++ .format = UDEBUG_FORMAT_PACKET,
++ .sub_format = UDEBUG_DLT_NETLINK,
++};
++static const struct udebug_buf_meta meta_nl_tx = {
++ .name = "wpa_nl_tx",
++ .format = UDEBUG_FORMAT_PACKET,
++ .sub_format = UDEBUG_DLT_NETLINK,
++};
++#define UDEBUG_FLAG_RX_FRAME (1ULL << 0)
++static const struct udebug_buf_flag rx_flags[] = {
++ { "rx_frame", UDEBUG_FLAG_RX_FRAME },
++};
++static const struct udebug_buf_meta meta_nl_rx = {
++ .name = "wpa_nl_rx",
++ .format = UDEBUG_FORMAT_PACKET,
++ .sub_format = UDEBUG_DLT_NETLINK,
++ .flags = rx_flags,
++ .n_flags = ARRAY_SIZE(rx_flags),
++};
++static struct udebug_ubus_ring udebug_rings[] = {
++ {
++ .buf = &ud_log,
++ .meta = &meta_log,
++ .default_entries = 1024,
++ .default_size = 64 * 1024
++ },
++ {
++ .buf = &ud_nl[0],
++ .meta = &meta_nl_rx,
++ .default_entries = 1024,
++ .default_size = 256 * 1024,
++ },
++ {
++ .buf = &ud_nl[1],
++ .meta = &meta_nl_tx,
++ .default_entries = 1024,
++ .default_size = 64 * 1024,
++ },
++ {
++ .buf = &ud_nl[2],
++ .meta = &meta_nl_ll,
++ .default_entries = 1024,
++ .default_size = 32 * 1024,
++ }
++};
++char *udebug_service;
++struct udebug_ubus ud_ubus;
++
++static void uc_gc_timer(struct uloop_timeout *timeout)
++{
++ ucv_gc(&vm);
++}
++
++uc_value_t *uc_wpa_printf(uc_vm_t *vm, size_t nargs)
++{
++ uc_value_t *level = uc_fn_arg(0);
++ uc_value_t *ret, **args;
++ uc_cfn_ptr_t _sprintf;
++ int l = MSG_INFO;
++ int i, start = 0;
++
++ _sprintf = uc_stdlib_function("sprintf");
++ if (!sprintf)
++ return NULL;
++
++ if (ucv_type(level) == UC_INTEGER) {
++ l = ucv_int64_get(level);
++ start++;
++ }
++
++ if (nargs <= start)
++ return NULL;
++
++ ret = _sprintf(vm, nargs - start);
++ if (ucv_type(ret) != UC_STRING)
++ return NULL;
++
++ wpa_printf(l, "%s", ucv_string_get(ret));
++ ucv_put(ret);
++
++ return NULL;
++}
++
++uc_value_t *uc_wpa_freq_info(uc_vm_t *vm, size_t nargs)
++{
++ uc_value_t *freq = uc_fn_arg(0);
++ uc_value_t *sec = uc_fn_arg(1);
++ int width = ucv_uint64_get(uc_fn_arg(2));
++ int freq_val, center_idx, center_ofs;
++ enum oper_chan_width chanwidth;
++ enum hostapd_hw_mode hw_mode;
++ u8 op_class, channel, tmp_channel;
++ const char *modestr;
++ int sec_channel = 0;
++ uc_value_t *ret;
++
++ if (ucv_type(freq) != UC_INTEGER)
++ return NULL;
++
++ freq_val = ucv_int64_get(freq);
++ if (ucv_type(sec) == UC_INTEGER)
++ sec_channel = ucv_int64_get(sec);
++ else if (sec)
++ return NULL;
++ else if (freq_val > 4000)
++ sec_channel = (freq_val / 20) & 1 ? 1 : -1;
++ else
++ sec_channel = freq_val < 2442 ? 1 : -1;
++
++ if (sec_channel != -1 && sec_channel != 1 && sec_channel != 0)
++ return NULL;
++
++ switch (width) {
++ case 0:
++ chanwidth = CONF_OPER_CHWIDTH_USE_HT;
++ break;
++ case 1:
++ chanwidth = CONF_OPER_CHWIDTH_80MHZ;
++ break;
++ case 2:
++ chanwidth = CONF_OPER_CHWIDTH_160MHZ;
++ break;
++ default:
++ return NULL;
++ }
++
++ hw_mode = ieee80211_freq_to_channel_ext(freq_val, sec_channel,
++ chanwidth, &op_class, &channel);
++ switch (hw_mode) {
++ case HOSTAPD_MODE_IEEE80211B:
++ modestr = "b";
++ break;
++ case HOSTAPD_MODE_IEEE80211G:
++ modestr = "g";
++ break;
++ case HOSTAPD_MODE_IEEE80211A:
++ modestr = "a";
++ break;
++ case HOSTAPD_MODE_IEEE80211AD:
++ modestr = "ad";
++ break;
++ default:
++ return NULL;
++ }
++
++ ret = ucv_object_new(vm);
++ ucv_object_add(ret, "op_class", ucv_int64_new(op_class));
++ ucv_object_add(ret, "channel", ucv_int64_new(channel));
++ ucv_object_add(ret, "hw_mode", ucv_int64_new(hw_mode));
++ ucv_object_add(ret, "hw_mode_str", ucv_get(ucv_string_new(modestr)));
++ ucv_object_add(ret, "sec_channel", ucv_int64_new(sec_channel));
++ ucv_object_add(ret, "frequency", ucv_int64_new(freq_val));
++
++ if (!sec_channel)
++ return ret;
++
++ if (freq_val >= 5900)
++ center_ofs = 0;
++ else if (freq_val >= 5745)
++ center_ofs = 20;
++ else
++ center_ofs = 35;
++ tmp_channel = channel - center_ofs;
++ tmp_channel &= ~((8 << width) - 1);
++ center_idx = tmp_channel + center_ofs + (4 << width) - 1;
++
++ if (freq_val < 3000)
++ ucv_object_add(ret, "center_seg0_idx", ucv_int64_new(0));
++ else
++ ucv_object_add(ret, "center_seg0_idx", ucv_int64_new(center_idx));
++ center_idx = (center_idx - channel) * 5 + freq_val;
++ ucv_object_add(ret, "center_freq1", ucv_int64_new(center_idx));
++
++out:
++ return ret;
++}
++
++uc_value_t *uc_wpa_getpid(uc_vm_t *vm, size_t nargs)
++{
++ return ucv_int64_new(getpid());
++}
++
++uc_value_t *uc_wpa_sha1(uc_vm_t *vm, size_t nargs)
++{
++ u8 hash[SHA1_MAC_LEN];
++ char hash_hex[2 * ARRAY_SIZE(hash) + 1];
++ uc_value_t *val;
++ size_t *lens;
++ const u8 **args;
++ int i;
++
++ if (!nargs)
++ return NULL;
++
++ args = alloca(nargs * sizeof(*args));
++ lens = alloca(nargs * sizeof(*lens));
++ for (i = 0; i < nargs; i++) {
++ val = uc_fn_arg(i);
++ if (ucv_type(val) != UC_STRING)
++ return NULL;
++
++ args[i] = ucv_string_get(val);
++ lens[i] = ucv_string_length(val);
++ }
++
++ if (sha1_vector(nargs, args, lens, hash))
++ return NULL;
++
++ for (i = 0; i < ARRAY_SIZE(hash); i++)
++ sprintf(hash_hex + 2 * i, "%02x", hash[i]);
++
++ return ucv_string_new_length(hash_hex, 2 * ARRAY_SIZE(hash));
++}
++
++uc_vm_t *wpa_ucode_create_vm(void)
++{
++ static uc_parse_config_t config = {
++ .strict_declarations = true,
++ .lstrip_blocks = true,
++ .trim_blocks = true,
++ .raw_mode = true
++ };
++
++ uc_search_path_init(&config.module_search_path);
++ uc_search_path_add(&config.module_search_path, HOSTAPD_UC_PATH "*.so");
++ uc_search_path_add(&config.module_search_path, HOSTAPD_UC_PATH "*.uc");
++
++ uc_vm_init(&vm, &config);
++
++ uc_stdlib_load(uc_vm_scope_get(&vm));
++ eloop_add_uloop();
++ gc_timer.cb = uc_gc_timer;
++
++ return &vm;
++}
++
++int wpa_ucode_run(const char *script)
++{
++ uc_source_t *source;
++ uc_program_t *prog;
++ uc_value_t *ops;
++ char *err;
++ int ret;
++
++ source = uc_source_new_file(script);
++ if (!source)
++ return -1;
++
++ prog = uc_compile(vm.config, source, &err);
++ uc_source_put(source);
++ if (!prog) {
++ wpa_printf(MSG_ERROR, "Error loading ucode: %s\n", err);
++ return -1;
++ }
++
++ ret = uc_vm_execute(&vm, prog, &ops);
++ uc_program_put(prog);
++ if (ret || !ops)
++ return -1;
++
++ registry = ucv_array_new(&vm);
++ uc_vm_registry_set(&vm, "hostap.registry", registry);
++ ucv_array_set(registry, 0, ucv_get(ops));
++
++ return 0;
++}
++
++int wpa_ucode_call_prepare(const char *fname)
++{
++ uc_value_t *obj, *func;
++
++ if (!registry)
++ return -1;
++
++ obj = ucv_array_get(registry, 0);
++ if (!obj)
++ return -1;
++
++ func = ucv_object_get(obj, fname, NULL);
++ if (!ucv_is_callable(func))
++ return -1;
++
++ uc_vm_stack_push(&vm, ucv_get(obj));
++ uc_vm_stack_push(&vm, ucv_get(func));
++
++ return 0;
++}
++
++static void udebug_printf_hook(int level, const char *fmt, va_list ap)
++{
++ udebug_entry_init(&ud_log);
++ udebug_entry_vprintf(&ud_log, fmt, ap);
++ udebug_entry_add(&ud_log);
++}
++
++static void udebug_hexdump_hook(int level, const char *title,
++ const void *data, size_t len)
++{
++ char *buf;
++
++ udebug_entry_init(&ud_log);
++ udebug_entry_printf(&ud_log, "%s - hexdump:", title);
++ buf = udebug_entry_append(&ud_log, NULL, 3 * len);
++ for (size_t i = 0; i < len; i++)
++ buf += sprintf(buf, " %02x", *(uint8_t *)(data + i));
++ udebug_entry_add(&ud_log);
++}
++
++static void udebug_netlink_hook(int tx, const void *data, size_t len)
++{
++ struct {
++ uint16_t pkttype;
++ uint16_t arphdr;
++ uint16_t _pad[5];
++ uint16_t proto;
++ } hdr = {
++ .pkttype = host_to_be16(tx ? 7 : 6),
++ .arphdr = host_to_be16(824),
++ .proto = host_to_be16(16),
++ };
++ const struct nlmsghdr *nlh = data;
++ const struct genlmsghdr *gnlh = data + NLMSG_HDRLEN;
++ struct udebug_buf *buf = &ud_nl[!!tx];
++
++ if (nlh->nlmsg_type == 0x10)
++ buf = &ud_nl[2];
++ else if (!tx && gnlh->cmd == NL80211_CMD_FRAME &&
++ !(udebug_buf_flags(buf) & UDEBUG_FLAG_RX_FRAME))
++ return;
++
++ if (!udebug_buf_valid(buf))
++ return;
++
++ udebug_entry_init(buf);
++ udebug_entry_append(buf, &hdr, sizeof(hdr));
++ udebug_entry_append(buf, data, len);
++ udebug_entry_add(buf);
++}
++
++static void
++wpa_udebug_config(struct udebug_ubus *ctx, struct blob_attr *data,
++ bool enabled)
++{
++ udebug_ubus_apply_config(&ud, udebug_rings, ARRAY_SIZE(udebug_rings),
++ data, enabled);
++
++ if (udebug_buf_valid(&ud_log)) {
++ wpa_printf_hook = udebug_printf_hook;
++ wpa_hexdump_hook = udebug_hexdump_hook;
++ } else {
++ wpa_printf_hook = NULL;
++ wpa_hexdump_hook = NULL;
++ }
++
++ if (udebug_buf_valid(&ud_nl[0]) ||
++ udebug_buf_valid(&ud_nl[1]) ||
++ udebug_buf_valid(&ud_nl[2]))
++ wpa_netlink_hook = udebug_netlink_hook;
++ else
++ wpa_netlink_hook = NULL;
++}
++
++uc_value_t *uc_wpa_udebug_set(uc_vm_t *vm, size_t nargs)
++{
++ uc_value_t *name = uc_fn_arg(0);
++ uc_value_t *ubus = uc_fn_arg(1);
++ static bool enabled = false;
++ struct ubus_context *ctx;
++ bool cur_en;
++
++ cur_en = ucv_type(name) == UC_STRING;
++ ctx = ucv_resource_data(ubus, "ubus.connection");
++ if (!ctx)
++ cur_en = false;
++
++ if (enabled == cur_en)
++ return ucv_boolean_new(true);
++
++ enabled = cur_en;
++ if (enabled) {
++ udebug_service = strdup(ucv_string_get(name));
++ udebug_init(&ud);
++ udebug_auto_connect(&ud, NULL);
++ udebug_ubus_init(&ud_ubus, ctx, udebug_service, wpa_udebug_config);
++ } else {
++ udebug_ubus_free(&ud_ubus);
++ for (size_t i = 0; i < ARRAY_SIZE(udebug_rings); i++)
++ if (udebug_buf_valid(udebug_rings[i].buf))
++ udebug_buf_free(udebug_rings[i].buf);
++ udebug_free(&ud);
++ free(udebug_service);
++ }
++
++ return ucv_boolean_new(true);
++}
++
++uc_value_t *wpa_ucode_global_init(const char *name, uc_resource_type_t *global_type)
++{
++ uc_value_t *global = uc_resource_new(global_type, NULL);
++ uc_value_t *proto;
++
++ uc_vm_registry_set(&vm, "hostap.global", global);
++ proto = ucv_prototype_get(global);
++ ucv_object_add(proto, "data", ucv_get(ucv_object_new(&vm)));
++
++#define ADD_CONST(x) ucv_object_add(proto, #x, ucv_int64_new(x))
++ ADD_CONST(MSG_EXCESSIVE);
++ ADD_CONST(MSG_MSGDUMP);
++ ADD_CONST(MSG_DEBUG);
++ ADD_CONST(MSG_INFO);
++ ADD_CONST(MSG_WARNING);
++ ADD_CONST(MSG_ERROR);
++#undef ADD_CONST
++
++ ucv_object_add(uc_vm_scope_get(&vm), name, ucv_get(global));
++
++ return global;
++}
++
++int wpa_ucode_registry_add(uc_value_t *reg, uc_value_t *val)
++{
++ uc_value_t *data;
++ int i = 0;
++
++ while (ucv_array_get(reg, i))
++ i++;
++
++ ucv_array_set(reg, i, ucv_get(val));
++
++ return i + 1;
++}
++
++uc_value_t *wpa_ucode_registry_get(uc_value_t *reg, int idx)
++{
++ if (!idx)
++ return NULL;
++
++ return ucv_array_get(reg, idx - 1);
++}
++
++uc_value_t *wpa_ucode_registry_remove(uc_value_t *reg, int idx)
++{
++ uc_value_t *val = wpa_ucode_registry_get(reg, idx);
++ void **dataptr;
++
++ if (!val)
++ return NULL;
++
++ ucv_array_set(reg, idx - 1, NULL);
++ dataptr = ucv_resource_dataptr(val, NULL);
++ if (dataptr)
++ *dataptr = NULL;
++
++ return val;
++}
++
++
++uc_value_t *wpa_ucode_call(size_t nargs)
++{
++ if (uc_vm_call(&vm, true, nargs) != EXCEPTION_NONE)
++ return NULL;
++
++ if (!gc_timer.pending)
++ uloop_timeout_set(&gc_timer, 10);
++
++ return uc_vm_stack_pop(&vm);
++}
++
++void wpa_ucode_free_vm(void)
++{
++ if (!vm.config)
++ return;
++
++ uc_search_path_free(&vm.config->module_search_path);
++ uc_vm_free(&vm);
++ registry = NULL;
++ vm = (uc_vm_t){};
++}
+diff --git a/src/utils/ucode.h b/src/utils/ucode.h
+new file mode 100644
+index 000000000..c083241e0
+--- /dev/null
++++ b/src/utils/ucode.h
+@@ -0,0 +1,30 @@
++#ifndef __HOSTAPD_UTILS_UCODE_H
++#define __HOSTAPD_UTILS_UCODE_H
++
++#include "utils/includes.h"
++#include "utils/common.h"
++#include <ucode/lib.h>
++#include <ucode/vm.h>
++
++#define HOSTAPD_UC_PATH "/usr/share/hostap/"
++
++extern uc_value_t *uc_registry;
++uc_vm_t *wpa_ucode_create_vm(void);
++int wpa_ucode_run(const char *script);
++int wpa_ucode_call_prepare(const char *fname);
++uc_value_t *wpa_ucode_call(size_t nargs);
++void wpa_ucode_free_vm(void);
++
++uc_value_t *wpa_ucode_global_init(const char *name, uc_resource_type_t *global_type);
++
++int wpa_ucode_registry_add(uc_value_t *reg, uc_value_t *val);
++uc_value_t *wpa_ucode_registry_get(uc_value_t *reg, int idx);
++uc_value_t *wpa_ucode_registry_remove(uc_value_t *reg, int idx);
++
++uc_value_t *uc_wpa_udebug_set(uc_vm_t *vm, size_t nargs);
++uc_value_t *uc_wpa_printf(uc_vm_t *vm, size_t nargs);
++uc_value_t *uc_wpa_getpid(uc_vm_t *vm, size_t nargs);
++uc_value_t *uc_wpa_sha1(uc_vm_t *vm, size_t nargs);
++uc_value_t *uc_wpa_freq_info(uc_vm_t *vm, size_t nargs);
++
++#endif
+diff --git a/wpa_supplicant/ubus.c b/wpa_supplicant/ubus.c
+new file mode 100644
+index 000000000..1c477f0c0
+--- /dev/null
++++ b/wpa_supplicant/ubus.c
+@@ -0,0 +1,280 @@
++/*
++ * wpa_supplicant / ubus support
++ * Copyright (c) 2018, Daniel Golle <daniel@makrotopia.org>
++ * Copyright (c) 2013, Felix Fietkau <nbd@nbd.name>
++ *
++ * This software may be distributed under the terms of the BSD license.
++ * See README for more details.
++ */
++
++#include "utils/includes.h"
++#include "utils/common.h"
++#include "utils/eloop.h"
++#include "utils/wpabuf.h"
++#include "common/ieee802_11_defs.h"
++#include "wpa_supplicant_i.h"
++#include "wps_supplicant.h"
++#include "ubus.h"
++
++static struct ubus_context *ctx;
++static struct blob_buf b;
++static int ctx_ref;
++
++static inline struct wpa_global *get_wpa_global_from_object(struct ubus_object *obj)
++{
++ return container_of(obj, struct wpa_global, ubus_global);
++}
++
++static inline struct wpa_supplicant *get_wpas_from_object(struct ubus_object *obj)
++{
++ return container_of(obj, struct wpa_supplicant, ubus.obj);
++}
++
++static void ubus_reconnect_timeout(void *eloop_data, void *user_ctx)
++{
++ if (ubus_reconnect(ctx, NULL)) {
++ eloop_register_timeout(1, 0, ubus_reconnect_timeout, ctx, NULL);
++ return;
++ }
++
++ ubus_add_uloop(ctx);
++}
++
++static void wpas_ubus_connection_lost(struct ubus_context *ctx)
++{
++ uloop_fd_delete(&ctx->sock);
++ eloop_register_timeout(1, 0, ubus_reconnect_timeout, ctx, NULL);
++}
++
++static bool wpas_ubus_init(void)
++{
++ if (ctx)
++ return true;
++
++ eloop_add_uloop();
++ ctx = ubus_connect(NULL);
++ if (!ctx)
++ return false;
++
++ ctx->connection_lost = wpas_ubus_connection_lost;
++ ubus_add_uloop(ctx);
++
++ return true;
++}
++
++static void wpas_ubus_ref_inc(void)
++{
++ ctx_ref++;
++}
++
++static void wpas_ubus_ref_dec(void)
++{
++ ctx_ref--;
++ if (!ctx)
++ return;
++
++ if (ctx_ref)
++ return;
++
++ uloop_fd_delete(&ctx->sock);
++ ubus_free(ctx);
++ ctx = NULL;
++}
++
++static int
++wpas_bss_get_features(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ struct wpa_supplicant *wpa_s = get_wpas_from_object(obj);
++
++ blob_buf_init(&b, 0);
++ blobmsg_add_u8(&b, "ht_supported", ht_supported(wpa_s->hw.modes));
++ blobmsg_add_u8(&b, "vht_supported", vht_supported(wpa_s->hw.modes));
++ ubus_send_reply(ctx, req, b.head);
++
++ return 0;
++}
++
++static int
++wpas_bss_reload(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ struct wpa_supplicant *wpa_s = get_wpas_from_object(obj);
++
++ if (wpa_supplicant_reload_configuration(wpa_s))
++ return UBUS_STATUS_UNKNOWN_ERROR;
++ else
++ return 0;
++}
++
++#ifdef CONFIG_WPS
++enum {
++ WPS_START_MULTI_AP,
++ __WPS_START_MAX
++};
++
++static const struct blobmsg_policy wps_start_policy[] = {
++ [WPS_START_MULTI_AP] = { "multi_ap", BLOBMSG_TYPE_BOOL },
++};
++
++static int
++wpas_bss_wps_start(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ int rc;
++ struct wpa_supplicant *wpa_s = get_wpas_from_object(obj);
++ struct blob_attr *tb[__WPS_START_MAX], *cur;
++ int multi_ap = 0;
++
++ blobmsg_parse(wps_start_policy, __WPS_START_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
++
++ if (tb[WPS_START_MULTI_AP])
++ multi_ap = blobmsg_get_bool(tb[WPS_START_MULTI_AP]);
++
++ rc = wpas_wps_start_pbc(wpa_s, NULL, 0, multi_ap);
++
++ if (rc != 0)
++ return UBUS_STATUS_NOT_SUPPORTED;
++
++ return 0;
++}
++
++static int
++wpas_bss_wps_cancel(struct ubus_context *ctx, struct ubus_object *obj,
++ struct ubus_request_data *req, const char *method,
++ struct blob_attr *msg)
++{
++ int rc;
++ struct wpa_supplicant *wpa_s = get_wpas_from_object(obj);
++
++ rc = wpas_wps_cancel(wpa_s);
++
++ if (rc != 0)
++ return UBUS_STATUS_NOT_SUPPORTED;
++
++ return 0;
++}
++#endif
++
++static const struct ubus_method bss_methods[] = {
++ UBUS_METHOD_NOARG("reload", wpas_bss_reload),
++ UBUS_METHOD_NOARG("get_features", wpas_bss_get_features),
++#ifdef CONFIG_WPS
++ UBUS_METHOD_NOARG("wps_start", wpas_bss_wps_start),
++ UBUS_METHOD_NOARG("wps_cancel", wpas_bss_wps_cancel),
++#endif
++};
++
++static struct ubus_object_type bss_object_type =
++ UBUS_OBJECT_TYPE("wpas_bss", bss_methods);
++
++void wpas_ubus_add_bss(struct wpa_supplicant *wpa_s)
++{
++ struct ubus_object *obj = &wpa_s->ubus.obj;
++ char *name;
++ int ret;
++
++ if (!wpas_ubus_init())
++ return;
++
++ if (asprintf(&name, "wpa_supplicant.%s", wpa_s->ifname) < 0)
++ return;
++
++ obj->name = name;
++ obj->type = &bss_object_type;
++ obj->methods = bss_object_type.methods;
++ obj->n_methods = bss_object_type.n_methods;
++ ret = ubus_add_object(ctx, obj);
++ wpas_ubus_ref_inc();
++}
++
++void wpas_ubus_free_bss(struct wpa_supplicant *wpa_s)
++{
++ struct ubus_object *obj = &wpa_s->ubus.obj;
++ char *name = (char *) obj->name;
++
++ if (!ctx)
++ return;
++
++ if (obj->id) {
++ ubus_remove_object(ctx, obj);
++ wpas_ubus_ref_dec();
++ }
++
++ free(name);
++}
++
++#ifdef CONFIG_WPS
++void wpas_ubus_notify(struct wpa_supplicant *wpa_s, const struct wps_credential *cred)
++{
++ u16 auth_type;
++ char *ifname, *encryption, *ssid, *key;
++ size_t ifname_len;
++
++ if (!cred)
++ return;
++
++ auth_type = cred->auth_type;
++
++ if (auth_type == (WPS_AUTH_WPAPSK | WPS_AUTH_WPA2PSK))
++ auth_type = WPS_AUTH_WPA2PSK;
++
++ if (auth_type != WPS_AUTH_OPEN &&
++ auth_type != WPS_AUTH_WPAPSK &&
++ auth_type != WPS_AUTH_WPA2PSK) {
++ wpa_printf(MSG_DEBUG, "WPS: Ignored credentials for "
++ "unsupported authentication type 0x%x",
++ auth_type);
++ return;
++ }
++
++ if (auth_type == WPS_AUTH_WPAPSK || auth_type == WPS_AUTH_WPA2PSK) {
++ if (cred->key_len < 8 || cred->key_len > 2 * PMK_LEN) {
++ wpa_printf(MSG_ERROR, "WPS: Reject PSK credential with "
++ "invalid Network Key length %lu",
++ (unsigned long) cred->key_len);
++ return;
++ }
++ }
++
++ blob_buf_init(&b, 0);
++
++ ifname_len = strlen(wpa_s->ifname);
++ ifname = blobmsg_alloc_string_buffer(&b, "ifname", ifname_len + 1);
++ memcpy(ifname, wpa_s->ifname, ifname_len + 1);
++ ifname[ifname_len] = '\0';
++ blobmsg_add_string_buffer(&b);
++
++ switch (auth_type) {
++ case WPS_AUTH_WPA2PSK:
++ encryption = "psk2";
++ break;
++ case WPS_AUTH_WPAPSK:
++ encryption = "psk";
++ break;
++ default:
++ encryption = "none";
++ break;
++ }
++
++ blobmsg_add_string(&b, "encryption", encryption);
++
++ ssid = blobmsg_alloc_string_buffer(&b, "ssid", cred->ssid_len + 1);
++ memcpy(ssid, cred->ssid, cred->ssid_len);
++ ssid[cred->ssid_len] = '\0';
++ blobmsg_add_string_buffer(&b);
++
++ if (cred->key_len > 0) {
++ key = blobmsg_alloc_string_buffer(&b, "key", cred->key_len + 1);
++ memcpy(key, cred->key, cred->key_len);
++ key[cred->key_len] = '\0';
++ blobmsg_add_string_buffer(&b);
++ }
++
++// ubus_notify(ctx, &wpa_s->ubus.obj, "wps_credentials", b.head, -1);
++ ubus_send_event(ctx, "wps_credentials", b.head);
++}
++#endif /* CONFIG_WPS */
+diff --git a/wpa_supplicant/ubus.h b/wpa_supplicant/ubus.h
+new file mode 100644
+index 000000000..f6681cb26
+--- /dev/null
++++ b/wpa_supplicant/ubus.h
+@@ -0,0 +1,55 @@
++/*
++ * wpa_supplicant / ubus support
++ * Copyright (c) 2018, Daniel Golle <daniel@makrotopia.org>
++ * Copyright (c) 2013, Felix Fietkau <nbd@nbd.name>
++ *
++ * This software may be distributed under the terms of the BSD license.
++ * See README for more details.
++ */
++#ifndef __WPAS_UBUS_H
++#define __WPAS_UBUS_H
++
++struct wpa_supplicant;
++struct wpa_global;
++
++#include "wps_supplicant.h"
++
++#ifdef UBUS_SUPPORT
++#include <libubus.h>
++
++struct wpas_ubus_bss {
++ struct ubus_object obj;
++};
++
++void wpas_ubus_add_bss(struct wpa_supplicant *wpa_s);
++void wpas_ubus_free_bss(struct wpa_supplicant *wpa_s);
++
++#ifdef CONFIG_WPS
++void wpas_ubus_notify(struct wpa_supplicant *wpa_s, const struct wps_credential *cred);
++#endif
++
++#else
++struct wpas_ubus_bss {};
++
++static inline void wpas_ubus_add_bss(struct wpa_supplicant *wpa_s)
++{
++}
++
++static inline void wpas_ubus_free_bss(struct wpa_supplicant *wpa_s)
++{
++}
++
++static inline void wpas_ubus_notify(struct wpa_supplicant *wpa_s, struct wps_credential *cred)
++{
++}
++
++static inline void wpas_ubus_add(struct wpa_global *global)
++{
++}
++
++static inline void wpas_ubus_free(struct wpa_global *global)
++{
++}
++#endif
++
++#endif
+diff --git a/wpa_supplicant/ucode.c b/wpa_supplicant/ucode.c
+new file mode 100644
+index 000000000..397f85bde
+--- /dev/null
++++ b/wpa_supplicant/ucode.c
+@@ -0,0 +1,299 @@
++#include "utils/includes.h"
++#include "utils/common.h"
++#include "utils/ucode.h"
++#include "drivers/driver.h"
++#include "ap/hostapd.h"
++#include "wpa_supplicant_i.h"
++#include "wps_supplicant.h"
++#include "bss.h"
++#include "ucode.h"
++
++static struct wpa_global *wpa_global;
++static uc_resource_type_t *global_type, *iface_type;
++static uc_value_t *global, *iface_registry;
++static uc_vm_t *vm;
++
++static uc_value_t *
++wpas_ucode_iface_get_uval(struct wpa_supplicant *wpa_s)
++{
++ uc_value_t *val;
++
++ if (wpa_s->ucode.idx)
++ return wpa_ucode_registry_get(iface_registry, wpa_s->ucode.idx);
++
++ val = uc_resource_new(iface_type, wpa_s);
++ wpa_s->ucode.idx = wpa_ucode_registry_add(iface_registry, val);
++
++ return val;
++}
++
++static void
++wpas_ucode_update_interfaces(void)
++{
++ uc_value_t *ifs = ucv_object_new(vm);
++ struct wpa_supplicant *wpa_s;
++ int i;
++
++ for (wpa_s = wpa_global->ifaces; wpa_s; wpa_s = wpa_s->next)
++ ucv_object_add(ifs, wpa_s->ifname, ucv_get(wpas_ucode_iface_get_uval(wpa_s)));
++
++ ucv_object_add(ucv_prototype_get(global), "interfaces", ucv_get(ifs));
++ ucv_gc(vm);
++}
++
++void wpas_ucode_add_bss(struct wpa_supplicant *wpa_s)
++{
++ uc_value_t *val;
++
++ if (wpa_ucode_call_prepare("iface_add"))
++ return;
++
++ uc_value_push(ucv_get(ucv_string_new(wpa_s->ifname)));
++ uc_value_push(ucv_get(wpas_ucode_iface_get_uval(wpa_s)));
++ ucv_put(wpa_ucode_call(2));
++ ucv_gc(vm);
++}
++
++void wpas_ucode_free_bss(struct wpa_supplicant *wpa_s)
++{
++ uc_value_t *val;
++
++ val = wpa_ucode_registry_remove(iface_registry, wpa_s->ucode.idx);
++ if (!val)
++ return;
++
++ wpa_s->ucode.idx = 0;
++ if (wpa_ucode_call_prepare("iface_remove"))
++ return;
++
++ uc_value_push(ucv_get(ucv_string_new(wpa_s->ifname)));
++ uc_value_push(ucv_get(val));
++ ucv_put(wpa_ucode_call(2));
++ ucv_gc(vm);
++}
++
++void wpas_ucode_update_state(struct wpa_supplicant *wpa_s)
++{
++ const char *state;
++ uc_value_t *val;
++
++ val = wpa_ucode_registry_get(iface_registry, wpa_s->ucode.idx);
++ if (!val)
++ return;
++
++ if (wpa_ucode_call_prepare("state"))
++ return;
++
++ state = wpa_supplicant_state_txt(wpa_s->wpa_state);
++ uc_value_push(ucv_get(ucv_string_new(wpa_s->ifname)));
++ uc_value_push(ucv_get(val));
++ uc_value_push(ucv_get(ucv_string_new(state)));
++ ucv_put(wpa_ucode_call(3));
++ ucv_gc(vm);
++}
++
++void wpas_ucode_event(struct wpa_supplicant *wpa_s, int event, union wpa_event_data *data)
++{
++ const char *state;
++ uc_value_t *val;
++
++ if (event != EVENT_CH_SWITCH_STARTED)
++ return;
++
++ val = wpa_ucode_registry_get(iface_registry, wpa_s->ucode.idx);
++ if (!val)
++ return;
++
++ if (wpa_ucode_call_prepare("event"))
++ return;
++
++ uc_value_push(ucv_get(ucv_string_new(wpa_s->ifname)));
++ uc_value_push(ucv_get(val));
++ uc_value_push(ucv_get(ucv_string_new(event_to_string(event))));
++ val = ucv_object_new(vm);
++ uc_value_push(ucv_get(val));
++
++ if (event == EVENT_CH_SWITCH_STARTED) {
++ ucv_object_add(val, "csa_count", ucv_int64_new(data->ch_switch.count));
++ ucv_object_add(val, "frequency", ucv_int64_new(data->ch_switch.freq));
++ ucv_object_add(val, "sec_chan_offset", ucv_int64_new(data->ch_switch.ch_offset));
++ ucv_object_add(val, "center_freq1", ucv_int64_new(data->ch_switch.cf1));
++ ucv_object_add(val, "center_freq2", ucv_int64_new(data->ch_switch.cf2));
++ }
++
++ ucv_put(wpa_ucode_call(4));
++ ucv_gc(vm);
++}
++
++static const char *obj_stringval(uc_value_t *obj, const char *name)
++{
++ uc_value_t *val = ucv_object_get(obj, name, NULL);
++
++ return ucv_string_get(val);
++}
++
++static uc_value_t *
++uc_wpas_add_iface(uc_vm_t *vm, size_t nargs)
++{
++ uc_value_t *info = uc_fn_arg(0);
++ uc_value_t *driver = ucv_object_get(info, "driver", NULL);
++ uc_value_t *ifname = ucv_object_get(info, "iface", NULL);
++ uc_value_t *bridge = ucv_object_get(info, "bridge", NULL);
++ uc_value_t *config = ucv_object_get(info, "config", NULL);
++ uc_value_t *ctrl = ucv_object_get(info, "ctrl", NULL);
++ struct wpa_interface iface;
++ int ret = -1;
++
++ if (ucv_type(info) != UC_OBJECT)
++ goto out;
++
++ iface = (struct wpa_interface){
++ .driver = "nl80211",
++ .ifname = ucv_string_get(ifname),
++ .bridge_ifname = ucv_string_get(bridge),
++ .confname = ucv_string_get(config),
++ .ctrl_interface = ucv_string_get(ctrl),
++ };
++
++ if (driver) {
++ const char *drvname;
++ if (ucv_type(driver) != UC_STRING)
++ goto out;
++
++ iface.driver = NULL;
++ drvname = ucv_string_get(driver);
++ for (int i = 0; wpa_drivers[i]; i++) {
++ if (!strcmp(drvname, wpa_drivers[i]->name))
++ iface.driver = wpa_drivers[i]->name;
++ }
++
++ if (!iface.driver)
++ goto out;
++ }
++
++ if (!iface.ifname || !iface.confname)
++ goto out;
++
++ ret = wpa_supplicant_add_iface(wpa_global, &iface, 0) ? 0 : -1;
++ wpas_ucode_update_interfaces();
++
++out:
++ return ucv_int64_new(ret);
++}
++
++static uc_value_t *
++uc_wpas_remove_iface(uc_vm_t *vm, size_t nargs)
++{
++ struct wpa_supplicant *wpa_s = NULL;
++ uc_value_t *ifname_arg = uc_fn_arg(0);
++ const char *ifname = ucv_string_get(ifname_arg);
++ int ret = -1;
++
++ if (!ifname)
++ goto out;
++
++ for (wpa_s = wpa_global->ifaces; wpa_s; wpa_s = wpa_s->next)
++ if (!strcmp(wpa_s->ifname, ifname))
++ break;
++
++ if (!wpa_s)
++ goto out;
++
++ ret = wpa_supplicant_remove_iface(wpa_global, wpa_s, 0);
++ wpas_ucode_update_interfaces();
++
++out:
++ return ucv_int64_new(ret);
++}
++
++static uc_value_t *
++uc_wpas_iface_status(uc_vm_t *vm, size_t nargs)
++{
++ struct wpa_supplicant *wpa_s = uc_fn_thisval("wpas.iface");
++ struct wpa_bss *bss;
++ uc_value_t *ret, *val;
++
++ if (!wpa_s)
++ return NULL;
++
++ ret = ucv_object_new(vm);
++
++ val = ucv_string_new(wpa_supplicant_state_txt(wpa_s->wpa_state));
++ ucv_object_add(ret, "state", ucv_get(val));
++
++ bss = wpa_s->current_bss;
++ if (bss) {
++ int sec_chan = 0;
++ const u8 *ie;
++
++ ie = wpa_bss_get_ie(bss, WLAN_EID_HT_OPERATION);
++ if (ie && ie[1] >= 2) {
++ const struct ieee80211_ht_operation *ht_oper;
++ int sec;
++
++ ht_oper = (const void *) (ie + 2);
++ sec = ht_oper->ht_param & HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK;
++ if (sec == HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE)
++ sec_chan = 1;
++ else if (sec == HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW)
++ sec_chan = -1;
++ }
++
++ ucv_object_add(ret, "sec_chan_offset", ucv_int64_new(sec_chan));
++ ucv_object_add(ret, "frequency", ucv_int64_new(bss->freq));
++ }
++
++#ifdef CONFIG_MESH
++ if (wpa_s->ifmsh) {
++ struct hostapd_iface *ifmsh = wpa_s->ifmsh;
++
++ ucv_object_add(ret, "sec_chan_offset", ucv_int64_new(ifmsh->conf->secondary_channel));
++ ucv_object_add(ret, "frequency", ucv_int64_new(ifmsh->freq));
++ }
++#endif
++
++ return ret;
++}
++
++int wpas_ucode_init(struct wpa_global *gl)
++{
++ static const uc_function_list_t global_fns[] = {
++ { "printf", uc_wpa_printf },
++ { "getpid", uc_wpa_getpid },
++ { "add_iface", uc_wpas_add_iface },
++ { "remove_iface", uc_wpas_remove_iface },
++ { "udebug_set", uc_wpa_udebug_set },
++ };
++ static const uc_function_list_t iface_fns[] = {
++ { "status", uc_wpas_iface_status },
++ };
++ uc_value_t *data, *proto;
++
++ wpa_global = gl;
++ vm = wpa_ucode_create_vm();
++
++ global_type = uc_type_declare(vm, "wpas.global", global_fns, NULL);
++ iface_type = uc_type_declare(vm, "wpas.iface", iface_fns, NULL);
++
++ iface_registry = ucv_array_new(vm);
++ uc_vm_registry_set(vm, "wpas.iface_registry", iface_registry);
++
++ global = wpa_ucode_global_init("wpas", global_type);
++
++ if (wpa_ucode_run(HOSTAPD_UC_PATH "wpa_supplicant.uc"))
++ goto free_vm;
++
++ ucv_gc(vm);
++ return 0;
++
++free_vm:
++ wpa_ucode_free_vm();
++ return -1;
++}
++
++void wpas_ucode_free(void)
++{
++ if (wpa_ucode_call_prepare("shutdown") == 0)
++ ucv_put(wpa_ucode_call(0));
++ wpa_ucode_free_vm();
++}
+diff --git a/wpa_supplicant/ucode.h b/wpa_supplicant/ucode.h
+new file mode 100644
+index 000000000..a429a0ed8
+--- /dev/null
++++ b/wpa_supplicant/ucode.h
+@@ -0,0 +1,49 @@
++#ifndef __WPAS_UCODE_H
++#define __WPAS_UCODE_H
++
++#include "utils/ucode.h"
++
++struct wpa_global;
++union wpa_event_data;
++struct wpa_supplicant;
++
++struct wpas_ucode_bss {
++#ifdef UCODE_SUPPORT
++ unsigned int idx;
++#endif
++};
++
++#ifdef UCODE_SUPPORT
++int wpas_ucode_init(struct wpa_global *gl);
++void wpas_ucode_free(void);
++void wpas_ucode_add_bss(struct wpa_supplicant *wpa_s);
++void wpas_ucode_free_bss(struct wpa_supplicant *wpa_s);
++void wpas_ucode_update_state(struct wpa_supplicant *wpa_s);
++void wpas_ucode_event(struct wpa_supplicant *wpa_s, int event, union wpa_event_data *data);
++#else
++static inline int wpas_ucode_init(struct wpa_global *gl)
++{
++ return -EINVAL;
++}
++static inline void wpas_ucode_free(void)
++{
++}
++static inline void wpas_ucode_add_bss(struct wpa_supplicant *wpa_s)
++{
++}
++
++static inline void wpas_ucode_free_bss(struct wpa_supplicant *wpa_s)
++{
++}
++
++static inline void wpas_ucode_update_state(struct wpa_supplicant *wpa_s)
++{
++}
++
++static inline void wpas_ucode_event(struct wpa_supplicant *wpa_s, int event, union wpa_event_data *data)
++{
++}
++
++#endif
++
++#endif
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0007-hostapd-sync-2024-01-18-openwrt-trunk-patch-folder.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0007-hostapd-sync-2024-01-18-openwrt-trunk-patch-folder.patch
new file mode 100644
index 0000000..0d3c836
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0007-hostapd-sync-2024-01-18-openwrt-trunk-patch-folder.patch
@@ -0,0 +1,14475 @@
+From 9b494f220305cbd8e8f4f809ac6142994591a072 Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Tue, 23 Jan 2024 17:07:17 +0800
+Subject: [PATCH 07/69] hostapd: sync 2024-01-18 openwrt/trunk patch folder
+
+---
+ hostapd/Makefile | 149 +-
+ hostapd/config_file.c | 39 +-
+ hostapd/ctrl_iface.c | 4 +
+ hostapd/defconfig | 15 +-
+ hostapd/hostapd_cli.c | 10 +-
+ hostapd/main.c | 21 +-
+ src/ap/acs.c | 5 +-
+ src/ap/airtime_policy.c | 15 +-
+ src/ap/ap_config.h | 8 +
+ src/ap/ap_drv_ops.c | 5 +-
+ src/ap/ap_drv_ops.h | 21 +-
+ src/ap/beacon.c | 14 +-
+ src/ap/ctrl_iface_ap.c | 45 +-
+ src/ap/dfs.c | 22 +-
+ src/ap/drv_callbacks.c | 16 +-
+ src/ap/hostapd.c | 51 +-
+ src/ap/hostapd.h | 42 +
+ src/ap/hw_features.c | 3 +-
+ src/ap/ieee802_11.c | 50 +-
+ src/ap/ieee802_11_ht.c | 15 +
+ src/ap/ieee802_11_shared.c | 2 -
+ src/ap/ieee802_11_vht.c | 17 +
+ src/ap/ieee802_1x.c | 6 +
+ src/ap/ndisc_snoop.c | 1 +
+ src/ap/rrm.c | 8 +
+ src/ap/sta_info.c | 35 +-
+ src/ap/sta_info.h | 12 +-
+ src/ap/vlan_full.c | 4 +
+ src/ap/vlan_init.c | 8 +-
+ src/ap/wnm_ap.c | 16 +-
+ src/ap/wpa_auth.c | 3 +-
+ src/ap/wpa_auth_glue.c | 9 +-
+ src/ap/wps_hostapd.c | 6 +-
+ src/ap/x_snoop.c | 22 +-
+ src/common/dpp_crypto.c | 10 +-
+ src/common/hw_features_common.c | 1 +
+ src/common/ieee802_11_defs.h | 2 +
+ src/common/sae.c | 7 +
+ src/common/wpa_common.c | 40 +-
+ src/common/wpa_ctrl.c | 10 +-
+ src/crypto/Makefile | 129 +-
+ src/crypto/crypto_mbedtls.c | 4228 +++++++++++++++++++++
+ src/crypto/crypto_module_tests.c | 134 +
+ src/crypto/crypto_wolfssl.c | 18 +
+ src/crypto/tls_mbedtls.c | 3313 ++++++++++++++++
+ src/drivers/driver.h | 36 +-
+ src/drivers/driver_nl80211.c | 309 +-
+ src/drivers/driver_nl80211_capa.c | 4 +
+ src/drivers/driver_nl80211_event.c | 5 +
+ src/drivers/driver_nl80211_scan.c | 2 +-
+ src/drivers/drivers.c | 4 +
+ src/drivers/drivers.mak | 4 +-
+ src/drivers/rfkill.h | 16 +
+ src/radius/radius_client.c | 34 +
+ src/radius/radius_client.h | 2 +
+ src/radius/radius_das.c | 201 +-
+ src/radius/radius_das.h | 1 +
+ src/radius/radius_server.c | 61 +-
+ src/rsn_supp/wpa.c | 3 +
+ src/tls/Makefile | 11 +
+ src/utils/eloop.c | 20 +-
+ src/utils/eloop.h | 8 +
+ src/utils/uloop.c | 64 +
+ src/utils/wpa_debug.c | 49 +-
+ src/utils/wpa_debug.h | 73 +-
+ tests/Makefile | 65 +-
+ tests/hwsim/example-hostapd.config | 10 +-
+ tests/hwsim/example-wpa_supplicant.config | 11 +-
+ tests/hwsim/test_ap_eap.py | 112 +-
+ tests/hwsim/test_ap_ft.py | 4 +-
+ tests/hwsim/test_authsrv.py | 9 +-
+ tests/hwsim/test_dpp.py | 19 +-
+ tests/hwsim/test_erp.py | 16 +-
+ tests/hwsim/test_fils.py | 12 +
+ tests/hwsim/test_pmksa_cache.py | 4 +-
+ tests/hwsim/test_sae.py | 7 +
+ tests/hwsim/test_suite_b.py | 3 +
+ tests/hwsim/test_wpas_ctrl.py | 2 +-
+ tests/hwsim/utils.py | 8 +-
+ tests/test-crypto_module.c | 16 +
+ tests/test-https.c | 12 +-
+ tests/test-https_server.c | 12 +-
+ wpa_supplicant/Makefile | 144 +-
+ wpa_supplicant/ap.c | 22 +-
+ wpa_supplicant/config.c | 95 +
+ wpa_supplicant/config_file.c | 8 +-
+ wpa_supplicant/config_ssid.h | 7 +
+ wpa_supplicant/ctrl_iface.c | 12 +-
+ wpa_supplicant/defconfig | 6 +-
+ wpa_supplicant/eapol_test.c | 11 +
+ wpa_supplicant/events.c | 13 +-
+ wpa_supplicant/main.c | 14 +-
+ wpa_supplicant/mesh.c | 3 +
+ wpa_supplicant/wpa_cli.c | 9 +
+ wpa_supplicant/wpa_priv.c | 8 +-
+ wpa_supplicant/wpa_supplicant.c | 75 +-
+ wpa_supplicant/wpa_supplicant_i.h | 6 +
+ wpa_supplicant/wps_supplicant.c | 3 +
+ wpa_supplicant/wps_supplicant.h | 3 +-
+ 99 files changed, 9791 insertions(+), 468 deletions(-)
+ create mode 100644 src/crypto/crypto_mbedtls.c
+ create mode 100644 src/crypto/tls_mbedtls.c
+ create mode 100644 src/utils/uloop.c
+ create mode 100644 tests/test-crypto_module.c
+
+diff --git a/hostapd/Makefile b/hostapd/Makefile
+index 405e05e5f..f5c1dc029 100644
+--- a/hostapd/Makefile
++++ b/hostapd/Makefile
+@@ -1,6 +1,7 @@
+ ALL=hostapd hostapd_cli
+ CONFIG_FILE = .config
+
++-include $(if $(MULTICALL), ../wpa_supplicant/.config)
+ include ../src/build.rules
+
+ ifdef LIBS
+@@ -62,6 +63,10 @@ endif
+ OBJS += main.o
+ OBJS += config_file.o
+
++ifdef CONFIG_RADIUS_SERVER
++OBJS += radius.o
++endif
++
+ OBJS += ../src/ap/hostapd.o
+ OBJS += ../src/ap/wpa_auth_glue.o
+ OBJS += ../src/ap/drv_callbacks.o
+@@ -171,6 +176,24 @@ OBJS += ../src/common/hw_features_common.o
+
+ OBJS += ../src/eapol_auth/eapol_auth_sm.o
+
++ifdef CONFIG_UBUS
++CFLAGS += -DUBUS_SUPPORT
++OBJS += ../src/ap/ubus.o
++LIBS += -lubus
++NEED_ULOOP:=y
++endif
++
++ifdef CONFIG_UCODE
++CFLAGS += -DUCODE_SUPPORT
++OBJS += ../src/utils/ucode.o
++OBJS += ../src/ap/ucode.o
++NEED_ULOOP:=y
++endif
++
++ifdef NEED_ULOOP
++OBJS += ../src/utils/uloop.o
++LIBS += -lubox
++endif
+
+ ifdef CONFIG_CODE_COVERAGE
+ CFLAGS += -O0 -fprofile-arcs -ftest-coverage -U_FORTIFY_SOURCE
+@@ -205,7 +228,8 @@ endif
+
+ ifdef CONFIG_NO_VLAN
+ CFLAGS += -DCONFIG_NO_VLAN
+-else
++endif
++ifneq ($(findstring CONFIG_NO_VLAN,$(CFLAGS)), CONFIG_NO_VLAN)
+ OBJS += ../src/ap/vlan_init.o
+ OBJS += ../src/ap/vlan_ifconfig.o
+ OBJS += ../src/ap/vlan.o
+@@ -225,6 +249,9 @@ endif
+ ifdef CONFIG_NO_CTRL_IFACE
+ CFLAGS += -DCONFIG_NO_CTRL_IFACE
+ else
++ifdef CONFIG_CTRL_IFACE_MIB
++CFLAGS += -DCONFIG_CTRL_IFACE_MIB
++endif
+ ifeq ($(CONFIG_CTRL_IFACE), udp)
+ CFLAGS += -DCONFIG_CTRL_IFACE_UDP
+ else
+@@ -332,6 +359,7 @@ ifdef CONFIG_FILS
+ CFLAGS += -DCONFIG_FILS
+ OBJS += ../src/ap/fils_hlp.o
+ NEED_SHA384=y
++NEED_HMAC_SHA384_KDF=y
+ NEED_AES_SIV=y
+ ifdef CONFIG_FILS_SK_PFS
+ CFLAGS += -DCONFIG_FILS_SK_PFS
+@@ -364,10 +392,14 @@ CFLAGS += -DCONFIG_MBO
+ OBJS += ../src/ap/mbo_ap.o
+ endif
+
++ifndef MULTICALL
++CFLAGS += -DNO_SUPPLICANT
++endif
++
+ include ../src/drivers/drivers.mak
+-OBJS += $(DRV_AP_OBJS)
+-CFLAGS += $(DRV_AP_CFLAGS)
+-LDFLAGS += $(DRV_AP_LDFLAGS)
++OBJS += $(sort $(DRV_AP_OBJS) $(if $(MULTICALL),$(DRV_WPA_OBJS)))
++CFLAGS += $(DRV_AP_CFLAGS) $(if $(MULTICALL),$(DRV_WPA_CFLAGS))
++LDFLAGS += $(DRV_AP_LDFLAGS) $(if $(MULTICALL),$(DRV_WPA_LDFLAGS))
+ LIBS += $(DRV_AP_LIBS)
+
+ ifdef CONFIG_L2_PACKET
+@@ -714,6 +746,7 @@ CFLAGS += -DCONFIG_TLSV12
+ endif
+
+ ifeq ($(CONFIG_TLS), wolfssl)
++CFLAGS += -DCONFIG_TLS_WOLFSSL
+ CONFIG_CRYPTO=wolfssl
+ ifdef TLS_FUNCS
+ OBJS += ../src/crypto/tls_wolfssl.o
+@@ -734,6 +767,7 @@ endif
+ endif
+
+ ifeq ($(CONFIG_TLS), openssl)
++CFLAGS += -DCONFIG_TLS_OPENSSL
+ CFLAGS += -DCRYPTO_RSA_OAEP_SHA256
+ CONFIG_CRYPTO=openssl
+ ifdef TLS_FUNCS
+@@ -763,7 +797,39 @@ endif
+ CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONFIG_TLS_DEFAULT_CIPHERS)\"
+ endif
+
++ifeq ($(CONFIG_TLS), mbedtls)
++CFLAGS += -DCONFIG_TLS_MBEDTLS
++ifndef CONFIG_CRYPTO
++CONFIG_CRYPTO=mbedtls
++endif
++ifdef TLS_FUNCS
++OBJS += ../src/crypto/tls_mbedtls.o
++LIBS += -lmbedtls
++ifndef CONFIG_DPP
++LIBS += -lmbedx509
++endif
++endif
++OBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
++HOBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
++SOBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
++ifeq ($(CONFIG_CRYPTO), mbedtls)
++ifdef CONFIG_DPP
++LIBS += -lmbedx509
++LIBS_h += -lmbedx509
++LIBS_n += -lmbedx509
++LIBS_s += -lmbedx509
++endif
++LIBS += -lmbedcrypto
++LIBS_h += -lmbedcrypto
++LIBS_n += -lmbedcrypto
++LIBS_s += -lmbedcrypto
++# XXX: create a config option?
++CFLAGS += -DCRYPTO_RSA_OAEP_SHA256
++endif
++endif
++
+ ifeq ($(CONFIG_TLS), gnutls)
++CFLAGS += -DCONFIG_TLS_GNUTLS
+ ifndef CONFIG_CRYPTO
+ # default to libgcrypt
+ CONFIG_CRYPTO=gnutls
+@@ -794,6 +860,7 @@ endif
+ endif
+
+ ifeq ($(CONFIG_TLS), internal)
++CFLAGS += -DCONFIG_TLS_INTERNAL
+ ifndef CONFIG_CRYPTO
+ CONFIG_CRYPTO=internal
+ endif
+@@ -872,6 +939,7 @@ endif
+ endif
+
+ ifeq ($(CONFIG_TLS), linux)
++CFLAGS += -DCONFIG_TLS_INTERNAL
+ OBJS += ../src/crypto/crypto_linux.o
+ ifdef TLS_FUNCS
+ OBJS += ../src/crypto/crypto_internal-rsa.o
+@@ -942,9 +1010,11 @@ endif
+
+ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ AESOBJS += ../src/crypto/aes-wrap.o
+ endif
+ endif
++endif
+ ifdef NEED_AES_EAX
+ AESOBJS += ../src/crypto/aes-eax.o
+ NEED_AES_CTR=y
+@@ -954,38 +1024,48 @@ AESOBJS += ../src/crypto/aes-siv.o
+ NEED_AES_CTR=y
+ endif
+ ifdef NEED_AES_CTR
++ifneq ($(CONFIG_TLS), mbedtls)
+ AESOBJS += ../src/crypto/aes-ctr.o
+ endif
++endif
+ ifdef NEED_AES_ENCBLOCK
++ifneq ($(CONFIG_TLS), mbedtls)
+ AESOBJS += ../src/crypto/aes-encblock.o
+ endif
++endif
+ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), linux)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ AESOBJS += ../src/crypto/aes-omac1.o
+ endif
+ endif
+ endif
++endif
+ ifdef NEED_AES_UNWRAP
+ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), linux)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ NEED_AES_DEC=y
+ AESOBJS += ../src/crypto/aes-unwrap.o
+ endif
+ endif
+ endif
+ endif
++endif
+ ifdef NEED_AES_CBC
+ NEED_AES_DEC=y
+ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), linux)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ AESOBJS += ../src/crypto/aes-cbc.o
+ endif
+ endif
+ endif
+ endif
++endif
+ ifdef NEED_AES_DEC
+ ifdef CONFIG_INTERNAL_AES
+ AESOBJS += ../src/crypto/aes-internal-dec.o
+@@ -1000,12 +1080,16 @@ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), linux)
+ ifneq ($(CONFIG_TLS), gnutls)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ SHA1OBJS += ../src/crypto/sha1.o
+ endif
+ endif
+ endif
+ endif
++endif
++ifneq ($(CONFIG_TLS), mbedtls)
+ SHA1OBJS += ../src/crypto/sha1-prf.o
++endif
+ ifdef CONFIG_INTERNAL_SHA1
+ SHA1OBJS += ../src/crypto/sha1-internal.o
+ ifdef NEED_FIPS186_2_PRF
+@@ -1014,16 +1098,22 @@ endif
+ endif
+ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ SHA1OBJS += ../src/crypto/sha1-pbkdf2.o
+ endif
+ endif
++endif
+ ifdef NEED_T_PRF
++ifneq ($(CONFIG_TLS), mbedtls)
+ SHA1OBJS += ../src/crypto/sha1-tprf.o
+ endif
++endif
+ ifdef NEED_TLS_PRF
++ifneq ($(CONFIG_TLS), mbedtls)
+ SHA1OBJS += ../src/crypto/sha1-tlsprf.o
+ endif
+ endif
++endif
+
+ ifdef NEED_SHA1
+ OBJS += $(SHA1OBJS)
+@@ -1033,11 +1123,13 @@ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), linux)
+ ifneq ($(CONFIG_TLS), gnutls)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/md5.o
+ endif
+ endif
+ endif
+ endif
++endif
+
+ ifdef NEED_MD5
+ ifdef CONFIG_INTERNAL_MD5
+@@ -1076,56 +1168,81 @@ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), linux)
+ ifneq ($(CONFIG_TLS), gnutls)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha256.o
+ endif
+ endif
+ endif
+ endif
++endif
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha256-prf.o
++endif
+ ifdef CONFIG_INTERNAL_SHA256
+ OBJS += ../src/crypto/sha256-internal.o
+ endif
+ ifdef NEED_TLS_PRF_SHA256
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha256-tlsprf.o
+ endif
++endif
+ ifdef NEED_TLS_PRF_SHA384
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha384-tlsprf.o
+ endif
++endif
+ ifdef NEED_HMAC_SHA256_KDF
++CFLAGS += -DCONFIG_HMAC_SHA256_KDF
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha256-kdf.o
+ endif
++endif
+ ifdef NEED_HMAC_SHA384_KDF
++CFLAGS += -DCONFIG_HMAC_SHA384_KDF
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha384-kdf.o
+ endif
++endif
+ ifdef NEED_HMAC_SHA512_KDF
++CFLAGS += -DCONFIG_HMAC_SHA512_KDF
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha512-kdf.o
+ endif
++endif
+ ifdef NEED_SHA384
+ CFLAGS += -DCONFIG_SHA384
+ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), linux)
+ ifneq ($(CONFIG_TLS), gnutls)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha384.o
+ endif
+ endif
+ endif
+ endif
++endif
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha384-prf.o
+ endif
++endif
+ ifdef NEED_SHA512
+ CFLAGS += -DCONFIG_SHA512
+ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), linux)
+ ifneq ($(CONFIG_TLS), gnutls)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha512.o
+ endif
+ endif
+ endif
+ endif
++endif
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha512-prf.o
+ endif
++endif
+
+ ifdef CONFIG_INTERNAL_SHA384
+ CFLAGS += -DCONFIG_INTERNAL_SHA384
+@@ -1170,11 +1287,13 @@ HOBJS += $(SHA1OBJS)
+ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), linux)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ HOBJS += ../src/crypto/md5.o
+ endif
+ endif
+ endif
+ endif
++endif
+
+ ifdef CONFIG_RADIUS_SERVER
+ CFLAGS += -DRADIUS_SERVER
+@@ -1311,8 +1430,14 @@ install: $(addprefix $(DESTDIR)$(BINDIR)/,$(ALL))
+ _OBJS_VAR := OBJS
+ include ../src/objs.mk
+
++hostapd_multi.a: $(BCHECK) $(OBJS)
++ $(Q)$(CC) -c -o hostapd_multi.o -Dmain=hostapd_main $(CFLAGS) main.c
++ @$(E) " CC " $<
++ @rm -f $@
++ @$(AR) cr $@ hostapd_multi.o $(OBJS)
++
+ hostapd: $(OBJS)
+- $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
++ +$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
+ @$(E) " LD " $@
+
+ ifdef CONFIG_WPA_TRACE
+@@ -1323,7 +1448,7 @@ _OBJS_VAR := OBJS_c
+ include ../src/objs.mk
+
+ hostapd_cli: $(OBJS_c)
+- $(Q)$(CC) $(LDFLAGS) -o hostapd_cli $(OBJS_c) $(LIBS_c)
++ +$(Q)$(CC) $(LDFLAGS) -o hostapd_cli $(OBJS_c) $(LIBS_c)
+ @$(E) " LD " $@
+
+ NOBJS = nt_password_hash.o ../src/crypto/ms_funcs.o $(SHA1OBJS)
+@@ -1347,7 +1472,9 @@ NOBJS += ../src/utils/trace.o
+ endif
+
+ HOBJS += hlr_auc_gw.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o ../src/utils/wpabuf.o ../src/crypto/milenage.o
++ifneq ($(CONFIG_TLS), mbedtls)
+ HOBJS += ../src/crypto/aes-encblock.o
++endif
+ ifdef CONFIG_INTERNAL_AES
+ HOBJS += ../src/crypto/aes-internal.o
+ HOBJS += ../src/crypto/aes-internal-enc.o
+@@ -1370,13 +1497,17 @@ SOBJS += ../src/common/sae.o
+ SOBJS += ../src/common/sae_pk.o
+ SOBJS += ../src/common/dragonfly.o
+ SOBJS += $(AESOBJS)
++ifneq ($(CONFIG_TLS), mbedtls)
+ SOBJS += ../src/crypto/sha256-prf.o
+ SOBJS += ../src/crypto/sha384-prf.o
+ SOBJS += ../src/crypto/sha512-prf.o
++endif
+ SOBJS += ../src/crypto/dh_groups.o
++ifneq ($(CONFIG_TLS), mbedtls)
+ SOBJS += ../src/crypto/sha256-kdf.o
+ SOBJS += ../src/crypto/sha384-kdf.o
+ SOBJS += ../src/crypto/sha512-kdf.o
++endif
+
+ _OBJS_VAR := NOBJS
+ include ../src/objs.mk
+@@ -1385,6 +1516,12 @@ include ../src/objs.mk
+ _OBJS_VAR := SOBJS
+ include ../src/objs.mk
+
++dump_cflags:
++ @printf "%s " "$(CFLAGS)"
++
++dump_ldflags:
++ @printf "%s " "$(LDFLAGS) $(LIBS) $(EXTRALIBS)"
++
+ nt_password_hash: $(NOBJS)
+ $(Q)$(CC) $(LDFLAGS) -o nt_password_hash $(NOBJS) $(LIBS_n)
+ @$(E) " LD " $@
+diff --git a/hostapd/config_file.c b/hostapd/config_file.c
+index 261905368..0094db279 100644
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -1229,6 +1229,8 @@ static int hostapd_config_vht_capab(struct hostapd_config *conf,
+ conf->vht_capab |= VHT_CAP_RX_ANTENNA_PATTERN;
+ if (os_strstr(capab, "[TX-ANTENNA-PATTERN]"))
+ conf->vht_capab |= VHT_CAP_TX_ANTENNA_PATTERN;
++ if (os_strstr(capab, "[EXT-NSS-BW-SUPP]"))
++ conf->vht_capab |= VHT_CAP_EXTENDED_NSS_BW_SUPPORT;
+ return 0;
+ }
+ #endif /* CONFIG_IEEE80211AC */
+@@ -1678,6 +1680,8 @@ static int parse_anqp_elem(struct hostapd_bss_config *bss, char *buf, int line)
+ return 0;
+ }
+
++#endif /* CONFIG_INTERWORKING */
++
+
+ static int parse_qos_map_set(struct hostapd_bss_config *bss,
+ char *buf, int line)
+@@ -1719,8 +1723,6 @@ static int parse_qos_map_set(struct hostapd_bss_config *bss,
+ return 0;
+ }
+
+-#endif /* CONFIG_INTERWORKING */
+-
+
+ #ifdef CONFIG_HS20
+ static int hs20_parse_conn_capab(struct hostapd_bss_config *bss, char *buf,
+@@ -2630,8 +2632,12 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ sizeof(conf->bss[0]->iface));
+ } else if (os_strcmp(buf, "bridge") == 0) {
+ os_strlcpy(bss->bridge, pos, sizeof(bss->bridge));
++ if (!bss->wds_bridge[0])
++ os_strlcpy(bss->wds_bridge, pos, sizeof(bss->wds_bridge));
+ } else if (os_strcmp(buf, "bridge_hairpin") == 0) {
+ bss->bridge_hairpin = atoi(pos);
++ } else if (os_strcmp(buf, "snoop_iface") == 0) {
++ os_strlcpy(bss->snoop_iface, pos, sizeof(bss->snoop_iface));
+ } else if (os_strcmp(buf, "vlan_bridge") == 0) {
+ os_strlcpy(bss->vlan_bridge, pos, sizeof(bss->vlan_bridge));
+ } else if (os_strcmp(buf, "wds_bridge") == 0) {
+@@ -2998,6 +3004,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ } else if (os_strcmp(buf, "iapp_interface") == 0) {
+ wpa_printf(MSG_INFO, "DEPRECATED: iapp_interface not used");
+ #endif /* CONFIG_IAPP */
++ } else if (os_strcmp(buf, "dynamic_own_ip_addr") == 0) {
++ bss->dynamic_own_ip_addr = atoi(pos);
+ } else if (os_strcmp(buf, "own_ip_addr") == 0) {
+ if (hostapd_parse_ip_addr(pos, &bss->own_ip_addr)) {
+ wpa_printf(MSG_ERROR,
+@@ -3222,6 +3230,14 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ line, bss->max_num_sta, MAX_STA_COUNT);
+ return 1;
+ }
++ } else if (os_strcmp(buf, "iface_max_num_sta") == 0) {
++ conf->max_num_sta = atoi(pos);
++ if (conf->max_num_sta < 0 ||
++ conf->max_num_sta > MAX_STA_COUNT) {
++ wpa_printf(MSG_ERROR, "Line %d: Invalid max_num_sta=%d; allowed range 0..%d",
++ line, conf->max_num_sta, MAX_STA_COUNT);
++ return 1;
++ }
+ } else if (os_strcmp(buf, "wpa") == 0) {
+ bss->wpa = atoi(pos);
+ } else if (os_strcmp(buf, "extended_key_id") == 0) {
+@@ -3373,6 +3389,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ wpa_printf(MSG_INFO,
+ "Line %d: Obsolete peerkey parameter ignored", line);
+ #ifdef CONFIG_IEEE80211R_AP
++ } else if (os_strcmp(buf, "ft_iface") == 0) {
++ os_strlcpy(bss->ft_iface, pos, sizeof(bss->ft_iface));
+ } else if (os_strcmp(buf, "mobility_domain") == 0) {
+ if (os_strlen(pos) != 2 * MOBILITY_DOMAIN_ID_LEN ||
+ hexstr2bin(pos, bss->mobility_domain,
+@@ -3742,6 +3760,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ #ifndef CONFIG_NO_VLAN
+ } else if (os_strcmp(buf, "dynamic_vlan") == 0) {
+ bss->ssid.dynamic_vlan = atoi(pos);
++ } else if (os_strcmp(buf, "vlan_no_bridge") == 0) {
++ bss->ssid.vlan_no_bridge = atoi(pos);
+ } else if (os_strcmp(buf, "per_sta_vif") == 0) {
+ bss->ssid.per_sta_vif = atoi(pos);
+ } else if (os_strcmp(buf, "vlan_file") == 0) {
+@@ -3839,6 +3859,10 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ if (bss->ocv && !bss->ieee80211w)
+ bss->ieee80211w = 1;
+ #endif /* CONFIG_OCV */
++ } else if (os_strcmp(buf, "noscan") == 0) {
++ conf->noscan = atoi(pos);
++ } else if (os_strcmp(buf, "ht_coex") == 0) {
++ conf->no_ht_coex = !atoi(pos);
+ } else if (os_strcmp(buf, "ieee80211n") == 0) {
+ conf->ieee80211n = atoi(pos);
+ } else if (os_strcmp(buf, "ht_capab") == 0) {
+@@ -3887,6 +3911,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ } else if (os_strcmp(buf, "he_bss_color") == 0) {
+ conf->he_op.he_bss_color = atoi(pos) & 0x3f;
+ conf->he_op.he_bss_color_disabled = 0;
++ if (atoi(pos) > 63)
++ conf->he_op.he_bss_color = os_random() % 63 + 1;
+ } else if (os_strcmp(buf, "he_bss_color_partial") == 0) {
+ conf->he_op.he_bss_color_partial = atoi(pos);
+ } else if (os_strcmp(buf, "he_default_pe_duration") == 0) {
+@@ -4520,10 +4546,10 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ bss->gas_frag_limit = val;
+ } else if (os_strcmp(buf, "gas_comeback_delay") == 0) {
+ bss->gas_comeback_delay = atoi(pos);
++#endif /* CONFIG_INTERWORKING */
+ } else if (os_strcmp(buf, "qos_map_set") == 0) {
+ if (parse_qos_map_set(bss, pos, line) < 0)
+ return 1;
+-#endif /* CONFIG_INTERWORKING */
+ #ifdef CONFIG_RADIUS_TEST
+ } else if (os_strcmp(buf, "dump_msk_file") == 0) {
+ os_free(bss->dump_msk_file);
+@@ -5347,7 +5373,12 @@ struct hostapd_config * hostapd_config_read(const char *fname)
+ int errors = 0;
+ size_t i;
+
+- f = fopen(fname, "r");
++ if (!strncmp(fname, "data:", 5)) {
++ f = fmemopen((void *)(fname + 5), strlen(fname + 5), "r");
++ fname = "<inline>";
++ } else {
++ f = fopen(fname, "r");
++ }
+ if (f == NULL) {
+ wpa_printf(MSG_ERROR, "Could not open configuration file '%s' "
+ "for reading.", fname);
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index 6f2b31eaf..c6ce89fb6 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -3897,6 +3897,7 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ reply_size);
+ } else if (os_strcmp(buf, "STATUS-DRIVER") == 0) {
+ reply_len = hostapd_drv_status(hapd, reply, reply_size);
++#ifdef CONFIG_CTRL_IFACE_MIB
+ } else if (os_strcmp(buf, "MIB") == 0) {
+ reply_len = ieee802_11_get_mib(hapd, reply, reply_size);
+ if (reply_len >= 0) {
+@@ -3938,6 +3939,7 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
+ reply_len = hostapd_ctrl_iface_sta_next(hapd, buf + 9, reply,
+ reply_size);
++#endif
+ } else if (os_strcmp(buf, "ATTACH") == 0) {
+ if (hostapd_ctrl_iface_attach(hapd, from, fromlen, NULL))
+ reply_len = -1;
+@@ -5485,6 +5487,7 @@ try_again:
+ return -1;
+ }
+
++ interface->ctrl_iface_recv = hostapd_ctrl_iface_receive_process;
+ wpa_msg_register_cb(hostapd_ctrl_iface_msg_cb);
+
+ return 0;
+@@ -5586,6 +5589,7 @@ fail:
+ os_free(fname);
+
+ interface->global_ctrl_sock = s;
++ interface->ctrl_iface_recv = hostapd_ctrl_iface_receive_process;
+ eloop_register_read_sock(s, hostapd_global_ctrl_iface_receive,
+ interface, NULL);
+
+diff --git a/hostapd/defconfig b/hostapd/defconfig
+index 66bf894eb..f716553bb 100644
+--- a/hostapd/defconfig
++++ b/hostapd/defconfig
+@@ -6,9 +6,21 @@
+ # just setting VARIABLE=n is not disabling that variable.
+ #
+ # This file is included in Makefile, so variables like CFLAGS and LIBS can also
+-# be modified from here. In most cass, these lines should use += in order not
++# be modified from here. In most cases, these lines should use += in order not
+ # to override previous values of the variables.
+
++
++# Uncomment following two lines and fix the paths if you have installed TLS
++# libraries in a non-default location
++#CFLAGS += -I/usr/local/openssl/include
++#LIBS += -L/usr/local/openssl/lib
++
++# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
++# the kerberos files are not in the default include path. Following line can be
++# used to fix build issues on such systems (krb5.h not found).
++#CFLAGS += -I/usr/include/kerberos
++
++
+ # Driver interface for Host AP driver
+ CONFIG_DRIVER_HOSTAP=y
+
+@@ -281,6 +293,7 @@ CONFIG_IPV6=y
+ # openssl = OpenSSL (default)
+ # gnutls = GnuTLS
+ # internal = Internal TLSv1 implementation (experimental)
++# mbedtls = mbed TLS
+ # linux = Linux kernel AF_ALG and internal TLSv1 implementation (experimental)
+ # none = Empty template
+ #CONFIG_TLS=openssl
+diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
+index a9d326de8..a469b1f4d 100644
+--- a/hostapd/hostapd_cli.c
++++ b/hostapd/hostapd_cli.c
+@@ -401,7 +401,6 @@ static int hostapd_cli_cmd_disassociate(struct wpa_ctrl *ctrl, int argc,
+ }
+
+
+-#ifdef CONFIG_TAXONOMY
+ static int hostapd_cli_cmd_signature(struct wpa_ctrl *ctrl, int argc,
+ char *argv[])
+ {
+@@ -414,7 +413,6 @@ static int hostapd_cli_cmd_signature(struct wpa_ctrl *ctrl, int argc,
+ os_snprintf(buf, sizeof(buf), "SIGNATURE %s", argv[0]);
+ return wpa_ctrl_command(ctrl, buf);
+ }
+-#endif /* CONFIG_TAXONOMY */
+
+
+ static int hostapd_cli_cmd_sa_query(struct wpa_ctrl *ctrl, int argc,
+@@ -431,7 +429,6 @@ static int hostapd_cli_cmd_sa_query(struct wpa_ctrl *ctrl, int argc,
+ }
+
+
+-#ifdef CONFIG_WPS
+ static int hostapd_cli_cmd_wps_pin(struct wpa_ctrl *ctrl, int argc,
+ char *argv[])
+ {
+@@ -657,7 +654,6 @@ static int hostapd_cli_cmd_wps_config(struct wpa_ctrl *ctrl, int argc,
+ ssid_hex, argv[1]);
+ return wpa_ctrl_command(ctrl, buf);
+ }
+-#endif /* CONFIG_WPS */
+
+
+ static int hostapd_cli_cmd_disassoc_imminent(struct wpa_ctrl *ctrl, int argc,
+@@ -757,7 +753,7 @@ static int wpa_ctrl_command_sta(struct wpa_ctrl *ctrl, const char *cmd,
+ }
+
+ buf[len] = '\0';
+- if (memcmp(buf, "FAIL", 4) == 0)
++ if (memcmp(buf, "FAIL", 4) == 0 || memcmp(buf, "UNKNOWN COMMAND", 15) == 0)
+ return -1;
+ if (print)
+ printf("%s", buf);
+@@ -1670,13 +1666,10 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
+ { "disassociate", hostapd_cli_cmd_disassociate,
+ hostapd_complete_stations,
+ "<addr> = disassociate a station" },
+-#ifdef CONFIG_TAXONOMY
+ { "signature", hostapd_cli_cmd_signature, hostapd_complete_stations,
+ "<addr> = get taxonomy signature for a station" },
+-#endif /* CONFIG_TAXONOMY */
+ { "sa_query", hostapd_cli_cmd_sa_query, hostapd_complete_stations,
+ "<addr> = send SA Query to a station" },
+-#ifdef CONFIG_WPS
+ { "wps_pin", hostapd_cli_cmd_wps_pin, NULL,
+ "<uuid> <pin> [timeout] [addr] = add WPS Enrollee PIN" },
+ { "wps_check_pin", hostapd_cli_cmd_wps_check_pin, NULL,
+@@ -1701,7 +1694,6 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
+ "<SSID> <auth> <encr> <key> = configure AP" },
+ { "wps_get_status", hostapd_cli_cmd_wps_get_status, NULL,
+ "= show current WPS status" },
+-#endif /* CONFIG_WPS */
+ { "disassoc_imminent", hostapd_cli_cmd_disassoc_imminent, NULL,
+ "= send Disassociation Imminent notification" },
+ { "ess_disassoc", hostapd_cli_cmd_ess_disassoc, NULL,
+diff --git a/hostapd/main.c b/hostapd/main.c
+index a7610b8a5..dadafc64e 100644
+--- a/hostapd/main.c
++++ b/hostapd/main.c
+@@ -31,7 +31,7 @@
+ #include "config_file.h"
+ #include "eap_register.h"
+ #include "ctrl_iface.h"
+-
++#include "build_features.h"
+
+ struct hapd_global {
+ void **drv_priv;
+@@ -40,6 +40,7 @@ struct hapd_global {
+
+ static struct hapd_global global;
+
++extern int radius_main(int argc, char **argv);
+
+ #ifndef CONFIG_NO_HOSTAPD_LOGGER
+ static void hostapd_logger_cb(void *ctx, const u8 *addr, unsigned int module,
+@@ -711,6 +712,11 @@ fail:
+ return -1;
+ }
+
++void hostapd_wpa_event(void *ctx, enum wpa_event_type event,
++ union wpa_event_data *data);
++
++void hostapd_wpa_event_global(void *ctx, enum wpa_event_type event,
++ union wpa_event_data *data);
+
+ #ifdef CONFIG_WPS
+ static int gen_uuid(const char *txt_addr)
+@@ -779,6 +785,11 @@ int main(int argc, char *argv[])
+ if (os_program_init())
+ return -1;
+
++#ifdef RADIUS_SERVER
++ if (strstr(argv[0], "radius"))
++ return radius_main(argc, argv);
++#endif
++
+ os_memset(&interfaces, 0, sizeof(interfaces));
+ interfaces.reload_config = hostapd_reload_config;
+ interfaces.config_read_cb = hostapd_config_read;
+@@ -804,8 +815,10 @@ int main(int argc, char *argv[])
+ return -1;
+ #endif /* CONFIG_DPP */
+
++ wpa_supplicant_event = hostapd_wpa_event;
++ wpa_supplicant_event_global = hostapd_wpa_event_global;
+ for (;;) {
+- c = getopt(argc, argv, "b:Bde:f:hi:KP:sSTtu:vg:G:q");
++ c = getopt(argc, argv, "b:Bde:f:hi:KP:sSTtu:g:G:qv::");
+ if (c < 0)
+ break;
+ switch (c) {
+@@ -842,6 +855,8 @@ int main(int argc, char *argv[])
+ break;
+ #endif /* CONFIG_DEBUG_LINUX_TRACING */
+ case 'v':
++ if (optarg)
++ exit(!has_feature(optarg));
+ show_version();
+ exit(1);
+ case 'g':
+@@ -1011,6 +1026,7 @@ int main(int argc, char *argv[])
+ }
+
+ hostapd_global_ctrl_iface_init(&interfaces);
++ hostapd_ucode_init(&interfaces);
+
+ if (hostapd_global_run(&interfaces, daemonize, pid_file)) {
+ wpa_printf(MSG_ERROR, "Failed to start eloop");
+@@ -1020,6 +1036,7 @@ int main(int argc, char *argv[])
+ ret = 0;
+
+ out:
++ hostapd_ucode_free();
+ hostapd_global_ctrl_iface_deinit(&interfaces);
+ /* Deinitialize all interfaces */
+ for (i = 0; i < interfaces.count; i++) {
+diff --git a/src/ap/acs.c b/src/ap/acs.c
+index 28b0ba71c..4c4c750ab 100644
+--- a/src/ap/acs.c
++++ b/src/ap/acs.c
+@@ -467,17 +467,17 @@ static int acs_get_bw_center_chan(int freq, enum bw_type bw)
+ static int acs_survey_is_sufficient(struct freq_survey *survey)
+ {
+ if (!(survey->filled & SURVEY_HAS_NF)) {
++ survey->nf = -95;
+ wpa_printf(MSG_INFO,
+ "ACS: Survey for freq %d is missing noise floor",
+ survey->freq);
+- return 0;
+ }
+
+ if (!(survey->filled & SURVEY_HAS_CHAN_TIME)) {
++ survey->channel_time = 0;
+ wpa_printf(MSG_INFO,
+ "ACS: Survey for freq %d is missing channel time",
+ survey->freq);
+- return 0;
+ }
+
+ if (!(survey->filled & SURVEY_HAS_CHAN_TIME_BUSY) &&
+@@ -485,7 +485,6 @@ static int acs_survey_is_sufficient(struct freq_survey *survey)
+ wpa_printf(MSG_INFO,
+ "ACS: Survey for freq %d is missing RX and busy time (at least one is required)",
+ survey->freq);
+- return 0;
+ }
+
+ return 1;
+diff --git a/src/ap/airtime_policy.c b/src/ap/airtime_policy.c
+index 68443115f..26f11ad98 100644
+--- a/src/ap/airtime_policy.c
++++ b/src/ap/airtime_policy.c
+@@ -112,8 +112,14 @@ static void set_sta_weights(struct hostapd_data *hapd, unsigned int weight)
+ {
+ struct sta_info *sta;
+
+- for (sta = hapd->sta_list; sta; sta = sta->next)
+- sta_set_airtime_weight(hapd, sta, weight);
++ for (sta = hapd->sta_list; sta; sta = sta->next) {
++ unsigned int sta_weight = weight;
++
++ if (sta->dyn_airtime_weight)
++ sta_weight = (weight * sta->dyn_airtime_weight) / 256;
++
++ sta_set_airtime_weight(hapd, sta, sta_weight);
++ }
+ }
+
+
+@@ -244,7 +250,10 @@ int airtime_policy_new_sta(struct hostapd_data *hapd, struct sta_info *sta)
+ unsigned int weight;
+
+ if (hapd->iconf->airtime_mode == AIRTIME_MODE_STATIC) {
+- weight = get_weight_for_sta(hapd, sta->addr);
++ if (sta->dyn_airtime_weight)
++ weight = sta->dyn_airtime_weight;
++ else
++ weight = get_weight_for_sta(hapd, sta->addr);
+ if (weight)
+ return sta_set_airtime_weight(hapd, sta, weight);
+ }
+diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
+index 2330163c4..d10b00be9 100644
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -121,6 +121,7 @@ struct hostapd_ssid {
+ #define DYNAMIC_VLAN_OPTIONAL 1
+ #define DYNAMIC_VLAN_REQUIRED 2
+ int dynamic_vlan;
++ int vlan_no_bridge;
+ #define DYNAMIC_VLAN_NAMING_WITHOUT_DEVICE 0
+ #define DYNAMIC_VLAN_NAMING_WITH_DEVICE 1
+ #define DYNAMIC_VLAN_NAMING_END 2
+@@ -282,6 +283,8 @@ struct airtime_sta_weight {
+ struct hostapd_bss_config {
+ char iface[IFNAMSIZ + 1];
+ char bridge[IFNAMSIZ + 1];
++ char ft_iface[IFNAMSIZ + 1];
++ char snoop_iface[IFNAMSIZ + 1];
+ char vlan_bridge[IFNAMSIZ + 1];
+ char wds_bridge[IFNAMSIZ + 1];
+ int bridge_hairpin; /* hairpin_mode on bridge members */
+@@ -307,6 +310,7 @@ struct hostapd_bss_config {
+ unsigned int eap_sim_db_timeout;
+ int eap_server_erp; /* Whether ERP is enabled on internal EAP server */
+ struct hostapd_ip_addr own_ip_addr;
++ int dynamic_own_ip_addr;
+ char *nas_identifier;
+ struct hostapd_radius_servers *radius;
+ int acct_interim_interval;
+@@ -1064,6 +1068,8 @@ struct hostapd_config {
+ unsigned int track_sta_max_num;
+ unsigned int track_sta_max_age;
+
++ int max_num_sta;
++
+ char country[3]; /* first two octets: country code as described in
+ * ISO/IEC 3166-1. Third octet:
+ * ' ' (ascii 32): all environments
+@@ -1101,6 +1107,8 @@ struct hostapd_config {
+
+ int ht_op_mode_fixed;
+ u16 ht_capab;
++ int noscan;
++ int no_ht_coex;
+ int ieee80211n;
+ int secondary_channel;
+ int no_pri_sec_switch;
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index 6d910aa5a..57e20ee2f 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -387,8 +387,6 @@ int hostapd_set_wds_sta(struct hostapd_data *hapd, char *ifname_wds,
+ return -1;
+ if (hapd->conf->wds_bridge[0])
+ bridge = hapd->conf->wds_bridge;
+- else if (hapd->conf->bridge[0])
+- bridge = hapd->conf->bridge;
+ return hapd->driver->set_wds_sta(hapd->drv_priv, addr, aid, val,
+ bridge, ifname_wds);
+ }
+@@ -1002,7 +1000,8 @@ int hostapd_start_dfs_cac(struct hostapd_iface *iface,
+ int hostapd_drv_set_qos_map(struct hostapd_data *hapd,
+ const u8 *qos_map_set, u8 qos_map_set_len)
+ {
+- if (!hapd->driver || !hapd->driver->set_qos_map || !hapd->drv_priv)
++ if (!hapd->driver || !hapd->driver->set_qos_map || !hapd->drv_priv ||
++ !(hapd->iface->drv_flags & WPA_DRIVER_FLAGS_QOS_MAPPING))
+ return 0;
+ return hapd->driver->set_qos_map(hapd->drv_priv, qos_map_set,
+ qos_map_set_len);
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index f38b1850a..6ab1484ca 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -366,12 +366,12 @@ static inline int hostapd_drv_br_port_set_attr(struct hostapd_data *hapd,
+
+ static inline int hostapd_drv_br_set_net_param(struct hostapd_data *hapd,
+ enum drv_br_net_param param,
+- unsigned int val)
++ const char *ifname, unsigned int val)
+ {
+ if (hapd->driver == NULL || hapd->drv_priv == NULL ||
+ hapd->driver->br_set_net_param == NULL)
+ return -1;
+- return hapd->driver->br_set_net_param(hapd->drv_priv, param, val);
++ return hapd->driver->br_set_net_param(hapd->drv_priv, param, ifname, val);
+ }
+
+ static inline int hostapd_drv_vendor_cmd(struct hostapd_data *hapd,
+@@ -399,6 +399,23 @@ static inline int hostapd_drv_stop_ap(struct hostapd_data *hapd)
+ return hapd->driver->stop_ap(hapd->drv_priv, link_id);
+ }
+
++static inline int hostapd_drv_if_rename(struct hostapd_data *hapd,
++ enum wpa_driver_if_type type,
++ const char *ifname,
++ const char *new_name)
++{
++ if (!hapd->driver || !hapd->driver->if_rename || !hapd->drv_priv)
++ return -1;
++ return hapd->driver->if_rename(hapd->drv_priv, type, ifname, new_name);
++}
++
++static inline int hostapd_drv_set_first_bss(struct hostapd_data *hapd)
++{
++ if (!hapd->driver || !hapd->driver->set_first_bss || !hapd->drv_priv)
++ return 0;
++ return hapd->driver->set_first_bss(hapd->drv_priv);
++}
++
+ static inline int hostapd_drv_channel_info(struct hostapd_data *hapd,
+ struct wpa_channel_info *ci)
+ {
+diff --git a/src/ap/beacon.c b/src/ap/beacon.c
+index 32865f667..bec44c548 100644
+--- a/src/ap/beacon.c
++++ b/src/ap/beacon.c
+@@ -1351,6 +1351,12 @@ void handle_probe_req(struct hostapd_data *hapd,
+ int mld_id;
+ u16 links;
+ #endif /* CONFIG_IEEE80211BE */
++ struct hostapd_ubus_request req = {
++ .type = HOSTAPD_UBUS_PROBE_REQ,
++ .mgmt_frame = mgmt,
++ .ssi_signal = ssi_signal,
++ .elems = &elems,
++ };
+
+ if (hapd->iconf->rssi_ignore_probe_request && ssi_signal &&
+ ssi_signal < hapd->iconf->rssi_ignore_probe_request)
+@@ -1537,6 +1543,12 @@ void handle_probe_req(struct hostapd_data *hapd,
+ }
+ #endif /* CONFIG_P2P */
+
++ if (hostapd_ubus_handle_event(hapd, &req)) {
++ wpa_printf(MSG_DEBUG, "Probe request for " MACSTR " rejected by ubus handler.\n",
++ MAC2STR(mgmt->sa));
++ return;
++ }
++
+ /* TODO: verify that supp_rates contains at least one matching rate
+ * with AP configuration */
+
+@@ -1555,7 +1567,7 @@ void handle_probe_req(struct hostapd_data *hapd,
+ if (hapd->conf->no_probe_resp_if_max_sta &&
+ is_multicast_ether_addr(mgmt->da) &&
+ is_multicast_ether_addr(mgmt->bssid) &&
+- hapd->num_sta >= hapd->conf->max_num_sta &&
++ hostapd_check_max_sta(hapd) &&
+ !ap_get_sta(hapd, mgmt->sa)) {
+ wpa_printf(MSG_MSGDUMP, "%s: Ignore Probe Request from " MACSTR
+ " since no room for additional STA",
+diff --git a/src/ap/ctrl_iface_ap.c b/src/ap/ctrl_iface_ap.c
+index cdd777287..87e398a5d 100644
+--- a/src/ap/ctrl_iface_ap.c
++++ b/src/ap/ctrl_iface_ap.c
+@@ -26,6 +26,26 @@
+ #include "taxonomy.h"
+ #include "wnm_ap.h"
+
++static const char * hw_mode_str(enum hostapd_hw_mode mode)
++{
++ switch (mode) {
++ case HOSTAPD_MODE_IEEE80211B:
++ return "b";
++ case HOSTAPD_MODE_IEEE80211G:
++ return "g";
++ case HOSTAPD_MODE_IEEE80211A:
++ return "a";
++ case HOSTAPD_MODE_IEEE80211AD:
++ return "ad";
++ case HOSTAPD_MODE_IEEE80211ANY:
++ return "any";
++ case NUM_HOSTAPD_MODES:
++ return "invalid";
++ }
++ return "unknown";
++}
++
++#ifdef CONFIG_CTRL_IFACE_MIB
+
+ static size_t hostapd_write_ht_mcs_bitmask(char *buf, size_t buflen,
+ size_t curr_len, const u8 *mcs_set)
+@@ -212,26 +232,6 @@ static const char * timeout_next_str(int val)
+ }
+
+
+-static const char * hw_mode_str(enum hostapd_hw_mode mode)
+-{
+- switch (mode) {
+- case HOSTAPD_MODE_IEEE80211B:
+- return "b";
+- case HOSTAPD_MODE_IEEE80211G:
+- return "g";
+- case HOSTAPD_MODE_IEEE80211A:
+- return "a";
+- case HOSTAPD_MODE_IEEE80211AD:
+- return "ad";
+- case HOSTAPD_MODE_IEEE80211ANY:
+- return "any";
+- case NUM_HOSTAPD_MODES:
+- return "invalid";
+- }
+- return "unknown";
+-}
+-
+-
+ static int hostapd_ctrl_iface_sta_mib(struct hostapd_data *hapd,
+ struct sta_info *sta,
+ char *buf, size_t buflen)
+@@ -539,6 +539,7 @@ int hostapd_ctrl_iface_sta_next(struct hostapd_data *hapd, const char *txtaddr,
+ return hostapd_ctrl_iface_sta_mib(hapd, sta->next, buf, buflen);
+ }
+
++#endif
+
+ #ifdef CONFIG_P2P_MANAGER
+ static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype,
+@@ -951,12 +952,12 @@ int hostapd_ctrl_iface_status(struct hostapd_data *hapd, char *buf,
+ return len;
+ len += ret;
+ }
+-
++#ifdef CONFIG_CTRL_IFACE_MIB
+ if (iface->conf->ieee80211n && !hapd->conf->disable_11n && mode) {
+ len = hostapd_write_ht_mcs_bitmask(buf, buflen, len,
+ mode->mcs_set);
+ }
+-
++#endif /* CONFIG_CTRL_IFACE_MIB */
+ if (iface->current_rates && iface->num_rates) {
+ ret = os_snprintf(buf + len, buflen - len, "supported_rates=");
+ if (os_snprintf_error(buflen - len, ret))
+diff --git a/src/ap/dfs.c b/src/ap/dfs.c
+index fc2e8d83c..d14fad136 100644
+--- a/src/ap/dfs.c
++++ b/src/ap/dfs.c
+@@ -17,6 +17,7 @@
+ #include "ap_drv_ops.h"
+ #include "drivers/driver.h"
+ #include "dfs.h"
++#include "crypto/crypto.h"
+
+
+ enum dfs_channel_type {
+@@ -526,9 +527,14 @@ dfs_get_valid_channel(struct hostapd_iface *iface,
+ int num_available_chandefs;
+ int chan_idx, chan_idx2;
+ int sec_chan_idx_80p80 = -1;
++ bool is_mesh = false;
+ int i;
+ u32 _rand;
+
++#ifdef CONFIG_MESH
++ is_mesh = iface->mconf;
++#endif
++
+ wpa_printf(MSG_DEBUG, "DFS: Selecting random channel");
+ *secondary_channel = 0;
+ *oper_centr_freq_seg0_idx = 0;
+@@ -548,8 +554,20 @@ dfs_get_valid_channel(struct hostapd_iface *iface,
+ if (num_available_chandefs == 0)
+ return NULL;
+
+- if (os_get_random((u8 *) &_rand, sizeof(_rand)) < 0)
++ /* try to use deterministic channel in mesh, so that both sides
++ * have a chance to switch to the same channel */
++ if (is_mesh) {
++#ifdef CONFIG_MESH
++ u64 hash[4];
++ const u8 *meshid[1] = { &iface->mconf->meshid[0] };
++ const size_t meshid_len = iface->mconf->meshid_len;
++
++ sha256_vector(1, meshid, &meshid_len, (u8 *)&hash[0]);
++ _rand = hash[0] + hash[1] + hash[2] + hash[3];
++#endif
++ } else if (os_get_random((u8 *) &_rand, sizeof(_rand)) < 0)
+ return NULL;
++
+ chan_idx = _rand % num_available_chandefs;
+ wpa_printf(MSG_DEBUG, "DFS: Picked random entry from the list: %d/%d",
+ chan_idx, num_available_chandefs);
+@@ -1207,6 +1225,8 @@ int hostapd_dfs_pre_cac_expired(struct hostapd_iface *iface, int freq,
+ "freq=%d ht_enabled=%d chan_offset=%d chan_width=%d cf1=%d cf2=%d",
+ freq, ht_enabled, chan_offset, chan_width, cf1, cf2);
+
++ hostapd_ubus_notify_radar_detected(iface, freq, chan_width, cf1, cf2);
++
+ /* Proceed only if DFS is not offloaded to the driver */
+ if (iface->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD)
+ return 0;
+diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
+index 3b89c700d..2a8262727 100644
+--- a/src/ap/drv_callbacks.c
++++ b/src/ap/drv_callbacks.c
+@@ -268,6 +268,10 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
+ struct hostapd_iface *iface = hapd->iface;
+ #endif /* CONFIG_OWE */
+ bool updated = false;
++ struct hostapd_ubus_request req = {
++ .type = HOSTAPD_UBUS_ASSOC_REQ,
++ .addr = addr,
++ };
+
+ if (addr == NULL) {
+ /*
+@@ -412,6 +416,12 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
+ goto fail;
+ }
+
++ if (hostapd_ubus_handle_event(hapd, &req)) {
++ wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
++ MAC2STR(req.addr));
++ goto fail;
++ }
++
+ #ifdef CONFIG_P2P
+ if (elems.p2p) {
+ wpabuf_free(sta->p2p_ie);
+@@ -2341,8 +2351,8 @@ err:
+ #endif /* CONFIG_OWE */
+
+
+-void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
+- union wpa_event_data *data)
++void hostapd_wpa_event(void *ctx, enum wpa_event_type event,
++ union wpa_event_data *data)
+ {
+ struct hostapd_data *hapd = ctx;
+ struct sta_info *sta;
+@@ -2674,7 +2684,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
+ }
+
+
+-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
++void hostapd_wpa_event_global(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data)
+ {
+ struct hapd_interfaces *interfaces = ctx;
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index 615e0d201..e42588497 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -247,6 +247,29 @@ static int hostapd_iface_conf_changed(struct hostapd_config *newconf,
+ return 0;
+ }
+
++static inline int hostapd_iface_num_sta(struct hostapd_iface *iface)
++{
++ int num_sta = 0;
++ int i;
++
++ for (i = 0; i < iface->num_bss; i++)
++ num_sta += iface->bss[i]->num_sta;
++
++ return num_sta;
++}
++
++
++int hostapd_check_max_sta(struct hostapd_data *hapd)
++{
++ if (hapd->num_sta >= hapd->conf->max_num_sta)
++ return 1;
++
++ if (hapd->iconf->max_num_sta &&
++ hostapd_iface_num_sta(hapd->iface) >= hapd->iconf->max_num_sta)
++ return 1;
++
++ return 0;
++}
+
+ int hostapd_reload_config(struct hostapd_iface *iface)
+ {
+@@ -255,6 +278,8 @@ int hostapd_reload_config(struct hostapd_iface *iface)
+ struct hostapd_config *newconf, *oldconf;
+ size_t j;
+
++ hostapd_ucode_reload_bss(hapd);
++
+ if (iface->config_fname == NULL) {
+ /* Only in-memory config in use - assume it has been updated */
+ hostapd_clear_old(iface);
+@@ -493,6 +518,8 @@ void hostapd_free_hapd_data(struct hostapd_data *hapd)
+ hapd->beacon_set_done = 0;
+
+ wpa_printf(MSG_DEBUG, "%s(%s)", __func__, hapd->conf->iface);
++ hostapd_ucode_free_bss(hapd);
++ hostapd_ubus_free_bss(hapd);
+ accounting_deinit(hapd);
+ hostapd_deinit_wpa(hapd);
+ vlan_deinit(hapd);
+@@ -656,6 +683,7 @@ static void sta_track_deinit(struct hostapd_iface *iface)
+ void hostapd_cleanup_iface_partial(struct hostapd_iface *iface)
+ {
+ wpa_printf(MSG_DEBUG, "%s(%p)", __func__, iface);
++ eloop_cancel_timeout(channel_list_update_timeout, iface, NULL);
+ #ifdef NEED_AP_MLME
+ hostapd_stop_setup_timers(iface);
+ #endif /* NEED_AP_MLME */
+@@ -685,7 +713,7 @@ void hostapd_cleanup_iface_partial(struct hostapd_iface *iface)
+ 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);
++ hostapd_ucode_free_iface(iface);
+ eloop_cancel_timeout(hostapd_interface_setup_failure_handler, iface,
+ NULL);
+
+@@ -1274,6 +1302,9 @@ static int hostapd_start_beacon(struct hostapd_data *hapd,
+ if (hapd->driver && hapd->driver->set_operstate)
+ hapd->driver->set_operstate(hapd->drv_priv, 1);
+
++ hostapd_ubus_add_bss(hapd);
++ hostapd_ucode_add_bss(hapd);
++
+ return 0;
+ }
+
+@@ -1295,8 +1326,7 @@ static int hostapd_start_beacon(struct hostapd_data *hapd,
+ * 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,
+- bool start_beacon)
++int hostapd_setup_bss(struct hostapd_data *hapd, int first, bool start_beacon)
+ {
+ struct hostapd_bss_config *conf = hapd->conf;
+ u8 ssid[SSID_MAX_LEN + 1];
+@@ -1480,6 +1510,7 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first,
+
+ os_memset(&das_conf, 0, sizeof(das_conf));
+ das_conf.port = conf->radius_das_port;
++ das_conf.nas_identifier = conf->nas_identifier;
+ das_conf.shared_secret = conf->radius_das_shared_secret;
+ das_conf.shared_secret_len =
+ conf->radius_das_shared_secret_len;
+@@ -1548,6 +1579,7 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first,
+ wpa_printf(MSG_ERROR, "GAS server initialization failed");
+ return -1;
+ }
++#endif /* CONFIG_INTERWORKING */
+
+ if (conf->qos_map_set_len &&
+ hostapd_drv_set_qos_map(hapd, conf->qos_map_set,
+@@ -1555,7 +1587,6 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first,
+ 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");
+@@ -2367,6 +2398,7 @@ static int hostapd_setup_interface_complete_sync(struct hostapd_iface *iface,
+ if (err)
+ goto fail;
+
++ hostapd_ubus_add_iface(iface);
+ wpa_printf(MSG_DEBUG, "Completing interface initialization");
+ if (iface->freq) {
+ #ifdef NEED_AP_MLME
+@@ -2596,6 +2628,7 @@ dfs_offload:
+
+ fail:
+ wpa_printf(MSG_ERROR, "Interface initialization failed");
++ hostapd_ubus_free_iface(iface);
+
+ if (iface->is_no_ir) {
+ hostapd_set_state(iface, HAPD_IFACE_NO_IR);
+@@ -2795,7 +2828,7 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
+ }
+
+
+-static void hostapd_bss_deinit(struct hostapd_data *hapd)
++void hostapd_bss_deinit(struct hostapd_data *hapd)
+ {
+ if (!hapd)
+ return;
+@@ -3090,6 +3123,7 @@ void hostapd_interface_deinit_free(struct hostapd_iface *iface)
+ (unsigned int) iface->conf->num_bss);
+ driver = iface->bss[0]->driver;
+ drv_priv = iface->bss[0]->drv_priv;
++ hostapd_ubus_free_iface(iface);
+ hostapd_interface_deinit(iface);
+ wpa_printf(MSG_DEBUG, "%s: driver=%p drv_priv=%p -> hapd_deinit",
+ __func__, driver, drv_priv);
+@@ -3615,7 +3649,8 @@ int hostapd_remove_iface(struct hapd_interfaces *interfaces, char *buf)
+ hapd_iface = interfaces->iface[i];
+ if (hapd_iface == NULL)
+ return -1;
+- if (!os_strcmp(hapd_iface->conf->bss[0]->iface, buf)) {
++ if (!os_strcmp(hapd_iface->phy, buf) ||
++ !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 &
+@@ -3659,6 +3694,8 @@ int hostapd_remove_iface(struct hapd_interfaces *interfaces, char *buf)
+ void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
+ int reassoc)
+ {
++ int mld_assoc_link_id = -1;
++
+ if (hapd->tkip_countermeasures) {
+ hostapd_drv_sta_deauth(hapd, sta->addr,
+ WLAN_REASON_MICHAEL_MIC_FAILURE);
+@@ -3670,6 +3707,8 @@ void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
+ sta->mld_assoc_link_id != hapd->mld_link_id)
+ return;
+ #endif /* CONFIG_IEEE80211BE */
++ if (mld_assoc_link_id != -2)
++ hostapd_prune_associations(hapd, sta->addr, mld_assoc_link_id);
+
+ ap_sta_clear_disconnect_timeouts(hapd, sta);
+ sta->post_csa_sa_query = 0;
+diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
+index a7035c35c..a03023dff 100644
+--- a/src/ap/hostapd.h
++++ b/src/ap/hostapd.h
+@@ -13,11 +13,14 @@
+ #include <sqlite3.h>
+ #endif /* CONFIG_SQLITE */
+
++#include "ap/sta_info.h"
+ #include "common/defs.h"
+ #include "common/dpp.h"
+ #include "utils/list.h"
+ #include "ap_config.h"
+ #include "drivers/driver.h"
++#include "ubus.h"
++#include "ucode.h"
+
+ #define OCE_STA_CFON_ENABLED(hapd) \
+ ((hapd->conf->oce & OCE_STA_CFON) && \
+@@ -50,6 +53,10 @@ struct hapd_interfaces {
+ struct hostapd_config * (*config_read_cb)(const char *config_fname);
+ int (*ctrl_iface_init)(struct hostapd_data *hapd);
+ void (*ctrl_iface_deinit)(struct hostapd_data *hapd);
++ int (*ctrl_iface_recv)(struct hostapd_data *hapd,
++ char *buf, char *reply, int reply_size,
++ struct sockaddr_storage *from,
++ socklen_t fromlen);
+ int (*for_each_interface)(struct hapd_interfaces *interfaces,
+ int (*cb)(struct hostapd_iface *iface,
+ void *ctx), void *ctx);
+@@ -162,6 +169,21 @@ struct hostapd_sae_commit_queue {
+ u8 msg[];
+ };
+
++/**
++ * struct hostapd_openwrt_stats - OpenWrt custom STA/AP statistics
++ */
++struct hostapd_openwrt_stats {
++ struct {
++ u64 neighbor_report_tx;
++ } rrm;
++
++ struct {
++ u64 bss_transition_query_rx;
++ u64 bss_transition_request_tx;
++ u64 bss_transition_response_rx;
++ } wnm;
++};
++
+ /**
+ * struct hostapd_data - hostapd per-BSS data structure
+ */
+@@ -169,6 +191,8 @@ struct hostapd_data {
+ struct hostapd_iface *iface;
+ struct hostapd_config *iconf;
+ struct hostapd_bss_config *conf;
++ struct hostapd_ubus_bss ubus;
++ struct hostapd_ucode_bss ucode;
+ int interface_added; /* virtual interface added for this BSS */
+ unsigned int started:1;
+ unsigned int disabled:1;
+@@ -182,6 +206,9 @@ struct hostapd_data {
+
+ struct hostapd_data *mld_first_bss;
+
++ /* OpenWrt specific statistics */
++ struct hostapd_openwrt_stats openwrt_stats;
++
+ int num_sta; /* number of entries in sta_list */
+ struct sta_info *sta_list; /* STA info list head */
+ #define STA_HASH_SIZE 256
+@@ -498,6 +525,7 @@ struct hostapd_sta_info {
+ */
+ struct hostapd_iface {
+ struct hapd_interfaces *interfaces;
++ struct hostapd_ucode_iface ucode;
+ void *owner;
+ char *config_fname;
+ struct hostapd_config *conf;
+@@ -720,6 +748,7 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
+ struct hostapd_bss_config *bss);
+ int hostapd_setup_interface(struct hostapd_iface *iface);
+ int hostapd_setup_interface_complete(struct hostapd_iface *iface, int err);
++void hostapd_set_own_neighbor_report(struct hostapd_data *hapd);
+ void hostapd_interface_deinit(struct hostapd_iface *iface);
+ void hostapd_interface_free(struct hostapd_iface *iface);
+ struct hostapd_iface * hostapd_alloc_iface(void);
+@@ -728,6 +757,8 @@ struct hostapd_iface * hostapd_init(struct hapd_interfaces *interfaces,
+ struct hostapd_iface *
+ hostapd_interface_init_bss(struct hapd_interfaces *interfaces, const char *phy,
+ const char *config_fname, int debug);
++int hostapd_setup_bss(struct hostapd_data *hapd, int first, bool start_beacon);
++void hostapd_bss_deinit(struct hostapd_data *hapd);
+ void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
+ int reassoc);
+ void hostapd_interface_deinit_free(struct hostapd_iface *iface);
+@@ -755,6 +786,7 @@ void hostapd_cleanup_cs_params(struct hostapd_data *hapd);
+ void hostapd_periodic_iface(struct hostapd_iface *iface);
+ int hostapd_owe_trans_get_info(struct hostapd_data *hapd);
+ void hostapd_ocv_check_csa_sa_query(void *eloop_ctx, void *timeout_ctx);
++int hostapd_check_max_sta(struct hostapd_data *hapd);
+
+ void hostapd_switch_color(struct hostapd_data *hapd, u64 bitmap);
+ void hostapd_cleanup_cca_params(struct hostapd_data *hapd);
+@@ -838,4 +870,14 @@ bool hostapd_is_ml_partner(struct hostapd_data *hapd1,
+
+ u16 hostapd_get_punct_bitmap(struct hostapd_data *hapd);
+
++static inline bool ap_sta_is_mld(struct hostapd_data *hapd,
++ struct sta_info *sta)
++{
++#ifdef CONFIG_IEEE80211BE
++ return hapd->conf->mld_ap && sta && sta->mld_info.mld_sta;
++#else /* CONFIG_IEEE80211BE */
++ return false;
++#endif /* CONFIG_IEEE80211BE */
++}
++
+ #endif /* HOSTAPD_H */
+diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
+index 222f3dc05..672e43a10 100644
+--- a/src/ap/hw_features.c
++++ b/src/ap/hw_features.c
+@@ -546,7 +546,8 @@ static int ieee80211n_check_40mhz(struct hostapd_iface *iface)
+ int ret;
+
+ /* Check that HT40 is used and PRI / SEC switch is allowed */
+- if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch)
++ if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch ||
++ iface->conf->noscan)
+ return 0;
+
+ hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
+diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+index ea6666301..a774426c2 100644
+--- a/src/ap/ieee802_11.c
++++ b/src/ap/ieee802_11.c
+@@ -2811,7 +2811,7 @@ static void handle_auth(struct hostapd_data *hapd,
+ u16 auth_alg, auth_transaction, status_code;
+ u16 resp = WLAN_STATUS_SUCCESS;
+ struct sta_info *sta = NULL;
+- int res, reply_res;
++ int res, reply_res, ubus_resp;
+ u16 fc;
+ const u8 *challenge = NULL;
+ u8 resp_ies[2 + WLAN_AUTH_CHALLENGE_LEN];
+@@ -2820,6 +2820,11 @@ static void handle_auth(struct hostapd_data *hapd,
+ struct radius_sta rad_info;
+ const u8 *dst, *sa, *bssid;
+ bool mld_sta = false;
++ struct hostapd_ubus_request req = {
++ .type = HOSTAPD_UBUS_AUTH_REQ,
++ .mgmt_frame = mgmt,
++ .ssi_signal = rssi,
++ };
+
+ if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.auth)) {
+ wpa_printf(MSG_INFO, "handle_auth - too short payload (len=%lu)",
+@@ -3011,6 +3016,13 @@ static void handle_auth(struct hostapd_data *hapd,
+ resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
+ goto fail;
+ }
++ ubus_resp = hostapd_ubus_handle_event(hapd, &req);
++ if (ubus_resp) {
++ wpa_printf(MSG_DEBUG, "Station " MACSTR " rejected by ubus handler.\n",
++ MAC2STR(mgmt->sa));
++ resp = ubus_resp > 0 ? (u16) ubus_resp : WLAN_STATUS_UNSPECIFIED_FAILURE;
++ goto fail;
++ }
+ if (res == HOSTAPD_ACL_PENDING)
+ return;
+
+@@ -3045,15 +3057,6 @@ static void handle_auth(struct hostapd_data *hapd,
+ seq_ctrl);
+ return;
+ }
+-#ifdef CONFIG_MESH
+- if ((hapd->conf->mesh & MESH_ENABLED) &&
+- sta->plink_state == PLINK_BLOCKED) {
+- wpa_printf(MSG_DEBUG, "Mesh peer " MACSTR
+- " is blocked - drop Authentication frame",
+- MAC2STR(sa));
+- return;
+- }
+-#endif /* CONFIG_MESH */
+ #ifdef CONFIG_PASN
+ if (auth_alg == WLAN_AUTH_PASN &&
+ (sta->flags & WLAN_STA_ASSOC)) {
+@@ -4693,6 +4696,13 @@ static int add_associated_sta(struct hostapd_data *hapd,
+ * drivers to accept the STA parameter configuration. Since this is
+ * after a new FT-over-DS exchange, a new TK has been derived, so key
+ * reinstallation is not a concern for this case.
++ *
++ * If the STA was associated and authorized earlier, but came for a new
++ * connection (!added_unassoc + !reassoc), remove the existing STA entry
++ * so that it can be re-added. This case is rarely seen when the AP could
++ * not receive the deauth/disassoc frame from the STA. And the STA comes
++ * back with new connection within a short period or before the inactive
++ * STA entry is removed from the list.
+ */
+ wpa_printf(MSG_DEBUG, "Add associated STA " MACSTR
+ " (added_unassoc=%d auth_alg=%u ft_over_ds=%u reassoc=%d authorized=%d ft_tk=%d fils_tk=%d)",
+@@ -4706,7 +4716,8 @@ static int add_associated_sta(struct hostapd_data *hapd,
+ (!(sta->flags & WLAN_STA_AUTHORIZED) ||
+ (reassoc && sta->ft_over_ds && sta->auth_alg == WLAN_AUTH_FT) ||
+ (!wpa_auth_sta_ft_tk_already_set(sta->wpa_sm) &&
+- !wpa_auth_sta_fils_tk_already_set(sta->wpa_sm)))) {
++ !wpa_auth_sta_fils_tk_already_set(sta->wpa_sm)) ||
++ (!reassoc && (sta->flags & WLAN_STA_AUTHORIZED)))) {
+ hostapd_drv_sta_remove(hapd, sta->addr);
+ wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED);
+ set = 0;
+@@ -5277,7 +5288,7 @@ static void handle_assoc(struct hostapd_data *hapd,
+ int resp = WLAN_STATUS_SUCCESS;
+ u16 reply_res = WLAN_STATUS_UNSPECIFIED_FAILURE;
+ const u8 *pos;
+- int left, i;
++ int left, i, ubus_resp;
+ struct sta_info *sta;
+ u8 *tmp = NULL;
+ #ifdef CONFIG_FILS
+@@ -5519,6 +5530,11 @@ static void handle_assoc(struct hostapd_data *hapd,
+ left = res;
+ }
+ #endif /* CONFIG_FILS */
++ struct hostapd_ubus_request req = {
++ .type = HOSTAPD_UBUS_ASSOC_REQ,
++ .mgmt_frame = mgmt,
++ .ssi_signal = rssi,
++ };
+
+ /* followed by SSID and Supported rates; and HT capabilities if 802.11n
+ * is used */
+@@ -5621,6 +5637,13 @@ static void handle_assoc(struct hostapd_data *hapd,
+ if (set_beacon)
+ ieee802_11_set_beacons(hapd->iface);
+
++ ubus_resp = hostapd_ubus_handle_event(hapd, &req);
++ if (ubus_resp) {
++ wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
++ MAC2STR(mgmt->sa));
++ resp = ubus_resp > 0 ? (u16) ubus_resp : WLAN_STATUS_UNSPECIFIED_FAILURE;
++ goto fail;
++ }
+ fail:
+
+ /*
+@@ -5871,6 +5894,7 @@ static void handle_disassoc(struct hostapd_data *hapd,
+ (unsigned long) len);
+ return;
+ }
++ hostapd_ubus_notify(hapd, "disassoc", mgmt->sa);
+
+ sta = ap_get_sta(hapd, mgmt->sa);
+ if (!sta) {
+@@ -5902,6 +5926,8 @@ static void handle_deauth(struct hostapd_data *hapd,
+ /* Clear the PTKSA cache entries for PASN */
+ ptksa_cache_flush(hapd->ptksa, mgmt->sa, WPA_CIPHER_NONE);
+
++ hostapd_ubus_notify(hapd, "deauth", mgmt->sa);
++
+ sta = ap_get_sta(hapd, mgmt->sa);
+ if (!sta) {
+ wpa_msg(hapd->msg_ctx, MSG_DEBUG, "Station " MACSTR
+diff --git a/src/ap/ieee802_11_ht.c b/src/ap/ieee802_11_ht.c
+index f90f1254e..7f0a00f95 100644
+--- a/src/ap/ieee802_11_ht.c
++++ b/src/ap/ieee802_11_ht.c
+@@ -82,7 +82,9 @@ u8 * hostapd_eid_ht_capabilities(struct hostapd_data *hapd, u8 *eid)
+ u8 * hostapd_eid_ht_operation(struct hostapd_data *hapd, u8 *eid)
+ {
+ struct ieee80211_ht_operation *oper;
++ le32 vht_capabilities_info;
+ u8 *pos = eid;
++ u8 chwidth;
+
+ if (!hapd->iconf->ieee80211n || hapd->conf->disable_11n ||
+ is_6ghz_op_class(hapd->iconf->op_class))
+@@ -103,6 +105,13 @@ u8 * hostapd_eid_ht_operation(struct hostapd_data *hapd, u8 *eid)
+ oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW |
+ HT_INFO_HT_PARAM_STA_CHNL_WIDTH;
+
++ vht_capabilities_info = host_to_le32(hapd->iface->current_mode->vht_capab);
++ chwidth = hostapd_get_oper_chwidth(hapd->iconf);
++ if (vht_capabilities_info & VHT_CAP_EXTENDED_NSS_BW_SUPPORT
++ && ((chwidth == CHANWIDTH_160MHZ) || (chwidth == CHANWIDTH_80P80MHZ))) {
++ oper->operation_mode = host_to_le16(hapd->iconf->vht_oper_centr_freq_seg0_idx << 5);
++ }
++
+ pos += sizeof(*oper);
+
+ return pos;
+@@ -230,6 +239,9 @@ void hostapd_2040_coex_action(struct hostapd_data *hapd,
+ return;
+ }
+
++ if (iface->conf->noscan || iface->conf->no_ht_coex)
++ return;
++
+ if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) {
+ wpa_printf(MSG_DEBUG,
+ "Ignore too short 20/40 BSS Coexistence Management frame");
+@@ -390,6 +402,9 @@ void ht40_intolerant_add(struct hostapd_iface *iface, struct sta_info *sta)
+ if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
+ return;
+
++ if (iface->conf->noscan || iface->conf->no_ht_coex)
++ return;
++
+ wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR
+ " in Association Request", MAC2STR(sta->addr));
+
+diff --git a/src/ap/ieee802_11_shared.c b/src/ap/ieee802_11_shared.c
+index 0c38483a9..cdd28494e 100644
+--- a/src/ap/ieee802_11_shared.c
++++ b/src/ap/ieee802_11_shared.c
+@@ -1138,13 +1138,11 @@ u8 * hostapd_eid_rsnxe(struct hostapd_data *hapd, u8 *eid, size_t len)
+ u16 check_ext_capab(struct hostapd_data *hapd, struct sta_info *sta,
+ const u8 *ext_capab_ie, size_t ext_capab_ie_len)
+ {
+-#ifdef CONFIG_INTERWORKING
+ /* check for QoS Map support */
+ if (ext_capab_ie_len >= 5) {
+ if (ext_capab_ie[4] & 0x01)
+ sta->qos_map_enabled = 1;
+ }
+-#endif /* CONFIG_INTERWORKING */
+
+ if (ext_capab_ie_len > 0) {
+ sta->ecsa_supported = !!(ext_capab_ie[0] & BIT(2));
+diff --git a/src/ap/ieee802_11_vht.c b/src/ap/ieee802_11_vht.c
+index 4dc325ce8..68880ab64 100644
+--- a/src/ap/ieee802_11_vht.c
++++ b/src/ap/ieee802_11_vht.c
+@@ -26,6 +26,7 @@ u8 * hostapd_eid_vht_capabilities(struct hostapd_data *hapd, u8 *eid, u32 nsts)
+ struct ieee80211_vht_capabilities *cap;
+ struct hostapd_hw_modes *mode = hapd->iface->current_mode;
+ u8 *pos = eid;
++ u8 chwidth;
+
+ if (!mode || is_6ghz_op_class(hapd->iconf->op_class))
+ return eid;
+@@ -63,6 +64,17 @@ u8 * hostapd_eid_vht_capabilities(struct hostapd_data *hapd, u8 *eid, u32 nsts)
+ host_to_le32(nsts << VHT_CAP_BEAMFORMEE_STS_OFFSET);
+ }
+
++ chwidth = hostapd_get_oper_chwidth(hapd->iconf);
++ if (((host_to_le32(mode->vht_capab)) & VHT_CAP_EXTENDED_NSS_BW_SUPPORT)
++ && ((chwidth == CHANWIDTH_160MHZ) || (chwidth == CHANWIDTH_80P80MHZ))) {
++ cap->vht_capabilities_info |= VHT_CAP_EXTENDED_NSS_BW_SUPPORT;
++ cap->vht_capabilities_info &= ~(host_to_le32(VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ));
++ cap->vht_capabilities_info &= ~(host_to_le32(VHT_CAP_SUPP_CHAN_WIDTH_160MHZ));
++ cap->vht_capabilities_info &= ~(host_to_le32(VHT_CAP_SUPP_CHAN_WIDTH_MASK));
++ } else {
++ cap->vht_capabilities_info &= ~VHT_CAP_EXTENDED_NSS_BW_SUPPORT_MASK;
++ }
++
+ /* Supported MCS set comes from hw */
+ os_memcpy(&cap->vht_supported_mcs_set, mode->vht_mcs_set, 8);
+
+@@ -75,6 +87,7 @@ u8 * hostapd_eid_vht_capabilities(struct hostapd_data *hapd, u8 *eid, u32 nsts)
+ u8 * hostapd_eid_vht_operation(struct hostapd_data *hapd, u8 *eid)
+ {
+ struct ieee80211_vht_operation *oper;
++ le32 vht_capabilities_info;
+ u8 *pos = eid;
+ enum oper_chan_width oper_chwidth =
+ hostapd_get_oper_chwidth(hapd->iconf);
+@@ -110,6 +123,7 @@ u8 * hostapd_eid_vht_operation(struct hostapd_data *hapd, u8 *eid)
+ oper->vht_op_info_chan_center_freq_seg1_idx = seg1;
+
+ oper->vht_op_info_chwidth = oper_chwidth;
++ vht_capabilities_info = host_to_le32(hapd->iface->current_mode->vht_capab);
+ if (oper_chwidth == CONF_OPER_CHWIDTH_160MHZ) {
+ /*
+ * Convert 160 MHz channel width to new style as interop
+@@ -123,6 +137,9 @@ u8 * hostapd_eid_vht_operation(struct hostapd_data *hapd, u8 *eid)
+ oper->vht_op_info_chan_center_freq_seg0_idx -= 8;
+ else
+ oper->vht_op_info_chan_center_freq_seg0_idx += 8;
++
++ if (vht_capabilities_info & VHT_CAP_EXTENDED_NSS_BW_SUPPORT)
++ oper->vht_op_info_chan_center_freq_seg1_idx = 0;
+ } else if (oper_chwidth == CONF_OPER_CHWIDTH_80P80MHZ) {
+ /*
+ * Convert 80+80 MHz channel width to new style as interop
+diff --git a/src/ap/ieee802_1x.c b/src/ap/ieee802_1x.c
+index 42eb5a173..782ddce0c 100644
+--- a/src/ap/ieee802_1x.c
++++ b/src/ap/ieee802_1x.c
+@@ -601,6 +601,10 @@ int add_common_radius_attr(struct hostapd_data *hapd,
+ struct hostapd_radius_attr *attr;
+ int len;
+
++ if (hapd->conf->dynamic_own_ip_addr)
++ radius_client_get_local_addr(hapd->radius,
++ &hapd->conf->own_ip_addr);
++
+ if (!hostapd_config_get_radius_attr(req_attr,
+ RADIUS_ATTR_NAS_IP_ADDRESS) &&
+ hapd->conf->own_ip_addr.af == AF_INET &&
+@@ -2837,6 +2841,7 @@ static const char * bool_txt(bool val)
+ return val ? "TRUE" : "FALSE";
+ }
+
++#ifdef CONFIG_CTRL_IFACE_MIB
+
+ int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen)
+ {
+@@ -3023,6 +3028,7 @@ int ieee802_1x_get_mib_sta(struct hostapd_data *hapd, struct sta_info *sta,
+ return len;
+ }
+
++#endif
+
+ #ifdef CONFIG_HS20
+ static void ieee802_1x_wnm_notif_send(void *eloop_ctx, void *timeout_ctx)
+diff --git a/src/ap/ndisc_snoop.c b/src/ap/ndisc_snoop.c
+index 788c12fdc..bc1eb6251 100644
+--- a/src/ap/ndisc_snoop.c
++++ b/src/ap/ndisc_snoop.c
+@@ -61,6 +61,7 @@ void sta_ip6addr_del(struct hostapd_data *hapd, struct sta_info *sta)
+ dl_list_for_each_safe(ip6addr, prev, &sta->ip6addr, struct ip6addr,
+ list) {
+ hostapd_drv_br_delete_ip_neigh(hapd, 6, (u8 *) &ip6addr->addr);
++ dl_list_del(&ip6addr->list);
+ os_free(ip6addr);
+ }
+ }
+diff --git a/src/ap/rrm.c b/src/ap/rrm.c
+index f2d5cd16e..8220590a0 100644
+--- a/src/ap/rrm.c
++++ b/src/ap/rrm.c
+@@ -89,6 +89,9 @@ static void hostapd_handle_beacon_report(struct hostapd_data *hapd,
+ return;
+ wpa_msg(hapd->msg_ctx, MSG_INFO, BEACON_RESP_RX MACSTR " %u %02x %s",
+ MAC2STR(addr), token, rep_mode, report);
++ if (len < sizeof(struct rrm_measurement_beacon_report))
++ return;
++ hostapd_ubus_notify_beacon_report(hapd, addr, token, rep_mode, (struct rrm_measurement_beacon_report*) pos, len);
+ }
+
+
+@@ -269,6 +272,8 @@ static void hostapd_send_nei_report_resp(struct hostapd_data *hapd,
+ }
+ }
+
++ hapd->openwrt_stats.rrm.neighbor_report_tx++;
++
+ hostapd_drv_send_action(hapd, hapd->iface->freq, 0, addr,
+ wpabuf_head(buf), wpabuf_len(buf));
+ wpabuf_free(buf);
+@@ -350,6 +355,9 @@ void hostapd_handle_radio_measurement(struct hostapd_data *hapd,
+ mgmt->u.action.u.rrm.action, MAC2STR(mgmt->sa));
+
+ switch (mgmt->u.action.u.rrm.action) {
++ case WLAN_RRM_LINK_MEASUREMENT_REPORT:
++ hostapd_ubus_handle_link_measurement(hapd, buf, len);
++ break;
+ case WLAN_RRM_RADIO_MEASUREMENT_REPORT:
+ hostapd_handle_radio_msmt_report(hapd, buf, len);
+ break;
+diff --git a/src/ap/sta_info.c b/src/ap/sta_info.c
+index 97ed805ca..ebb23d1f1 100644
+--- a/src/ap/sta_info.c
++++ b/src/ap/sta_info.c
+@@ -476,6 +476,7 @@ void ap_handle_timer(void *eloop_ctx, void *timeout_ctx)
+ hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
+ HOSTAPD_LEVEL_INFO, "deauthenticated due to "
+ "local deauth request");
++ hostapd_ubus_notify(hapd, "local-deauth", sta->addr);
+ ap_free_sta(hapd, sta);
+ return;
+ }
+@@ -631,6 +632,7 @@ skip_poll:
+ mlme_deauthenticate_indication(
+ hapd, sta,
+ WLAN_REASON_PREV_AUTH_NOT_VALID);
++ hostapd_ubus_notify(hapd, "inactive-deauth", sta->addr);
+ ap_free_sta(hapd, sta);
+ break;
+ }
+@@ -1412,9 +1414,6 @@ bool ap_sta_set_authorized_flag(struct hostapd_data *hapd, struct sta_info *sta,
+ mld_assoc_link_id = -2;
+ }
+ #endif /* CONFIG_IEEE80211BE */
+- if (mld_assoc_link_id != -2)
+- hostapd_prune_associations(hapd, sta->addr,
+- mld_assoc_link_id);
+ sta->flags |= WLAN_STA_AUTHORIZED;
+ } else {
+ sta->flags &= ~WLAN_STA_AUTHORIZED;
+@@ -1451,15 +1450,28 @@ void ap_sta_set_authorized_event(struct hostapd_data *hapd,
+ os_snprintf(buf, sizeof(buf), MACSTR, MAC2STR(sta->addr));
+
+ if (authorized) {
++ static const char * const auth_algs[] = {
++ [WLAN_AUTH_OPEN] = "open",
++ [WLAN_AUTH_SHARED_KEY] = "shared",
++ [WLAN_AUTH_FT] = "ft",
++ [WLAN_AUTH_SAE] = "sae",
++ [WLAN_AUTH_FILS_SK] = "fils-sk",
++ [WLAN_AUTH_FILS_SK_PFS] = "fils-sk-pfs",
++ [WLAN_AUTH_FILS_PK] = "fils-pk",
++ [WLAN_AUTH_PASN] = "pasn",
++ };
++ const char *auth_alg = NULL;
+ const u8 *dpp_pkhash;
+ const char *keyid;
+ char dpp_pkhash_buf[100];
+ char keyid_buf[100];
+ char ip_addr[100];
++ char alg_buf[100];
+
+ dpp_pkhash_buf[0] = '\0';
+ keyid_buf[0] = '\0';
+ ip_addr[0] = '\0';
++ alg_buf[0] = '\0';
+ #ifdef CONFIG_P2P
+ if (wpa_auth_get_ip_addr(sta->wpa_sm, ip_addr_buf) == 0) {
+ os_snprintf(ip_addr, sizeof(ip_addr),
+@@ -1470,6 +1482,13 @@ void ap_sta_set_authorized_event(struct hostapd_data *hapd,
+ }
+ #endif /* CONFIG_P2P */
+
++ if (sta->auth_alg < ARRAY_SIZE(auth_algs))
++ auth_alg = auth_algs[sta->auth_alg];
++
++ if (auth_alg)
++ os_snprintf(alg_buf, sizeof(alg_buf),
++ " auth_alg=%s", auth_alg);
++
+ keyid = ap_sta_wpa_get_keyid(hapd, sta);
+ if (keyid) {
+ os_snprintf(keyid_buf, sizeof(keyid_buf),
+@@ -1488,17 +1507,19 @@ void ap_sta_set_authorized_event(struct hostapd_data *hapd,
+ dpp_pkhash, SHA256_MAC_LEN);
+ }
+
+- wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_CONNECTED "%s%s%s%s",
+- buf, ip_addr, keyid_buf, dpp_pkhash_buf);
++ hostapd_ubus_notify_authorized(hapd, sta, auth_alg);
++ wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_CONNECTED "%s%s%s%s%s",
++ buf, ip_addr, keyid_buf, dpp_pkhash_buf, alg_buf);
+
+ if (hapd->msg_ctx_parent &&
+ hapd->msg_ctx_parent != hapd->msg_ctx)
+ wpa_msg_no_global(hapd->msg_ctx_parent, MSG_INFO,
+- AP_STA_CONNECTED "%s%s%s%s",
++ AP_STA_CONNECTED "%s%s%s%s%s",
+ buf, ip_addr, keyid_buf,
+- dpp_pkhash_buf);
++ dpp_pkhash_buf, alg_buf);
+ } else {
+ wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_DISCONNECTED "%s", buf);
++ hostapd_ubus_notify(hapd, "disassoc", sta->addr);
+
+ if (hapd->msg_ctx_parent &&
+ hapd->msg_ctx_parent != hapd->msg_ctx)
+diff --git a/src/ap/sta_info.h b/src/ap/sta_info.h
+index b136ff7bf..d18dd2fcd 100644
+--- a/src/ap/sta_info.h
++++ b/src/ap/sta_info.h
+@@ -17,7 +17,6 @@
+ #include "common/sae.h"
+ #include "crypto/sha384.h"
+ #include "pasn/pasn_common.h"
+-#include "hostapd.h"
+
+ /* STA flags */
+ #define WLAN_STA_AUTH BIT(0)
+@@ -323,6 +322,7 @@ struct sta_info {
+ #endif /* CONFIG_TESTING_OPTIONS */
+ #ifdef CONFIG_AIRTIME_POLICY
+ unsigned int airtime_weight;
++ unsigned int dyn_airtime_weight;
+ struct os_reltime backlogged_until;
+ #endif /* CONFIG_AIRTIME_POLICY */
+
+@@ -420,16 +420,6 @@ int ap_sta_re_add(struct hostapd_data *hapd, struct sta_info *sta);
+
+ void ap_free_sta_pasn(struct hostapd_data *hapd, struct sta_info *sta);
+
+-static inline bool ap_sta_is_mld(struct hostapd_data *hapd,
+- struct sta_info *sta)
+-{
+-#ifdef CONFIG_IEEE80211BE
+- return hapd->conf->mld_ap && sta && sta->mld_info.mld_sta;
+-#else /* CONFIG_IEEE80211BE */
+- return false;
+-#endif /* CONFIG_IEEE80211BE */
+-}
+-
+ static inline void ap_sta_set_mld(struct sta_info *sta, bool mld)
+ {
+ #ifdef CONFIG_IEEE80211BE
+diff --git a/src/ap/vlan_full.c b/src/ap/vlan_full.c
+index 19aa3c649..053d6338e 100644
+--- a/src/ap/vlan_full.c
++++ b/src/ap/vlan_full.c
+@@ -475,6 +475,9 @@ void vlan_newlink(const char *ifname, struct hostapd_data *hapd)
+ if (!vlan)
+ return;
+
++ if (hapd->conf->ssid.vlan_no_bridge)
++ goto out;
++
+ vlan->configured = 1;
+
+ notempty = vlan->vlan_desc.notempty;
+@@ -506,6 +509,7 @@ void vlan_newlink(const char *ifname, struct hostapd_data *hapd)
+ ifname, br_name, tagged[i], hapd);
+ }
+
++out:
+ ifconfig_up(ifname);
+ }
+
+diff --git a/src/ap/vlan_init.c b/src/ap/vlan_init.c
+index 53eacfb45..b69f3de41 100644
+--- a/src/ap/vlan_init.c
++++ b/src/ap/vlan_init.c
+@@ -22,6 +22,7 @@
+ static int vlan_if_add(struct hostapd_data *hapd, struct hostapd_vlan *vlan,
+ int existsok)
+ {
++ bool vlan_exists = iface_exists(vlan->ifname);
+ int ret;
+ #ifdef CONFIG_WEP
+ int i;
+@@ -36,7 +37,7 @@ static int vlan_if_add(struct hostapd_data *hapd, struct hostapd_vlan *vlan,
+ }
+ #endif /* CONFIG_WEP */
+
+- if (!iface_exists(vlan->ifname))
++ if (!vlan_exists)
+ ret = hostapd_vlan_if_add(hapd, vlan->ifname);
+ else if (!existsok)
+ return -1;
+@@ -51,6 +52,9 @@ static int vlan_if_add(struct hostapd_data *hapd, struct hostapd_vlan *vlan,
+ if (hapd->wpa_auth)
+ ret = wpa_auth_ensure_group(hapd->wpa_auth, vlan->vlan_id);
+
++ if (!ret && !vlan_exists)
++ hostapd_ubus_add_vlan(hapd, vlan);
++
+ if (ret == 0)
+ return ret;
+
+@@ -77,6 +81,8 @@ int vlan_if_remove(struct hostapd_data *hapd, struct hostapd_vlan *vlan)
+ "WPA deinitialization for VLAN %d failed (%d)",
+ vlan->vlan_id, ret);
+
++ hostapd_ubus_remove_vlan(hapd, vlan);
++
+ return hostapd_vlan_if_remove(hapd, vlan->ifname);
+ }
+
+diff --git a/src/ap/wnm_ap.c b/src/ap/wnm_ap.c
+index b77e21bd1..d68af2f49 100644
+--- a/src/ap/wnm_ap.c
++++ b/src/ap/wnm_ap.c
+@@ -410,6 +410,7 @@ static int ieee802_11_send_bss_trans_mgmt_request(struct hostapd_data *hapd,
+ mgmt->u.action.u.bss_tm_req.validity_interval = 1;
+ pos = mgmt->u.action.u.bss_tm_req.variable;
+
++ hapd->openwrt_stats.wnm.bss_transition_request_tx++;
+ wpa_printf(MSG_DEBUG, "WNM: Send BSS Transition Management Request to "
+ MACSTR " dialog_token=%u req_mode=0x%x disassoc_timer=%u "
+ "validity_interval=%u",
+@@ -478,7 +479,8 @@ static void ieee802_11_rx_bss_trans_mgmt_query(struct hostapd_data *hapd,
+ MAC2STR(addr), reason, hex ? " neighbor=" : "", hex);
+ os_free(hex);
+
+- ieee802_11_send_bss_trans_mgmt_request(hapd, addr, dialog_token);
++ if (!hostapd_ubus_notify_bss_transition_query(hapd, addr, dialog_token, reason, pos, end - pos))
++ ieee802_11_send_bss_trans_mgmt_request(hapd, addr, dialog_token);
+ }
+
+
+@@ -500,7 +502,7 @@ static void ieee802_11_rx_bss_trans_mgmt_resp(struct hostapd_data *hapd,
+ size_t len)
+ {
+ u8 dialog_token, status_code, bss_termination_delay;
+- const u8 *pos, *end;
++ const u8 *pos, *end, *target_bssid = NULL;
+ int enabled = hapd->conf->bss_transition;
+ struct sta_info *sta;
+
+@@ -547,6 +549,7 @@ static void ieee802_11_rx_bss_trans_mgmt_resp(struct hostapd_data *hapd,
+ wpa_printf(MSG_DEBUG, "WNM: not enough room for Target BSSID field");
+ return;
+ }
++ target_bssid = pos;
+ sta->agreed_to_steer = 1;
+ eloop_cancel_timeout(ap_sta_reset_steer_flag_timer, hapd, sta);
+ eloop_register_timeout(2, 0, ap_sta_reset_steer_flag_timer,
+@@ -566,6 +569,10 @@ static void ieee802_11_rx_bss_trans_mgmt_resp(struct hostapd_data *hapd,
+ MAC2STR(addr), status_code, bss_termination_delay);
+ }
+
++ hostapd_ubus_notify_bss_transition_response(hapd, sta->addr, dialog_token,
++ status_code, bss_termination_delay,
++ target_bssid, pos, end - pos);
++
+ wpa_hexdump(MSG_DEBUG, "WNM: BSS Transition Candidate List Entries",
+ pos, end - pos);
+ }
+@@ -814,10 +821,12 @@ int ieee802_11_rx_wnm_action_ap(struct hostapd_data *hapd,
+ plen);
+ return 0;
+ case WNM_BSS_TRANS_MGMT_QUERY:
++ hapd->openwrt_stats.wnm.bss_transition_query_rx++;
+ ieee802_11_rx_bss_trans_mgmt_query(hapd, mgmt->sa, payload,
+ plen);
+ return 0;
+ case WNM_BSS_TRANS_MGMT_RESP:
++ hapd->openwrt_stats.wnm.bss_transition_response_rx++;
+ ieee802_11_rx_bss_trans_mgmt_resp(hapd, mgmt->sa, payload,
+ plen);
+ return 0;
+@@ -865,6 +874,7 @@ int wnm_send_disassoc_imminent(struct hostapd_data *hapd,
+
+ pos = mgmt->u.action.u.bss_tm_req.variable;
+
++ hapd->openwrt_stats.wnm.bss_transition_request_tx++;
+ wpa_printf(MSG_DEBUG, "WNM: Send BSS Transition Management Request frame to indicate imminent disassociation (disassoc_timer=%d) to "
+ MACSTR, disassoc_timer, MAC2STR(sta->addr));
+ if (hostapd_drv_send_mlme(hapd, buf, pos - buf, 0, NULL, 0, 0) < 0) {
+@@ -947,6 +957,7 @@ int wnm_send_ess_disassoc_imminent(struct hostapd_data *hapd,
+ return -1;
+ }
+
++ hapd->openwrt_stats.wnm.bss_transition_request_tx++;
+ if (disassoc_timer) {
+ /* send disassociation frame after time-out */
+ set_disassoc_timer(hapd, sta, disassoc_timer);
+@@ -1028,6 +1039,7 @@ int wnm_send_bss_tm_req(struct hostapd_data *hapd, struct sta_info *sta,
+ }
+ os_free(buf);
+
++ hapd->openwrt_stats.wnm.bss_transition_request_tx++;
+ if (disassoc_timer) {
+ #ifdef CONFIG_IEEE80211BE
+ if (ap_sta_is_mld(hapd, sta)) {
+diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
+index 01a10b23c..808456d86 100644
+--- a/src/ap/wpa_auth.c
++++ b/src/ap/wpa_auth.c
+@@ -5583,6 +5583,7 @@ static const char * wpa_bool_txt(int val)
+ return val ? "TRUE" : "FALSE";
+ }
+
++#ifdef CONFIG_CTRL_IFACE_MIB
+
+ #define RSN_SUITE "%02x-%02x-%02x-%d"
+ #define RSN_SUITE_ARG(s) \
+@@ -5735,7 +5736,7 @@ int wpa_get_mib_sta(struct wpa_state_machine *sm, char *buf, size_t buflen)
+
+ return len;
+ }
+-
++#endif
+
+ void wpa_auth_countermeasures_start(struct wpa_authenticator *wpa_auth)
+ {
+diff --git a/src/ap/wpa_auth_glue.c b/src/ap/wpa_auth_glue.c
+index d23f21835..b36026785 100644
+--- a/src/ap/wpa_auth_glue.c
++++ b/src/ap/wpa_auth_glue.c
+@@ -275,6 +275,7 @@ static void hostapd_wpa_auth_psk_failure_report(void *ctx, const u8 *addr)
+ struct hostapd_data *hapd = ctx;
+ wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_POSSIBLE_PSK_MISMATCH MACSTR,
+ MAC2STR(addr));
++ hostapd_ubus_notify(hapd, "key-mismatch", addr);
+ }
+
+
+@@ -1776,8 +1777,12 @@ int hostapd_setup_wpa(struct hostapd_data *hapd)
+ wpa_key_mgmt_ft(hapd->conf->wpa_key_mgmt)) {
+ const char *ft_iface;
+
+- ft_iface = hapd->conf->bridge[0] ? hapd->conf->bridge :
+- hapd->conf->iface;
++ if (hapd->conf->ft_iface[0])
++ ft_iface = hapd->conf->ft_iface;
++ else if (hapd->conf->bridge[0])
++ ft_iface = hapd->conf->bridge;
++ else
++ ft_iface = hapd->conf->iface;
+ hapd->l2 = l2_packet_init(ft_iface, NULL, ETH_P_RRB,
+ hostapd_rrb_receive, hapd, 1);
+ if (!hapd->l2) {
+diff --git a/src/ap/wps_hostapd.c b/src/ap/wps_hostapd.c
+index 82d4d5fdd..dfc5c3ecb 100644
+--- a/src/ap/wps_hostapd.c
++++ b/src/ap/wps_hostapd.c
+@@ -394,9 +394,8 @@ static int hapd_wps_reconfig_in_memory(struct hostapd_data *hapd,
+ bss->wpa_pairwise |= WPA_CIPHER_GCMP;
+ else
+ bss->wpa_pairwise |= WPA_CIPHER_CCMP;
+- }
+ #ifndef CONFIG_NO_TKIP
+- if (cred->encr_type & WPS_ENCR_TKIP)
++ } else if (cred->encr_type & WPS_ENCR_TKIP)
+ bss->wpa_pairwise |= WPA_CIPHER_TKIP;
+ #endif /* CONFIG_NO_TKIP */
+ bss->rsn_pairwise = bss->wpa_pairwise;
+@@ -1181,8 +1180,7 @@ int hostapd_init_wps(struct hostapd_data *hapd,
+ WPA_CIPHER_GCMP_256)) {
+ wps->encr_types |= WPS_ENCR_AES;
+ wps->encr_types_rsn |= WPS_ENCR_AES;
+- }
+- if (conf->rsn_pairwise & WPA_CIPHER_TKIP) {
++ } else if (conf->rsn_pairwise & WPA_CIPHER_TKIP) {
+ #ifdef CONFIG_NO_TKIP
+ wpa_printf(MSG_INFO, "WPS: TKIP not supported");
+ goto fail;
+diff --git a/src/ap/x_snoop.c b/src/ap/x_snoop.c
+index 029f4de23..4c20f137f 100644
+--- a/src/ap/x_snoop.c
++++ b/src/ap/x_snoop.c
+@@ -33,28 +33,31 @@ int x_snoop_init(struct hostapd_data *hapd)
+
+ hapd->x_snoop_initialized = true;
+
+- if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE,
++ if (!conf->snoop_iface[0] &&
++ hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE,
+ 1)) {
+ wpa_printf(MSG_DEBUG,
+ "x_snoop: Failed to enable hairpin_mode on the bridge port");
+ return -1;
+ }
+
+- if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) {
++ if (!conf->snoop_iface[0] &&
++ hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) {
+ wpa_printf(MSG_DEBUG,
+ "x_snoop: Failed to enable proxyarp on the bridge port");
+ return -1;
+ }
+
+ if (hostapd_drv_br_set_net_param(hapd, DRV_BR_NET_PARAM_GARP_ACCEPT,
+- 1)) {
++ conf->snoop_iface[0] ? conf->snoop_iface : NULL, 1)) {
+ wpa_printf(MSG_DEBUG,
+ "x_snoop: Failed to enable accepting gratuitous ARP on the bridge");
+ return -1;
+ }
+
+ #ifdef CONFIG_IPV6
+- if (hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, 1)) {
++ if (!conf->snoop_iface[0] &&
++ hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, NULL, 1)) {
+ wpa_printf(MSG_DEBUG,
+ "x_snoop: Failed to enable multicast snooping on the bridge");
+ return -1;
+@@ -73,8 +76,12 @@ x_snoop_get_l2_packet(struct hostapd_data *hapd,
+ {
+ struct hostapd_bss_config *conf = hapd->conf;
+ struct l2_packet_data *l2;
++ const char *ifname = conf->bridge;
++
++ if (conf->snoop_iface[0])
++ ifname = conf->snoop_iface;
+
+- l2 = l2_packet_init(conf->bridge, NULL, ETH_P_ALL, handler, hapd, 1);
++ l2 = l2_packet_init(ifname, NULL, ETH_P_ALL, handler, hapd, 1);
+ if (l2 == NULL) {
+ wpa_printf(MSG_DEBUG,
+ "x_snoop: Failed to initialize L2 packet processing %s",
+@@ -127,9 +134,12 @@ void x_snoop_mcast_to_ucast_convert_send(struct hostapd_data *hapd,
+
+ void x_snoop_deinit(struct hostapd_data *hapd)
+ {
++ struct hostapd_bss_config *conf = hapd->conf;
++
+ if (!hapd->x_snoop_initialized)
+ return;
+- hostapd_drv_br_set_net_param(hapd, DRV_BR_NET_PARAM_GARP_ACCEPT, 0);
++ hostapd_drv_br_set_net_param(hapd, DRV_BR_NET_PARAM_GARP_ACCEPT,
++ conf->snoop_iface[0] ? conf->snoop_iface : NULL, 0);
+ hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 0);
+ hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE, 0);
+ hapd->x_snoop_initialized = false;
+diff --git a/src/common/dpp_crypto.c b/src/common/dpp_crypto.c
+index f17f95a2c..39d39f429 100644
+--- a/src/common/dpp_crypto.c
++++ b/src/common/dpp_crypto.c
+@@ -269,6 +269,12 @@ int dpp_get_pubkey_hash(struct crypto_ec_key *key, u8 *hash)
+
+ struct crypto_ec_key * dpp_gen_keypair(const struct dpp_curve_params *curve)
+ {
++ if (curve == NULL) {
++ wpa_printf(MSG_DEBUG,
++ "DPP: %s curve must be initialized", __func__);
++ return NULL;
++ }
++
+ struct crypto_ec_key *key;
+
+ wpa_printf(MSG_DEBUG, "DPP: Generating a keypair");
+@@ -1582,7 +1588,9 @@ dpp_pkex_derive_Qr(const struct dpp_curve_params *curve, const u8 *mac_resp,
+ Pr = crypto_ec_key_get_public_key(Pr_key);
+ Qr = crypto_ec_point_init(ec);
+ hash_bn = crypto_bignum_init_set(hash, curve->hash_len);
+- if (!Pr || !Qr || !hash_bn || crypto_ec_point_mul(ec, Pr, hash_bn, Qr))
++ if (!Pr || !Qr || !hash_bn ||
++ crypto_bignum_mod(hash_bn, crypto_ec_get_prime(ec), hash_bn) ||
++ crypto_ec_point_mul(ec, Pr, hash_bn, Qr))
+ goto fail;
+
+ if (crypto_ec_point_is_at_infinity(ec, Qr)) {
+diff --git a/src/common/hw_features_common.c b/src/common/hw_features_common.c
+index 2c47bf812..8bd6e994d 100644
+--- a/src/common/hw_features_common.c
++++ b/src/common/hw_features_common.c
+@@ -898,6 +898,7 @@ int ieee80211ac_cap_check(u32 hw, u32 conf)
+ VHT_CAP_CHECK(VHT_CAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB);
+ VHT_CAP_CHECK(VHT_CAP_RX_ANTENNA_PATTERN);
+ VHT_CAP_CHECK(VHT_CAP_TX_ANTENNA_PATTERN);
++ VHT_CAP_CHECK(VHT_CAP_EXTENDED_NSS_BW_SUPPORT);
+
+ #undef VHT_CAP_CHECK
+ #undef VHT_CAP_CHECK_MAX
+diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h
+index 5b39a61e1..7a1da3252 100644
+--- a/src/common/ieee802_11_defs.h
++++ b/src/common/ieee802_11_defs.h
+@@ -1397,6 +1397,8 @@ struct ieee80211_ampe_ie {
+ #define VHT_CAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB ((u32) BIT(26) | BIT(27))
+ #define VHT_CAP_RX_ANTENNA_PATTERN ((u32) BIT(28))
+ #define VHT_CAP_TX_ANTENNA_PATTERN ((u32) BIT(29))
++#define VHT_CAP_EXTENDED_NSS_BW_SUPPORT ((u32) BIT(30))
++#define VHT_CAP_EXTENDED_NSS_BW_SUPPORT_MASK ((u32) BIT(30) | BIT(31))
+
+ #define VHT_OPMODE_CHANNEL_WIDTH_MASK ((u8) BIT(0) | BIT(1))
+ #define VHT_OPMODE_CHANNEL_RxNSS_MASK ((u8) BIT(4) | BIT(5) | \
+diff --git a/src/common/sae.c b/src/common/sae.c
+index f1c164e13..05de737e5 100644
+--- a/src/common/sae.c
++++ b/src/common/sae.c
+@@ -1278,6 +1278,13 @@ void sae_deinit_pt(struct sae_pt *pt)
+ static int sae_derive_commit_element_ecc(struct sae_data *sae,
+ struct crypto_bignum *mask)
+ {
++ if (sae->tmp->pwe_ecc == NULL) {
++ wpa_printf(MSG_DEBUG,
++ "SAE: %s sae->tmp->pwe_ecc must be initialized",
++ __func__);
++ return -1;
++ }
++
+ /* COMMIT-ELEMENT = inverse(scalar-op(mask, PWE)) */
+ if (!sae->tmp->own_commit_element_ecc) {
+ sae->tmp->own_commit_element_ecc =
+diff --git a/src/common/wpa_common.c b/src/common/wpa_common.c
+index 6ea3311ce..7a608c30e 100644
+--- a/src/common/wpa_common.c
++++ b/src/common/wpa_common.c
+@@ -2856,6 +2856,31 @@ u32 wpa_akm_to_suite(int akm)
+ }
+
+
++static void wpa_fixup_wpa_ie_rsn(u8 *assoc_ie, const u8 *wpa_msg_ie,
++ size_t rsn_ie_len)
++{
++ int pos, count;
++
++ pos = sizeof(struct rsn_ie_hdr) + RSN_SELECTOR_LEN;
++ if (rsn_ie_len < pos + 2)
++ return;
++
++ count = WPA_GET_LE16(wpa_msg_ie + pos);
++ pos += 2 + count * RSN_SELECTOR_LEN;
++ if (rsn_ie_len < pos + 2)
++ return;
++
++ count = WPA_GET_LE16(wpa_msg_ie + pos);
++ pos += 2 + count * RSN_SELECTOR_LEN;
++ if (rsn_ie_len < pos + 2)
++ return;
++
++ if (!assoc_ie[pos] && !assoc_ie[pos + 1] &&
++ (wpa_msg_ie[pos] || wpa_msg_ie[pos + 1]))
++ memcpy(&assoc_ie[pos], &wpa_msg_ie[pos], 2);
++}
++
++
+ int wpa_compare_rsn_ie(int ft_initial_assoc,
+ const u8 *ie1, size_t ie1len,
+ const u8 *ie2, size_t ie2len)
+@@ -2863,8 +2888,19 @@ int wpa_compare_rsn_ie(int ft_initial_assoc,
+ if (ie1 == NULL || ie2 == NULL)
+ return -1;
+
+- if (ie1len == ie2len && os_memcmp(ie1, ie2, ie1len) == 0)
+- return 0; /* identical IEs */
++ if (ie1len == ie2len) {
++ u8 *ie_tmp;
++
++ if (os_memcmp(ie1, ie2, ie1len) == 0)
++ return 0; /* identical IEs */
++
++ ie_tmp = alloca(ie1len);
++ memcpy(ie_tmp, ie1, ie1len);
++ wpa_fixup_wpa_ie_rsn(ie_tmp, ie2, ie1len);
++
++ if (os_memcmp(ie_tmp, ie2, ie1len) == 0)
++ return 0; /* only mismatch in RSN capabilties */
++ }
+
+ #ifdef CONFIG_IEEE80211R
+ if (ft_initial_assoc) {
+diff --git a/src/common/wpa_ctrl.c b/src/common/wpa_ctrl.c
+index 7e197f094..791fdbf93 100644
+--- a/src/common/wpa_ctrl.c
++++ b/src/common/wpa_ctrl.c
+@@ -135,7 +135,7 @@ try_again:
+ return NULL;
+ }
+ tries++;
+-#ifdef ANDROID
++
+ /* Set client socket file permissions so that bind() creates the client
+ * socket with these permissions and there is no need to try to change
+ * them with chmod() after bind() which would have potential issues with
+@@ -147,7 +147,7 @@ try_again:
+ * operations to allow the response to go through. Those are using the
+ * no-deference-symlinks version to avoid races. */
+ fchmod(ctrl->s, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
+-#endif /* ANDROID */
++
+ if (bind(ctrl->s, (struct sockaddr *) &ctrl->local,
+ sizeof(ctrl->local)) < 0) {
+ if (errno == EADDRINUSE && tries < 2) {
+@@ -165,7 +165,11 @@ try_again:
+ return NULL;
+ }
+
+-#ifdef ANDROID
++#ifndef ANDROID
++ /* Set group even if we do not have privileges to change owner */
++ lchown(ctrl->local.sun_path, -1, 101);
++ lchown(ctrl->local.sun_path, 101, 101);
++#else
+ /* Set group even if we do not have privileges to change owner */
+ lchown(ctrl->local.sun_path, -1, AID_WIFI);
+ lchown(ctrl->local.sun_path, AID_SYSTEM, AID_WIFI);
+diff --git a/src/crypto/Makefile b/src/crypto/Makefile
+index ce0997091..96bac9476 100644
+--- a/src/crypto/Makefile
++++ b/src/crypto/Makefile
+@@ -1,10 +1,121 @@
+-CFLAGS += -DCONFIG_CRYPTO_INTERNAL
+-CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT
+-CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
+ #CFLAGS += -DALL_DH_GROUPS
+ CFLAGS += -DCONFIG_SHA256
+ CFLAGS += -DCONFIG_SHA384
++CFLAGS += -DCONFIG_HMAC_SHA256_KDF
+ CFLAGS += -DCONFIG_HMAC_SHA384_KDF
++
++# crypto_module_tests.c
++CFLAGS += -DCONFIG_MODULE_TESTS
++CFLAGS += -DCONFIG_DPP
++#CFLAGS += -DCONFIG_DPP2
++#CFLAGS += -DCONFIG_DPP3
++CFLAGS += -DCONFIG_ECC
++CFLAGS += -DCONFIG_MESH
++CFLAGS += -DEAP_PSK
++CFLAGS += -DEAP_FAST
++
++ifeq ($(CONFIG_TLS),mbedtls)
++
++# (enable features for 'cd tests; make run-tests CONFIG_TLS=mbedtls')
++CFLAGS += -DCRYPTO_RSA_OAEP_SHA256
++CFLAGS += -DCONFIG_DES
++CFLAGS += -DEAP_IKEV2
++CFLAGS += -DEAP_MSCHAPv2
++CFLAGS += -DEAP_SIM
++
++LIB_OBJS = tls_mbedtls.o crypto_mbedtls.o
++LIB_OBJS+= \
++ aes-eax.o \
++ aes-siv.o \
++ dh_groups.o \
++ milenage.o \
++ ms_funcs.o
++
++else
++ifeq ($(CONFIG_TLS),openssl)
++
++# (enable features for 'cd tests; make run-tests CONFIG_TLS=openssl')
++ifndef CONFIG_TLS_DEFAULT_CIPHERS
++CONFIG_TLS_DEFAULT_CIPHERS = "DEFAULT:!EXP:!LOW"
++endif
++CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONFIG_TLS_DEFAULT_CIPHERS)\"
++CFLAGS += -DCRYPTO_RSA_OAEP_SHA256
++CFLAGS += -DEAP_TLS_OPENSSL
++
++LIB_OBJS = tls_openssl.o fips_prf_openssl.o crypto_openssl.o
++LIB_OBJS+= \
++ aes-ctr.o \
++ aes-eax.o \
++ aes-encblock.o \
++ aes-siv.o \
++ dh_groups.o \
++ milenage.o \
++ ms_funcs.o \
++ sha1-prf.o \
++ sha1-tlsprf.o \
++ sha1-tprf.o \
++ sha256-kdf.o \
++ sha256-prf.o \
++ sha256-tlsprf.o
++
++else
++ifeq ($(CONFIG_TLS),wolfssl)
++
++# (wolfssl libraries must be built with ./configure --enable-wpas)
++# (enable features for 'cd tests; make run-tests CONFIG_TLS=wolfssl')
++CFLAGS += -DWOLFSSL_DER_LOAD
++CFLAGS += -DCONFIG_DES
++
++LIB_OBJS = tls_wolfssl.o fips_prf_wolfssl.o crypto_wolfssl.o
++LIB_OBJS+= \
++ aes-ctr.o \
++ aes-eax.o \
++ aes-encblock.o \
++ aes-siv.o \
++ dh_groups.o \
++ milenage.o \
++ ms_funcs.o \
++ sha1-prf.o \
++ sha1-tlsprf.o \
++ sha1-tprf.o \
++ sha256-kdf.o \
++ sha256-prf.o \
++ sha256-tlsprf.o
++
++else
++ifeq ($(CONFIG_TLS),gnutls)
++
++# (enable features for 'cd tests; make run-tests CONFIG_TLS=gnutls')
++LIB_OBJS = tls_gnutls.o crypto_gnutls.o
++LIB_OBJS+= \
++ aes-cbc.o \
++ aes-ctr.o \
++ aes-eax.o \
++ aes-encblock.o \
++ aes-omac1.o \
++ aes-siv.o \
++ aes-unwrap.o \
++ aes-wrap.o \
++ dh_group5.o \
++ dh_groups.o \
++ milenage.o \
++ ms_funcs.o \
++ rc4.o \
++ sha1-pbkdf2.o \
++ sha1-prf.o \
++ fips_prf_internal.o \
++ sha1-internal.o \
++ sha1-tlsprf.o \
++ sha1-tprf.o \
++ sha256-kdf.o \
++ sha256-prf.o \
++ sha256-tlsprf.o
++
++else
++
++CFLAGS += -DCONFIG_CRYPTO_INTERNAL
++CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT
++CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
+ CFLAGS += -DCONFIG_INTERNAL_SHA384
+
+ LIB_OBJS= \
+@@ -13,7 +124,6 @@ LIB_OBJS= \
+ aes-ctr.o \
+ aes-eax.o \
+ aes-encblock.o \
+- aes-gcm.o \
+ aes-internal.o \
+ aes-internal-dec.o \
+ aes-internal-enc.o \
+@@ -37,6 +147,7 @@ LIB_OBJS= \
+ sha1-tlsprf.o \
+ sha1-tprf.o \
+ sha256.o \
++ sha256-kdf.o \
+ sha256-prf.o \
+ sha256-tlsprf.o \
+ sha256-internal.o \
+@@ -53,6 +164,16 @@ LIB_OBJS += crypto_internal-modexp.o
+ LIB_OBJS += crypto_internal-rsa.o
+ LIB_OBJS += tls_internal.o
+ LIB_OBJS += fips_prf_internal.o
++
++endif
++endif
++endif
++endif
++
++
++# (used by wlantest/{bip,gcmp,rx_mgmt}.c and tests/test-aes.c)
++LIB_OBJS += aes-gcm.o
++
+ ifndef TEST_FUZZ
+ LIB_OBJS += random.o
+ endif
+diff --git a/src/crypto/crypto_mbedtls.c b/src/crypto/crypto_mbedtls.c
+new file mode 100644
+index 000000000..7a91c965f
+--- /dev/null
++++ b/src/crypto/crypto_mbedtls.c
+@@ -0,0 +1,4228 @@
++/*
++ * crypto wrapper functions for mbed TLS
++ *
++ * SPDX-FileCopyrightText: 2022 Glenn Strauss <gstrauss@gluelogic.com>
++ * SPDX-License-Identifier: BSD-3-Clause
++ */
++
++#include "utils/includes.h"
++#include "utils/common.h"
++
++#include <mbedtls/version.h>
++#include <mbedtls/entropy.h>
++#include <mbedtls/ctr_drbg.h>
++#include <mbedtls/platform_util.h> /* mbedtls_platform_zeroize() */
++#include <mbedtls/asn1.h>
++#include <mbedtls/asn1write.h>
++#include <mbedtls/aes.h>
++#include <mbedtls/md.h>
++#include <mbedtls/md5.h>
++#include <mbedtls/sha1.h>
++#include <mbedtls/sha256.h>
++#include <mbedtls/sha512.h>
++
++#ifndef MBEDTLS_PRIVATE
++#define MBEDTLS_PRIVATE(x) x
++#endif
++
++/* hostapd/wpa_supplicant provides forced_memzero(),
++ * but prefer mbedtls_platform_zeroize() */
++#define forced_memzero(ptr,sz) mbedtls_platform_zeroize(ptr,sz)
++
++#ifndef __has_attribute
++#define __has_attribute(x) 0
++#endif
++
++#ifndef __GNUC_PREREQ
++#define __GNUC_PREREQ(maj,min) 0
++#endif
++
++#ifndef __attribute_cold__
++#if __has_attribute(cold) \
++ || __GNUC_PREREQ(4,3)
++#define __attribute_cold__ __attribute__((__cold__))
++#else
++#define __attribute_cold__
++#endif
++#endif
++
++#ifndef __attribute_noinline__
++#if __has_attribute(noinline) \
++ || __GNUC_PREREQ(3,1)
++#define __attribute_noinline__ __attribute__((__noinline__))
++#else
++#define __attribute_noinline__
++#endif
++#endif
++
++#include "crypto.h"
++#include "aes_wrap.h"
++#include "aes.h"
++#include "md5.h"
++#include "sha1.h"
++#include "sha256.h"
++#include "sha384.h"
++#include "sha512.h"
++
++
++/*
++ * selective code inclusion based on preprocessor defines
++ *
++ * future: additional code could be wrapped with preprocessor checks if
++ * wpa_supplicant/Makefile and hostap/Makefile were more consistent with
++ * setting preprocessor defines for named groups of functionality
++ */
++
++#if defined(CONFIG_FIPS)
++#undef MBEDTLS_MD4_C /* omit md4_vector() */
++#undef MBEDTLS_MD5_C /* omit md5_vector() hmac_md5_vector() hmac_md5() */
++#undef MBEDTLS_DES_C /* omit des_encrypt() */
++#undef MBEDTLS_NIST_KW_C /* omit aes_wrap() aes_unwrap() */
++#define CRYPTO_MBEDTLS_CONFIG_FIPS
++#endif
++
++#if !defined(CONFIG_FIPS)
++#if defined(EAP_PWD) \
++ || defined(EAP_LEAP) || defined(EAP_LEAP_DYNAMIC) \
++ || defined(EAP_TTLS) || defined(EAP_TTLS_DYNAMIC) \
++ || defined(EAP_MSCHAPv2) || defined(EAP_MSCHAPv2_DYNAMIC) \
++ || defined(EAP_SERVER_MSCHAPV2)
++#ifndef MBEDTLS_MD4_C /* (MD4 not in mbedtls 3.x) */
++#include "md4-internal.c"/* pull in hostap local implementation */
++#endif /* md4_vector() */
++#else
++#undef MBEDTLS_MD4_C /* omit md4_vector() */
++#endif
++#endif
++
++#if !defined(CONFIG_NO_RC4) && !defined(CONFIG_NO_WPA)
++#ifndef MBEDTLS_ARC4_C /* (RC4 not in mbedtls 3.x) */
++#include "rc4.c" /* pull in hostap local implementation */
++#endif /* rc4_skip() */
++#else
++#undef MBEDTLS_ARC4_C /* omit rc4_skip() */
++#endif
++
++#if defined(CONFIG_MACSEC) \
++ || defined(CONFIG_NO_RADIUS) \
++ || defined(CONFIG_IEEE80211R) \
++ || defined(EAP_SERVER_FAST) \
++ || defined(EAP_SERVER_TEAP) \
++ || !defined(CONFIG_NO_WPA)
++ /* aes_wrap() aes_unwrap() */
++#else
++#undef MBEDTLS_NIST_KW_C /* omit aes_wrap() aes_unwrap() */
++#endif
++
++#if !defined(CONFIG_SHA256)
++#undef MBEDTLS_SHA256_C
++#endif
++
++#if !defined(CONFIG_SHA384) && !defined(CONFIG_SHA512)
++#undef MBEDTLS_SHA512_C
++#endif
++
++#if defined(CONFIG_HMAC_SHA256_KDF)
++#define CRYPTO_MBEDTLS_HMAC_KDF_SHA256
++#endif
++#if defined(CONFIG_HMAC_SHA384_KDF)
++#define CRYPTO_MBEDTLS_HMAC_KDF_SHA384
++#endif
++#if defined(CONFIG_HMAC_SHA512_KDF)
++#define CRYPTO_MBEDTLS_HMAC_KDF_SHA512
++#endif
++
++#if defined(EAP_SIM) || defined(EAP_SIM_DYNAMIC) || defined(EAP_SERVER_SIM) \
++ || defined(EAP_AKA) || defined(EAP_AKA_DYNAMIC) || defined(EAP_SERVER_AKA)
++/* EAP_SIM=y EAP_AKA=y */
++#define CRYPTO_MBEDTLS_FIPS186_2_PRF
++#endif
++
++#if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST) \
++ || defined(EAP_TEAP) || defined(EAP_TEAP_DYNAMIC) || defined(EAP_SERVER_FAST)
++#define CRYPTO_MBEDTLS_SHA1_T_PRF
++#endif
++
++#if defined(CONFIG_DES)
++#define CRYPTO_MBEDTLS_DES_ENCRYPT
++#endif /* des_encrypt() */
++
++#if !defined(CONFIG_NO_PBKDF2)
++#define CRYPTO_MBEDTLS_PBKDF2_SHA1
++#endif /* pbkdf2_sha1() */
++
++#if defined(EAP_IKEV2) \
++ || defined(EAP_IKEV2_DYNAMIC) \
++ || defined(EAP_SERVER_IKEV2) /* CONFIG_EAP_IKEV2=y */
++#define CRYPTO_MBEDTLS_CRYPTO_CIPHER
++#endif /* crypto_cipher_*() */
++
++#if defined(EAP_PWD) || defined(EAP_SERVER_PWD) /* CONFIG_EAP_PWD=y */
++#define CRYPTO_MBEDTLS_CRYPTO_HASH
++#endif /* crypto_hash_*() */
++
++#if defined(EAP_PWD) || defined(EAP_SERVER_PWD) /* CONFIG_EAP_PWD=y */ \
++ || defined(CONFIG_SAE) /* CONFIG_SAE=y */
++#define CRYPTO_MBEDTLS_CRYPTO_BIGNUM
++#endif /* crypto_bignum_*() */
++
++#if defined(EAP_PWD) /* CONFIG_EAP_PWD=y */ \
++ || defined(EAP_EKE) /* CONFIG_EAP_EKE=y */ \
++ || defined(EAP_EKE_DYNAMIC) /* CONFIG_EAP_EKE=y */ \
++ || defined(EAP_SERVER_EKE) /* CONFIG_EAP_EKE=y */ \
++ || defined(EAP_IKEV2) /* CONFIG_EAP_IKEV2y */ \
++ || defined(EAP_IKEV2_DYNAMIC)/* CONFIG_EAP_IKEV2=y */ \
++ || defined(EAP_SERVER_IKEV2) /* CONFIG_EAP_IKEV2=y */ \
++ || defined(CONFIG_SAE) /* CONFIG_SAE=y */ \
++ || defined(CONFIG_WPS) /* CONFIG_WPS=y */
++#define CRYPTO_MBEDTLS_CRYPTO_DH
++#if defined(CONFIG_WPS_NFC)
++#define CRYPTO_MBEDTLS_DH5_INIT_FIXED
++#endif /* dh5_init_fixed() */
++#endif /* crypto_dh_*() */
++
++#if !defined(CONFIG_NO_WPA) /* CONFIG_NO_WPA= */
++#define CRYPTO_MBEDTLS_CRYPTO_ECDH
++#endif /* crypto_ecdh_*() */
++
++#if defined(CONFIG_ECC)
++#define CRYPTO_MBEDTLS_CRYPTO_BIGNUM
++#define CRYPTO_MBEDTLS_CRYPTO_EC
++#endif /* crypto_ec_*() crypto_ec_key_*() */
++
++#if defined(CONFIG_DPP) /* CONFIG_DPP=y */
++#define CRYPTO_MBEDTLS_CRYPTO_EC_DPP /* extra for DPP */
++#define CRYPTO_MBEDTLS_CRYPTO_CSR
++#endif /* crypto_csr_*() */
++
++#if defined(CONFIG_DPP3) /* CONFIG_DPP3=y */
++#define CRYPTO_MBEDTLS_CRYPTO_HPKE
++#endif
++
++#if defined(CONFIG_DPP2) /* CONFIG_DPP2=y */
++#define CRYPTO_MBEDTLS_CRYPTO_PKCS7
++#endif /* crypto_pkcs7_*() */
++
++#if defined(EAP_SIM) || defined(EAP_SIM_DYNAMIC) || defined(EAP_SERVER_SIM) \
++ || defined(EAP_AKA) || defined(EAP_AKA_DYNAMIC) || defined(EAP_SERVER_AKA) \
++ || defined(CONFIG_AP) || defined(HOSTAPD)
++/* CONFIG_EAP_SIM=y CONFIG_EAP_AKA=y CONFIG_AP=y HOSTAPD */
++#if defined(CRYPTO_RSA_OAEP_SHA256)
++#define CRYPTO_MBEDTLS_CRYPTO_RSA
++#endif
++#endif /* crypto_rsa_*() */
++
++
++static int ctr_drbg_init_state;
++static mbedtls_ctr_drbg_context ctr_drbg;
++static mbedtls_entropy_context entropy;
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_BIGNUM
++#include <mbedtls/bignum.h>
++static mbedtls_mpi mpi_sw_A;
++#endif
++
++__attribute_cold__
++__attribute_noinline__
++static mbedtls_ctr_drbg_context * ctr_drbg_init(void)
++{
++ mbedtls_ctr_drbg_init(&ctr_drbg);
++ mbedtls_entropy_init(&entropy);
++ if (mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy,
++ NULL, 0)) {
++ wpa_printf(MSG_ERROR, "Init of random number generator failed");
++ /* XXX: abort? */
++ }
++ else
++ ctr_drbg_init_state = 1;
++
++ return &ctr_drbg;
++}
++
++__attribute_cold__
++void crypto_unload(void)
++{
++ if (ctr_drbg_init_state) {
++ mbedtls_ctr_drbg_free(&ctr_drbg);
++ mbedtls_entropy_free(&entropy);
++ #ifdef CRYPTO_MBEDTLS_CRYPTO_BIGNUM
++ mbedtls_mpi_free(&mpi_sw_A);
++ #endif
++ ctr_drbg_init_state = 0;
++ }
++}
++
++/* init ctr_drbg on first use
++ * crypto_global_init() and crypto_global_deinit() are not available here
++ * (available only when CONFIG_TLS=internal, which is not CONFIG_TLS=mbedtls) */
++mbedtls_ctr_drbg_context * crypto_mbedtls_ctr_drbg(void); /*(not in header)*/
++inline
++mbedtls_ctr_drbg_context * crypto_mbedtls_ctr_drbg(void)
++{
++ return ctr_drbg_init_state ? &ctr_drbg : ctr_drbg_init();
++}
++
++#ifdef CRYPTO_MBEDTLS_CONFIG_FIPS
++int crypto_get_random(void *buf, size_t len)
++{
++ return mbedtls_ctr_drbg_random(crypto_mbedtls_ctr_drbg(),buf,len) ? -1 : 0;
++}
++#endif
++
++
++#if 1
++
++/* tradeoff: slightly smaller code size here at cost of slight increase
++ * in instructions and function calls at runtime versus the expanded
++ * per-message-digest code that follows in #else (~0.5 kib .text larger) */
++
++__attribute_noinline__
++static int md_vector(size_t num_elem, const u8 *addr[], const size_t *len,
++ u8 *mac, mbedtls_md_type_t md_type)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ mbedtls_md_context_t ctx;
++ mbedtls_md_init(&ctx);
++ if (mbedtls_md_setup(&ctx, mbedtls_md_info_from_type(md_type), 0) != 0){
++ mbedtls_md_free(&ctx);
++ return -1;
++ }
++ mbedtls_md_starts(&ctx);
++ for (size_t i = 0; i < num_elem; ++i)
++ mbedtls_md_update(&ctx, addr[i], len[i]);
++ mbedtls_md_finish(&ctx, mac);
++ mbedtls_md_free(&ctx);
++ return 0;
++}
++
++#ifdef MBEDTLS_SHA512_C
++int sha512_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
++{
++ return md_vector(num_elem, addr, len, mac, MBEDTLS_MD_SHA512);
++}
++
++int sha384_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
++{
++ return md_vector(num_elem, addr, len, mac, MBEDTLS_MD_SHA384);
++}
++#endif
++
++#ifdef MBEDTLS_SHA256_C
++int sha256_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
++{
++ return md_vector(num_elem, addr, len, mac, MBEDTLS_MD_SHA256);
++}
++#endif
++
++#ifdef MBEDTLS_SHA1_C
++int sha1_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
++{
++ return md_vector(num_elem, addr, len, mac, MBEDTLS_MD_SHA1);
++}
++#endif
++
++#ifdef MBEDTLS_MD5_C
++int md5_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
++{
++ return md_vector(num_elem, addr, len, mac, MBEDTLS_MD_MD5);
++}
++#endif
++
++#ifdef MBEDTLS_MD4_C
++#include <mbedtls/md4.h>
++int md4_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
++{
++ return md_vector(num_elem, addr, len, mac, MBEDTLS_MD_MD4);
++}
++#endif
++
++#else /* expanded per-message-digest functions */
++
++#ifdef MBEDTLS_SHA512_C
++#include <mbedtls/sha512.h>
++__attribute_noinline__
++static int sha384_512_vector(size_t num_elem, const u8 *addr[],
++ const size_t *len, u8 *mac, int is384)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ struct mbedtls_sha512_context ctx;
++ mbedtls_sha512_init(&ctx);
++ #if MBEDTLS_VERSION_MAJOR >= 3
++ mbedtls_sha512_starts(&ctx, is384);
++ for (size_t i = 0; i < num_elem; ++i)
++ mbedtls_sha512_update(&ctx, addr[i], len[i]);
++ mbedtls_sha512_finish(&ctx, mac);
++ #else
++ mbedtls_sha512_starts_ret(&ctx, is384);
++ for (size_t i = 0; i < num_elem; ++i)
++ mbedtls_sha512_update_ret(&ctx, addr[i], len[i]);
++ mbedtls_sha512_finish_ret(&ctx, mac);
++ #endif
++ mbedtls_sha512_free(&ctx);
++ return 0;
++}
++
++int sha512_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
++{
++ return sha384_512_vector(num_elem, addr, len, mac, 0);
++}
++
++int sha384_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
++{
++ return sha384_512_vector(num_elem, addr, len, mac, 1);
++}
++#endif
++
++#ifdef MBEDTLS_SHA256_C
++#include <mbedtls/sha256.h>
++int sha256_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ struct mbedtls_sha256_context ctx;
++ mbedtls_sha256_init(&ctx);
++ #if MBEDTLS_VERSION_MAJOR >= 3
++ mbedtls_sha256_starts(&ctx, 0);
++ for (size_t i = 0; i < num_elem; ++i)
++ mbedtls_sha256_update(&ctx, addr[i], len[i]);
++ mbedtls_sha256_finish(&ctx, mac);
++ #else
++ mbedtls_sha256_starts_ret(&ctx, 0);
++ for (size_t i = 0; i < num_elem; ++i)
++ mbedtls_sha256_update_ret(&ctx, addr[i], len[i]);
++ mbedtls_sha256_finish_ret(&ctx, mac);
++ #endif
++ mbedtls_sha256_free(&ctx);
++ return 0;
++}
++#endif
++
++#ifdef MBEDTLS_SHA1_C
++#include <mbedtls/sha1.h>
++int sha1_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ struct mbedtls_sha1_context ctx;
++ mbedtls_sha1_init(&ctx);
++ #if MBEDTLS_VERSION_MAJOR >= 3
++ mbedtls_sha1_starts(&ctx);
++ for (size_t i = 0; i < num_elem; ++i)
++ mbedtls_sha1_update(&ctx, addr[i], len[i]);
++ mbedtls_sha1_finish(&ctx, mac);
++ #else
++ mbedtls_sha1_starts_ret(&ctx);
++ for (size_t i = 0; i < num_elem; ++i)
++ mbedtls_sha1_update_ret(&ctx, addr[i], len[i]);
++ mbedtls_sha1_finish_ret(&ctx, mac);
++ #endif
++ mbedtls_sha1_free(&ctx);
++ return 0;
++}
++#endif
++
++#ifdef MBEDTLS_MD5_C
++#include <mbedtls/md5.h>
++int md5_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ struct mbedtls_md5_context ctx;
++ mbedtls_md5_init(&ctx);
++ #if MBEDTLS_VERSION_MAJOR >= 3
++ mbedtls_md5_starts(&ctx);
++ for (size_t i = 0; i < num_elem; ++i)
++ mbedtls_md5_update(&ctx, addr[i], len[i]);
++ mbedtls_md5_finish(&ctx, mac);
++ #else
++ mbedtls_md5_starts_ret(&ctx);
++ for (size_t i = 0; i < num_elem; ++i)
++ mbedtls_md5_update_ret(&ctx, addr[i], len[i]);
++ mbedtls_md5_finish_ret(&ctx, mac);
++ #endif
++ mbedtls_md5_free(&ctx);
++ return 0;
++}
++#endif
++
++#ifdef MBEDTLS_MD4_C
++#include <mbedtls/md4.h>
++int md4_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ struct mbedtls_md4_context ctx;
++ mbedtls_md4_init(&ctx);
++ mbedtls_md4_starts_ret(&ctx);
++ for (size_t i = 0; i < num_elem; ++i)
++ mbedtls_md4_update_ret(&ctx, addr[i], len[i]);
++ mbedtls_md4_finish_ret(&ctx, mac);
++ mbedtls_md4_free(&ctx);
++ return 0;
++}
++#endif
++
++#endif /* expanded per-message-digest functions */
++
++
++__attribute_noinline__
++static int hmac_vector(const u8 *key, size_t key_len, size_t num_elem,
++ const u8 *addr[], const size_t *len, u8 *mac,
++ mbedtls_md_type_t md_type)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ mbedtls_md_context_t ctx;
++ mbedtls_md_init(&ctx);
++ if (mbedtls_md_setup(&ctx, mbedtls_md_info_from_type(md_type), 1) != 0){
++ mbedtls_md_free(&ctx);
++ return -1;
++ }
++ mbedtls_md_hmac_starts(&ctx, key, key_len);
++ for (size_t i = 0; i < num_elem; ++i)
++ mbedtls_md_hmac_update(&ctx, addr[i], len[i]);
++ mbedtls_md_hmac_finish(&ctx, mac);
++ mbedtls_md_free(&ctx);
++ return 0;
++}
++
++#ifdef MBEDTLS_SHA512_C
++int hmac_sha512_vector(const u8 *key, size_t key_len, size_t num_elem,
++ const u8 *addr[], const size_t *len, u8 *mac)
++{
++ return hmac_vector(key, key_len, num_elem, addr, len, mac,
++ MBEDTLS_MD_SHA512);
++}
++
++int hmac_sha512(const u8 *key, size_t key_len, const u8 *data, size_t data_len,
++ u8 *mac)
++{
++ return hmac_vector(key, key_len, 1, &data, &data_len, mac,
++ MBEDTLS_MD_SHA512);
++}
++
++int hmac_sha384_vector(const u8 *key, size_t key_len, size_t num_elem,
++ const u8 *addr[], const size_t *len, u8 *mac)
++{
++ return hmac_vector(key, key_len, num_elem, addr, len, mac,
++ MBEDTLS_MD_SHA384);
++}
++
++int hmac_sha384(const u8 *key, size_t key_len, const u8 *data, size_t data_len,
++ u8 *mac)
++{
++ return hmac_vector(key, key_len, 1, &data, &data_len, mac,
++ MBEDTLS_MD_SHA384);
++}
++#endif
++
++#ifdef MBEDTLS_SHA256_C
++int hmac_sha256_vector(const u8 *key, size_t key_len, size_t num_elem,
++ const u8 *addr[], const size_t *len, u8 *mac)
++{
++ return hmac_vector(key, key_len, num_elem, addr, len, mac,
++ MBEDTLS_MD_SHA256);
++}
++
++int hmac_sha256(const u8 *key, size_t key_len, const u8 *data, size_t data_len,
++ u8 *mac)
++{
++ return hmac_vector(key, key_len, 1, &data, &data_len, mac,
++ MBEDTLS_MD_SHA256);
++}
++#endif
++
++#ifdef MBEDTLS_SHA1_C
++int hmac_sha1_vector(const u8 *key, size_t key_len, size_t num_elem,
++ const u8 *addr[], const size_t *len, u8 *mac)
++{
++ return hmac_vector(key, key_len, num_elem, addr, len, mac,
++ MBEDTLS_MD_SHA1);
++}
++
++int hmac_sha1(const u8 *key, size_t key_len, const u8 *data, size_t data_len,
++ u8 *mac)
++{
++ return hmac_vector(key, key_len, 1, &data, &data_len, mac,
++ MBEDTLS_MD_SHA1);
++}
++#endif
++
++#ifdef MBEDTLS_MD5_C
++int hmac_md5_vector(const u8 *key, size_t key_len, size_t num_elem,
++ const u8 *addr[], const size_t *len, u8 *mac)
++{
++ return hmac_vector(key, key_len, num_elem, addr, len, mac,
++ MBEDTLS_MD_MD5);
++}
++
++int hmac_md5(const u8 *key, size_t key_len, const u8 *data, size_t data_len,
++ u8 *mac)
++{
++ return hmac_vector(key, key_len, 1, &data, &data_len, mac,
++ MBEDTLS_MD_MD5);
++}
++#endif
++
++
++#if defined(MBEDTLS_SHA256_C) || defined(MBEDTLS_SHA512_C)
++
++#if defined(CRYPTO_MBEDTLS_HMAC_KDF_SHA256) \
++ || defined(CRYPTO_MBEDTLS_HMAC_KDF_SHA384) \
++ || defined(CRYPTO_MBEDTLS_HMAC_KDF_SHA512)
++
++#include <mbedtls/hkdf.h>
++
++/* sha256-kdf.c sha384-kdf.c sha512-kdf.c */
++
++/* HMAC-SHA256 KDF (RFC 5295) and HKDF-Expand(SHA256) (RFC 5869) */
++/* HMAC-SHA384 KDF (RFC 5295) and HKDF-Expand(SHA384) (RFC 5869) */
++/* HMAC-SHA512 KDF (RFC 5295) and HKDF-Expand(SHA512) (RFC 5869) */
++__attribute_noinline__
++static int hmac_kdf_expand(const u8 *prk, size_t prk_len,
++ const char *label, const u8 *info, size_t info_len,
++ u8 *okm, size_t okm_len, mbedtls_md_type_t md_type)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(md_type);
++ #ifdef MBEDTLS_HKDF_C
++ if (label == NULL) /* RFC 5869 HKDF-Expand when (label == NULL) */
++ return mbedtls_hkdf_expand(md_info, prk, prk_len, info,
++ info_len, okm, okm_len) ? -1 : 0;
++ #endif
++
++ const size_t mac_len = mbedtls_md_get_size(md_info);
++ /* okm_len must not exceed 255 times hash len (RFC 5869 Section 2.3) */
++ if (okm_len > ((mac_len << 8) - mac_len))
++ return -1;
++
++ mbedtls_md_context_t ctx;
++ mbedtls_md_init(&ctx);
++ if (mbedtls_md_setup(&ctx, md_info, 1) != 0) {
++ mbedtls_md_free(&ctx);
++ return -1;
++ }
++ mbedtls_md_hmac_starts(&ctx, prk, prk_len);
++
++ u8 iter = 1;
++ const u8 *addr[4] = { okm, (const u8 *)label, info, &iter };
++ size_t len[4] = { 0, label ? os_strlen(label)+1 : 0, info_len, 1 };
++
++ for (; okm_len >= mac_len; okm_len -= mac_len, ++iter) {
++ for (size_t i = 0; i < ARRAY_SIZE(addr); ++i)
++ mbedtls_md_hmac_update(&ctx, addr[i], len[i]);
++ mbedtls_md_hmac_finish(&ctx, okm);
++ mbedtls_md_hmac_reset(&ctx);
++ addr[0] = okm;
++ okm += mac_len;
++ len[0] = mac_len; /*(include digest in subsequent rounds)*/
++ }
++
++ if (okm_len) {
++ u8 hash[MBEDTLS_MD_MAX_SIZE];
++ for (size_t i = 0; i < ARRAY_SIZE(addr); ++i)
++ mbedtls_md_hmac_update(&ctx, addr[i], len[i]);
++ mbedtls_md_hmac_finish(&ctx, hash);
++ os_memcpy(okm, hash, okm_len);
++ forced_memzero(hash, mac_len);
++ }
++
++ mbedtls_md_free(&ctx);
++ return 0;
++}
++
++#ifdef MBEDTLS_SHA512_C
++#ifdef CRYPTO_MBEDTLS_HMAC_KDF_SHA512
++int hmac_sha512_kdf(const u8 *secret, size_t secret_len,
++ const char *label, const u8 *seed, size_t seed_len,
++ u8 *out, size_t outlen)
++{
++ return hmac_kdf_expand(secret, secret_len, label, seed, seed_len,
++ out, outlen, MBEDTLS_MD_SHA512);
++}
++#endif
++
++#ifdef CRYPTO_MBEDTLS_HMAC_KDF_SHA384
++int hmac_sha384_kdf(const u8 *secret, size_t secret_len,
++ const char *label, const u8 *seed, size_t seed_len,
++ u8 *out, size_t outlen)
++{
++ return hmac_kdf_expand(secret, secret_len, label, seed, seed_len,
++ out, outlen, MBEDTLS_MD_SHA384);
++}
++#endif
++#endif
++
++#ifdef MBEDTLS_SHA256_C
++#ifdef CRYPTO_MBEDTLS_HMAC_KDF_SHA256
++int hmac_sha256_kdf(const u8 *secret, size_t secret_len,
++ const char *label, const u8 *seed, size_t seed_len,
++ u8 *out, size_t outlen)
++{
++ return hmac_kdf_expand(secret, secret_len, label, seed, seed_len,
++ out, outlen, MBEDTLS_MD_SHA256);
++}
++#endif
++#endif
++
++#endif /* CRYPTO_MBEDTLS_HMAC_KDF_* */
++
++
++/* sha256-prf.c sha384-prf.c sha512-prf.c */
++
++/* hmac_prf_bits - IEEE Std 802.11ac-2013, 11.6.1.7.2 Key derivation function */
++__attribute_noinline__
++static int hmac_prf_bits(const u8 *key, size_t key_len, const char *label,
++ const u8 *data, size_t data_len, u8 *buf,
++ size_t buf_len_bits, mbedtls_md_type_t md_type)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ mbedtls_md_context_t ctx;
++ mbedtls_md_init(&ctx);
++ const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(md_type);
++ if (mbedtls_md_setup(&ctx, md_info, 1) != 0) {
++ mbedtls_md_free(&ctx);
++ return -1;
++ }
++ mbedtls_md_hmac_starts(&ctx, key, key_len);
++
++ u16 ctr, n_le = host_to_le16(buf_len_bits);
++ const u8 * const addr[] = { (u8 *)&ctr,(u8 *)label,data,(u8 *)&n_le };
++ const size_t len[] = { 2, os_strlen(label), data_len, 2 };
++ const size_t mac_len = mbedtls_md_get_size(md_info);
++ size_t buf_len = (buf_len_bits + 7) / 8;
++ for (ctr = 1; buf_len >= mac_len; buf_len -= mac_len, ++ctr) {
++ #if __BYTE_ORDER == __BIG_ENDIAN
++ ctr = host_to_le16(ctr);
++ #endif
++ for (size_t i = 0; i < ARRAY_SIZE(addr); ++i)
++ mbedtls_md_hmac_update(&ctx, addr[i], len[i]);
++ mbedtls_md_hmac_finish(&ctx, buf);
++ mbedtls_md_hmac_reset(&ctx);
++ buf += mac_len;
++ #if __BYTE_ORDER == __BIG_ENDIAN
++ ctr = le_to_host16(ctr);
++ #endif
++ }
++
++ if (buf_len) {
++ u8 hash[MBEDTLS_MD_MAX_SIZE];
++ #if __BYTE_ORDER == __BIG_ENDIAN
++ ctr = host_to_le16(ctr);
++ #endif
++ for (size_t i = 0; i < ARRAY_SIZE(addr); ++i)
++ mbedtls_md_hmac_update(&ctx, addr[i], len[i]);
++ mbedtls_md_hmac_finish(&ctx, hash);
++ os_memcpy(buf, hash, buf_len);
++ buf += buf_len;
++ forced_memzero(hash, mac_len);
++ }
++
++ /* Mask out unused bits in last octet if it does not use all the bits */
++ if ((buf_len_bits &= 0x7))
++ buf[-1] &= (u8)(0xff << (8 - buf_len_bits));
++
++ mbedtls_md_free(&ctx);
++ return 0;
++}
++
++#ifdef MBEDTLS_SHA512_C
++int sha512_prf(const u8 *key, size_t key_len, const char *label,
++ const u8 *data, size_t data_len, u8 *buf, size_t buf_len)
++{
++ return hmac_prf_bits(key, key_len, label, data, data_len, buf,
++ buf_len * 8, MBEDTLS_MD_SHA512);
++}
++
++int sha384_prf(const u8 *key, size_t key_len, const char *label,
++ const u8 *data, size_t data_len, u8 *buf, size_t buf_len)
++{
++ return hmac_prf_bits(key, key_len, label, data, data_len, buf,
++ buf_len * 8, MBEDTLS_MD_SHA384);
++}
++#endif
++
++#ifdef MBEDTLS_SHA256_C
++int sha256_prf(const u8 *key, size_t key_len, const char *label,
++ const u8 *data, size_t data_len, u8 *buf, size_t buf_len)
++{
++ return hmac_prf_bits(key, key_len, label, data, data_len, buf,
++ buf_len * 8, MBEDTLS_MD_SHA256);
++}
++
++int sha256_prf_bits(const u8 *key, size_t key_len, const char *label,
++ const u8 *data, size_t data_len, u8 *buf,
++ size_t buf_len_bits)
++{
++ return hmac_prf_bits(key, key_len, label, data, data_len, buf,
++ buf_len_bits, MBEDTLS_MD_SHA256);
++}
++#endif
++
++#endif /* MBEDTLS_SHA256_C || MBEDTLS_SHA512_C */
++
++
++#ifdef MBEDTLS_SHA1_C
++
++/* sha1-prf.c */
++
++/* sha1_prf - SHA1-based Pseudo-Random Function (PRF) (IEEE 802.11i, 8.5.1.1) */
++
++int sha1_prf(const u8 *key, size_t key_len, const char *label,
++ const u8 *data, size_t data_len, u8 *buf, size_t buf_len)
++{
++ /*(note: algorithm differs from hmac_prf_bits() */
++ /*(note: smaller code size instead of expanding hmac_sha1_vector()
++ * as is done in hmac_prf_bits(); not expecting large num of loops) */
++ u8 counter = 0;
++ const u8 *addr[] = { (u8 *)label, data, &counter };
++ const size_t len[] = { os_strlen(label)+1, data_len, 1 };
++
++ for (; buf_len >= SHA1_MAC_LEN; buf_len -= SHA1_MAC_LEN, ++counter) {
++ if (hmac_sha1_vector(key, key_len, 3, addr, len, buf))
++ return -1;
++ buf += SHA1_MAC_LEN;
++ }
++
++ if (buf_len) {
++ u8 hash[SHA1_MAC_LEN];
++ if (hmac_sha1_vector(key, key_len, 3, addr, len, hash))
++ return -1;
++ os_memcpy(buf, hash, buf_len);
++ forced_memzero(hash, sizeof(hash));
++ }
++
++ return 0;
++}
++
++#ifdef CRYPTO_MBEDTLS_SHA1_T_PRF
++
++/* sha1-tprf.c */
++
++/* sha1_t_prf - EAP-FAST Pseudo-Random Function (T-PRF) (RFC 4851,Section 5.5)*/
++
++int sha1_t_prf(const u8 *key, size_t key_len, const char *label,
++ const u8 *seed, size_t seed_len, u8 *buf, size_t buf_len)
++{
++ /*(note: algorithm differs from hmac_prf_bits() and hmac_kdf() above)*/
++ /*(note: smaller code size instead of expanding hmac_sha1_vector()
++ * as is done in hmac_prf_bits(); not expecting large num of loops) */
++ u8 ctr;
++ u16 olen = host_to_be16(buf_len);
++ const u8 *addr[] = { buf, (u8 *)label, seed, (u8 *)&olen, &ctr };
++ size_t len[] = { 0, os_strlen(label)+1, seed_len, 2, 1 };
++
++ for (ctr = 1; buf_len >= SHA1_MAC_LEN; buf_len -= SHA1_MAC_LEN, ++ctr) {
++ if (hmac_sha1_vector(key, key_len, 5, addr, len, buf))
++ return -1;
++ addr[0] = buf;
++ buf += SHA1_MAC_LEN;
++ len[0] = SHA1_MAC_LEN; /*(include digest in subsequent rounds)*/
++ }
++
++ if (buf_len) {
++ u8 hash[SHA1_MAC_LEN];
++ if (hmac_sha1_vector(key, key_len, 5, addr, len, hash))
++ return -1;
++ os_memcpy(buf, hash, buf_len);
++ forced_memzero(hash, sizeof(hash));
++ }
++
++ return 0;
++}
++
++#endif /* CRYPTO_MBEDTLS_SHA1_T_PRF */
++
++#ifdef CRYPTO_MBEDTLS_FIPS186_2_PRF
++
++/* fips_prf_internal.c sha1-internal.c */
++
++/* used only by src/eap_common/eap_sim_common.c:eap_sim_prf()
++ * for eap_sim_derive_keys() and eap_sim_derive_keys_reauth()
++ * where xlen is 160 */
++
++int fips186_2_prf(const u8 *seed, size_t seed_len, u8 *x, size_t xlen)
++{
++ /* FIPS 186-2 + change notice 1 */
++
++ mbedtls_sha1_context ctx;
++ u8 * const xkey = ctx.MBEDTLS_PRIVATE(buffer);
++ u32 * const xstate = ctx.MBEDTLS_PRIVATE(state);
++ const u32 xstate_init[] =
++ { 0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0 };
++
++ mbedtls_sha1_init(&ctx);
++ os_memcpy(xkey, seed, seed_len < 64 ? seed_len : 64);
++
++ /* note: does not fill extra bytes if (xlen % 20) (SHA1_MAC_LEN) */
++ for (; xlen >= 20; xlen -= 20) {
++ /* XSEED_j = 0 */
++ /* XVAL = (XKEY + XSEED_j) mod 2^b */
++
++ /* w_i = G(t, XVAL) */
++ os_memcpy(xstate, xstate_init, sizeof(xstate_init));
++ mbedtls_internal_sha1_process(&ctx, xkey);
++
++ #if __BYTE_ORDER == __LITTLE_ENDIAN
++ xstate[0] = host_to_be32(xstate[0]);
++ xstate[1] = host_to_be32(xstate[1]);
++ xstate[2] = host_to_be32(xstate[2]);
++ xstate[3] = host_to_be32(xstate[3]);
++ xstate[4] = host_to_be32(xstate[4]);
++ #endif
++ os_memcpy(x, xstate, 20);
++ if (xlen == 20) /*(done; skip prep for next loop)*/
++ break;
++
++ /* XKEY = (1 + XKEY + w_i) mod 2^b */
++ for (u32 carry = 1, k = 20; k-- > 0; carry >>= 8)
++ xkey[k] = (carry += xkey[k] + x[k]) & 0xff;
++ x += 20;
++ /* x_j = w_0|w_1 (each pair of iterations through loop)*/
++ }
++
++ mbedtls_sha1_free(&ctx);
++ return 0;
++}
++
++#endif /* CRYPTO_MBEDTLS_FIPS186_2_PRF */
++
++#endif /* MBEDTLS_SHA1_C */
++
++
++#ifdef CRYPTO_MBEDTLS_DES_ENCRYPT
++#ifdef MBEDTLS_DES_C
++#include <mbedtls/des.h>
++int des_encrypt(const u8 *clear, const u8 *key, u8 *cypher)
++{
++ u8 pkey[8], next, tmp;
++ int i;
++
++ /* Add parity bits to the key */
++ next = 0;
++ for (i = 0; i < 7; i++) {
++ tmp = key[i];
++ pkey[i] = (tmp >> i) | next | 1;
++ next = tmp << (7 - i);
++ }
++ pkey[i] = next | 1;
++
++ mbedtls_des_context des;
++ mbedtls_des_init(&des);
++ int ret = mbedtls_des_setkey_enc(&des, pkey)
++ || mbedtls_des_crypt_ecb(&des, clear, cypher) ? -1 : 0;
++ mbedtls_des_free(&des);
++ return ret;
++}
++#else
++#include "des-internal.c"/* pull in hostap local implementation */
++#endif
++#endif
++
++
++#ifdef CRYPTO_MBEDTLS_PBKDF2_SHA1
++/* sha1-pbkdf2.c */
++#include <mbedtls/pkcs5.h>
++int pbkdf2_sha1(const char *passphrase, const u8 *ssid, size_t ssid_len,
++ int iterations, u8 *buf, size_t buflen)
++{
++ #if MBEDTLS_VERSION_NUMBER >= 0x03020200 /* mbedtls 3.2.2 */
++ return mbedtls_pkcs5_pbkdf2_hmac_ext(MBEDTLS_MD_SHA1,
++ (const u8 *)passphrase, os_strlen(passphrase),
++ ssid, ssid_len, iterations, 32, buf) ? -1 : 0;
++ #else
++ const mbedtls_md_info_t *md_info;
++ md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA1);
++ if (md_info == NULL)
++ return -1;
++ mbedtls_md_context_t ctx;
++ mbedtls_md_init(&ctx);
++ int ret = mbedtls_md_setup(&ctx, md_info, 1)
++ || mbedtls_pkcs5_pbkdf2_hmac(&ctx,
++ (const u8 *)passphrase, os_strlen(passphrase),
++ ssid, ssid_len, iterations, 32, buf) ? -1 : 0;
++ mbedtls_md_free(&ctx);
++ return ret;
++ #endif
++}
++#endif
++
++
++/*#include "aes.h"*/ /* prototypes also included in "crypto.h" */
++
++static void *aes_crypt_init_mode(const u8 *key, size_t len, int mode)
++{
++ if (TEST_FAIL())
++ return NULL;
++
++ mbedtls_aes_context *aes = os_malloc(sizeof(*aes));
++ if (!aes)
++ return NULL;
++
++ mbedtls_aes_init(aes);
++ if ((mode == MBEDTLS_AES_ENCRYPT
++ ? mbedtls_aes_setkey_enc(aes, key, len * 8)
++ : mbedtls_aes_setkey_dec(aes, key, len * 8)) == 0)
++ return aes;
++
++ mbedtls_aes_free(aes);
++ os_free(aes);
++ return NULL;
++}
++
++void *aes_encrypt_init(const u8 *key, size_t len)
++{
++ return aes_crypt_init_mode(key, len, MBEDTLS_AES_ENCRYPT);
++}
++
++int aes_encrypt(void *ctx, const u8 *plain, u8 *crypt)
++{
++ return mbedtls_aes_crypt_ecb(ctx, MBEDTLS_AES_ENCRYPT, plain, crypt);
++}
++
++void aes_encrypt_deinit(void *ctx)
++{
++ mbedtls_aes_free(ctx);
++ os_free(ctx);
++}
++
++void *aes_decrypt_init(const u8 *key, size_t len)
++{
++ return aes_crypt_init_mode(key, len, MBEDTLS_AES_DECRYPT);
++}
++
++int aes_decrypt(void *ctx, const u8 *crypt, u8 *plain)
++{
++ return mbedtls_aes_crypt_ecb(ctx, MBEDTLS_AES_DECRYPT, crypt, plain);
++}
++
++void aes_decrypt_deinit(void *ctx)
++{
++ mbedtls_aes_free(ctx);
++ os_free(ctx);
++}
++
++
++#include "aes_wrap.h"
++
++
++#ifdef MBEDTLS_NIST_KW_C
++
++#include <mbedtls/nist_kw.h>
++
++/* aes-wrap.c */
++int aes_wrap(const u8 *kek, size_t kek_len, int n, const u8 *plain, u8 *cipher)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ mbedtls_nist_kw_context ctx;
++ mbedtls_nist_kw_init(&ctx);
++ size_t olen;
++ int ret = mbedtls_nist_kw_setkey(&ctx, MBEDTLS_CIPHER_ID_AES,
++ kek, kek_len*8, 1)
++ || mbedtls_nist_kw_wrap(&ctx, MBEDTLS_KW_MODE_KW, plain, n*8,
++ cipher, &olen, (n+1)*8) ? -1 : 0;
++ mbedtls_nist_kw_free(&ctx);
++ return ret;
++}
++
++/* aes-unwrap.c */
++int aes_unwrap(const u8 *kek, size_t kek_len, int n, const u8 *cipher, u8 *plain)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ mbedtls_nist_kw_context ctx;
++ mbedtls_nist_kw_init(&ctx);
++ size_t olen;
++ int ret = mbedtls_nist_kw_setkey(&ctx, MBEDTLS_CIPHER_ID_AES,
++ kek, kek_len*8, 0)
++ || mbedtls_nist_kw_unwrap(&ctx, MBEDTLS_KW_MODE_KW, cipher,
++ (n+1)*8, plain, &olen, n*8) ? -1 : 0;
++ mbedtls_nist_kw_free(&ctx);
++ return ret;
++}
++
++#else
++
++#ifndef CRYPTO_MBEDTLS_CONFIG_FIPS
++#include "aes-wrap.c" /* pull in hostap local implementation */
++#include "aes-unwrap.c" /* pull in hostap local implementation */
++#endif
++
++#endif /* MBEDTLS_NIST_KW_C */
++
++
++#ifdef MBEDTLS_CMAC_C
++
++/* aes-omac1.c */
++
++#include <mbedtls/cmac.h>
++
++int omac1_aes_vector(
++ const u8 *key, size_t key_len, size_t num_elem, const u8 *addr[],
++ const size_t *len, u8 *mac)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ mbedtls_cipher_type_t cipher_type;
++ switch (key_len) {
++ case 16: cipher_type = MBEDTLS_CIPHER_AES_128_ECB; break;
++ case 24: cipher_type = MBEDTLS_CIPHER_AES_192_ECB; break;
++ case 32: cipher_type = MBEDTLS_CIPHER_AES_256_ECB; break;
++ default: return -1;
++ }
++ const mbedtls_cipher_info_t *cipher_info;
++ cipher_info = mbedtls_cipher_info_from_type(cipher_type);
++ if (cipher_info == NULL)
++ return -1;
++
++ mbedtls_cipher_context_t ctx;
++ mbedtls_cipher_init(&ctx);
++ int ret = -1;
++ if (mbedtls_cipher_setup(&ctx, cipher_info) == 0
++ && mbedtls_cipher_cmac_starts(&ctx, key, key_len*8) == 0) {
++ ret = 0;
++ for (size_t i = 0; i < num_elem && ret == 0; ++i)
++ ret = mbedtls_cipher_cmac_update(&ctx, addr[i], len[i]);
++ }
++ if (ret == 0)
++ ret = mbedtls_cipher_cmac_finish(&ctx, mac);
++ mbedtls_cipher_free(&ctx);
++ return ret ? -1 : 0;
++}
++
++int omac1_aes_128_vector(const u8 *key, size_t num_elem,
++ const u8 *addr[], const size_t *len,
++ u8 *mac)
++{
++ return omac1_aes_vector(key, 16, num_elem, addr, len, mac);
++}
++
++int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
++{
++ return omac1_aes_vector(key, 16, 1, &data, &data_len, mac);
++}
++
++int omac1_aes_256(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
++{
++ return omac1_aes_vector(key, 32, 1, &data, &data_len, mac);
++}
++
++#else
++
++#include "aes-omac1.c" /* pull in hostap local implementation */
++
++#ifndef MBEDTLS_AES_BLOCK_SIZE
++#define MBEDTLS_AES_BLOCK_SIZE 16
++#endif
++
++#endif /* MBEDTLS_CMAC_C */
++
++
++/* These interfaces can be inefficient when used in loops, as the overhead of
++ * initialization each call is large for each block input (e.g. 16 bytes) */
++
++
++/* aes-encblock.c */
++int aes_128_encrypt_block(const u8 *key, const u8 *in, u8 *out)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ mbedtls_aes_context aes;
++ mbedtls_aes_init(&aes);
++ int ret = mbedtls_aes_setkey_enc(&aes, key, 128)
++ || mbedtls_aes_crypt_ecb(&aes, MBEDTLS_AES_ENCRYPT, in, out)
++ ? -1
++ : 0;
++ mbedtls_aes_free(&aes);
++ return ret;
++}
++
++
++/* aes-ctr.c */
++int aes_ctr_encrypt(const u8 *key, size_t key_len, const u8 *nonce,
++ u8 *data, size_t data_len)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ unsigned char counter[MBEDTLS_AES_BLOCK_SIZE];
++ unsigned char stream_block[MBEDTLS_AES_BLOCK_SIZE];
++ os_memcpy(counter, nonce, MBEDTLS_AES_BLOCK_SIZE);/*(must be writable)*/
++
++ mbedtls_aes_context ctx;
++ mbedtls_aes_init(&ctx);
++ size_t nc_off = 0;
++ int ret = mbedtls_aes_setkey_enc(&ctx, key, key_len*8)
++ || mbedtls_aes_crypt_ctr(&ctx, data_len, &nc_off,
++ counter, stream_block,
++ data, data) ? -1 : 0;
++ forced_memzero(stream_block, sizeof(stream_block));
++ mbedtls_aes_free(&ctx);
++ return ret;
++}
++
++int aes_128_ctr_encrypt(const u8 *key, const u8 *nonce,
++ u8 *data, size_t data_len)
++{
++ return aes_ctr_encrypt(key, 16, nonce, data, data_len);
++}
++
++
++/* aes-cbc.c */
++static int aes_128_cbc_oper(const u8 *key, const u8 *iv,
++ u8 *data, size_t data_len, int mode)
++{
++ unsigned char ivec[MBEDTLS_AES_BLOCK_SIZE];
++ os_memcpy(ivec, iv, MBEDTLS_AES_BLOCK_SIZE); /*(must be writable)*/
++
++ mbedtls_aes_context ctx;
++ mbedtls_aes_init(&ctx);
++ int ret = (mode == MBEDTLS_AES_ENCRYPT
++ ? mbedtls_aes_setkey_enc(&ctx, key, 128)
++ : mbedtls_aes_setkey_dec(&ctx, key, 128))
++ || mbedtls_aes_crypt_cbc(&ctx, mode, data_len, ivec, data, data);
++ mbedtls_aes_free(&ctx);
++ return ret ? -1 : 0;
++}
++
++int aes_128_cbc_encrypt(const u8 *key, const u8 *iv, u8 *data, size_t data_len)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ return aes_128_cbc_oper(key, iv, data, data_len, MBEDTLS_AES_ENCRYPT);
++}
++
++int aes_128_cbc_decrypt(const u8 *key, const u8 *iv, u8 *data, size_t data_len)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ return aes_128_cbc_oper(key, iv, data, data_len, MBEDTLS_AES_DECRYPT);
++}
++
++
++/*
++ * Much of the following is documented in crypto.h as for CONFIG_TLS=internal
++ * but such comments are not accurate:
++ *
++ * "This function is only used with internal TLSv1 implementation
++ * (CONFIG_TLS=internal). If that is not used, the crypto wrapper does not need
++ * to implement this."
++ */
++
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_CIPHER
++
++#include <mbedtls/cipher.h>
++
++struct crypto_cipher
++{
++ mbedtls_cipher_context_t ctx_enc;
++ mbedtls_cipher_context_t ctx_dec;
++};
++
++struct crypto_cipher * crypto_cipher_init(enum crypto_cipher_alg alg,
++ const u8 *iv, const u8 *key,
++ size_t key_len)
++{
++ /* IKEv2 src/eap_common/ikev2_common.c:ikev2_{encr,decr}_encrypt()
++ * uses one of CRYPTO_CIPHER_ALG_AES or CRYPTO_CIPHER_ALG_3DES */
++
++ mbedtls_cipher_type_t cipher_type;
++ size_t iv_len;
++ switch (alg) {
++ #ifdef MBEDTLS_ARC4_C
++ #if 0
++ case CRYPTO_CIPHER_ALG_RC4:
++ cipher_type = MBEDTLS_CIPHER_ARC4_128;
++ iv_len = 0;
++ break;
++ #endif
++ #endif
++ #ifdef MBEDTLS_AES_C
++ case CRYPTO_CIPHER_ALG_AES:
++ if (key_len == 16) cipher_type = MBEDTLS_CIPHER_AES_128_CTR;
++ if (key_len == 24) cipher_type = MBEDTLS_CIPHER_AES_192_CTR;
++ if (key_len == 32) cipher_type = MBEDTLS_CIPHER_AES_256_CTR;
++ iv_len = 16;
++ break;
++ #endif
++ #ifdef MBEDTLS_DES_C
++ case CRYPTO_CIPHER_ALG_3DES:
++ cipher_type = MBEDTLS_CIPHER_DES_EDE3_CBC;
++ iv_len = 8;
++ break;
++ #if 0
++ case CRYPTO_CIPHER_ALG_DES:
++ cipher_type = MBEDTLS_CIPHER_DES_CBC;
++ iv_len = 8;
++ break;
++ #endif
++ #endif
++ default:
++ return NULL;
++ }
++
++ const mbedtls_cipher_info_t *cipher_info;
++ cipher_info = mbedtls_cipher_info_from_type(cipher_type);
++ if (cipher_info == NULL)
++ return NULL;
++
++ key_len *= 8; /* key_bitlen */
++ #if 0 /*(were key_bitlen not already available)*/
++ #if MBEDTLS_VERSION_NUMBER >= 0x03010000 /* mbedtls 3.1.0 */
++ key_len = mbedtls_cipher_info_get_key_bitlen(cipher_info);
++ #else
++ key_len = cipher_info->MBEDTLS_PRIVATE(key_bitlen);
++ #endif
++ #endif
++
++ #if 0 /*(were iv_len not known above, would need MBEDTLS_PRIVATE(iv_size))*/
++ iv_len = cipher_info->MBEDTLS_PRIVATE(iv_size);
++ #endif
++
++ struct crypto_cipher *ctx = os_malloc(sizeof(*ctx));
++ if (!ctx)
++ return NULL;
++
++ mbedtls_cipher_init(&ctx->ctx_enc);
++ mbedtls_cipher_init(&ctx->ctx_dec);
++ if ( mbedtls_cipher_setup(&ctx->ctx_enc,cipher_info) == 0
++ && mbedtls_cipher_setup(&ctx->ctx_dec,cipher_info) == 0
++ && mbedtls_cipher_setkey(&ctx->ctx_enc,key,key_len,MBEDTLS_ENCRYPT) == 0
++ && mbedtls_cipher_setkey(&ctx->ctx_dec,key,key_len,MBEDTLS_DECRYPT) == 0
++ && mbedtls_cipher_set_iv(&ctx->ctx_enc,iv,iv_len) == 0
++ && mbedtls_cipher_set_iv(&ctx->ctx_dec,iv,iv_len) == 0
++ && mbedtls_cipher_reset(&ctx->ctx_enc) == 0
++ && mbedtls_cipher_reset(&ctx->ctx_dec) == 0) {
++ return ctx;
++ }
++
++ mbedtls_cipher_free(&ctx->ctx_enc);
++ mbedtls_cipher_free(&ctx->ctx_dec);
++ os_free(ctx);
++ return NULL;
++}
++
++int crypto_cipher_encrypt(struct crypto_cipher *ctx,
++ const u8 *plain, u8 *crypt, size_t len)
++{
++ size_t olen = 0; /*(poor interface above; unknown size of u8 *crypt)*/
++ return (mbedtls_cipher_update(&ctx->ctx_enc, plain, len, crypt, &olen)
++ || mbedtls_cipher_finish(&ctx->ctx_enc, crypt + olen, &olen)) ? -1 : 0;
++}
++
++int crypto_cipher_decrypt(struct crypto_cipher *ctx,
++ const u8 *crypt, u8 *plain, size_t len)
++{
++ size_t olen = 0; /*(poor interface above; unknown size of u8 *plain)*/
++ return (mbedtls_cipher_update(&ctx->ctx_dec, crypt, len, plain, &olen)
++ || mbedtls_cipher_finish(&ctx->ctx_dec, plain + olen, &olen)) ? -1 : 0;
++}
++
++void crypto_cipher_deinit(struct crypto_cipher *ctx)
++{
++ mbedtls_cipher_free(&ctx->ctx_enc);
++ mbedtls_cipher_free(&ctx->ctx_dec);
++ os_free(ctx);
++}
++
++#endif /* CRYPTO_MBEDTLS_CRYPTO_CIPHER */
++
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_HASH
++
++struct crypto_hash * crypto_hash_init(enum crypto_hash_alg alg, const u8 *key,
++ size_t key_len)
++{
++ mbedtls_md_type_t md_type;
++ int is_hmac = 0;
++
++ switch (alg) {
++ #ifdef MBEDTLS_MD5_C
++ case CRYPTO_HASH_ALG_MD5:
++ md_type = MBEDTLS_MD_MD5;
++ break;
++ #endif
++ #ifdef MBEDTLS_SHA1_C
++ case CRYPTO_HASH_ALG_SHA1:
++ md_type = MBEDTLS_MD_SHA1;
++ break;
++ #endif
++ #ifdef MBEDTLS_MD5_C
++ case CRYPTO_HASH_ALG_HMAC_MD5:
++ md_type = MBEDTLS_MD_MD5;
++ is_hmac = 1;
++ break;
++ #endif
++ #ifdef MBEDTLS_SHA1_C
++ case CRYPTO_HASH_ALG_HMAC_SHA1:
++ md_type = MBEDTLS_MD_SHA1;
++ is_hmac = 1;
++ break;
++ #endif
++ #ifdef MBEDTLS_SHA256_C
++ case CRYPTO_HASH_ALG_SHA256:
++ md_type = MBEDTLS_MD_SHA256;
++ break;
++ case CRYPTO_HASH_ALG_HMAC_SHA256:
++ md_type = MBEDTLS_MD_SHA256;
++ is_hmac = 1;
++ break;
++ #endif
++ #ifdef MBEDTLS_SHA512_C
++ case CRYPTO_HASH_ALG_SHA384:
++ md_type = MBEDTLS_MD_SHA384;
++ break;
++ case CRYPTO_HASH_ALG_SHA512:
++ md_type = MBEDTLS_MD_SHA512;
++ break;
++ #endif
++ default:
++ return NULL;
++ }
++
++ const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(md_type);
++ if (!md_info)
++ return NULL;
++
++ mbedtls_md_context_t *mctx = os_malloc(sizeof(*mctx));
++ if (mctx == NULL)
++ return NULL;
++
++ mbedtls_md_init(mctx);
++ if (mbedtls_md_setup(mctx, md_info, is_hmac) != 0) {
++ os_free(mctx);
++ return NULL;
++ }
++
++ if (is_hmac)
++ mbedtls_md_hmac_starts(mctx, key, key_len);
++ else
++ mbedtls_md_starts(mctx);
++ return (struct crypto_hash *)((uintptr_t)mctx | is_hmac);
++}
++
++void crypto_hash_update(struct crypto_hash *ctx, const u8 *data, size_t len)
++{
++ mbedtls_md_context_t *mctx = (mbedtls_md_context_t*)((uintptr_t)ctx & ~1uL);
++ #if 0
++ /*(mbedtls_md_hmac_update() and mbedtls_md_update()
++ * make same modifications under the hood in mbedtls)*/
++ if ((uintptr_t)ctx & 1uL)
++ mbedtls_md_hmac_update(mctx, data, len);
++ else
++ #endif
++ mbedtls_md_update(mctx, data, len);
++}
++
++int crypto_hash_finish(struct crypto_hash *ctx, u8 *mac, size_t *len)
++{
++ mbedtls_md_context_t *mctx = (mbedtls_md_context_t*)((uintptr_t)ctx & ~1uL);
++ if (mac != NULL && len != NULL) { /*(NULL if caller just freeing context)*/
++ #if MBEDTLS_VERSION_NUMBER >= 0x03020000 /* mbedtls 3.2.0 */
++ const mbedtls_md_info_t *md_info = mbedtls_md_info_from_ctx(mctx);
++ #else
++ const mbedtls_md_info_t *md_info = mctx->MBEDTLS_PRIVATE(md_info);
++ #endif
++ size_t maclen = mbedtls_md_get_size(md_info);
++ if (*len < maclen) {
++ *len = maclen;
++ /*(note: ctx not freed; can call again with larger *len)*/
++ return -1;
++ }
++ *len = maclen;
++ if ((uintptr_t)ctx & 1uL)
++ mbedtls_md_hmac_finish(mctx, mac);
++ else
++ mbedtls_md_finish(mctx, mac);
++ }
++ mbedtls_md_free(mctx);
++ os_free(mctx);
++
++ if (TEST_FAIL())
++ return -1;
++
++ return 0;
++}
++
++#endif /* CRYPTO_MBEDTLS_CRYPTO_HASH */
++
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_BIGNUM
++
++#include <mbedtls/bignum.h>
++
++/* crypto.h bignum interfaces */
++
++struct crypto_bignum *crypto_bignum_init(void)
++{
++ if (TEST_FAIL())
++ return NULL;
++
++ mbedtls_mpi *bn = os_malloc(sizeof(*bn));
++ if (bn)
++ mbedtls_mpi_init(bn);
++ return (struct crypto_bignum *)bn;
++}
++
++struct crypto_bignum *crypto_bignum_init_set(const u8 *buf, size_t len)
++{
++ if (TEST_FAIL())
++ return NULL;
++
++ mbedtls_mpi *bn = os_malloc(sizeof(*bn));
++ if (bn) {
++ mbedtls_mpi_init(bn);
++ if (mbedtls_mpi_read_binary(bn, buf, len) == 0)
++ return (struct crypto_bignum *)bn;
++ }
++
++ os_free(bn);
++ return NULL;
++}
++
++struct crypto_bignum *crypto_bignum_init_uint(unsigned int val)
++{
++ if (TEST_FAIL())
++ return NULL;
++
++ #if 0 /*(hostap use of this interface passes int, not uint)*/
++ val = host_to_be32(val);
++ return crypto_bignum_init_set((const u8 *)&val, sizeof(val));
++ #else
++ mbedtls_mpi *bn = os_malloc(sizeof(*bn));
++ if (bn) {
++ mbedtls_mpi_init(bn);
++ if (mbedtls_mpi_lset(bn, (int)val) == 0)
++ return (struct crypto_bignum *)bn;
++ }
++
++ os_free(bn);
++ return NULL;
++ #endif
++}
++
++void crypto_bignum_deinit(struct crypto_bignum *n, int clear)
++{
++ mbedtls_mpi_free((mbedtls_mpi *)n);
++ os_free(n);
++}
++
++int crypto_bignum_to_bin(const struct crypto_bignum *a,
++ u8 *buf, size_t buflen, size_t padlen)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ size_t n = mbedtls_mpi_size((mbedtls_mpi *)a);
++ if (n < padlen)
++ n = padlen;
++ return n > buflen || mbedtls_mpi_write_binary((mbedtls_mpi *)a, buf, n)
++ ? -1
++ : (int)(n);
++}
++
++int crypto_bignum_rand(struct crypto_bignum *r, const struct crypto_bignum *m)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ /*assert(r != m);*//* r must not be same as m for mbedtls_mpi_random()*/
++ #if MBEDTLS_VERSION_NUMBER >= 0x021B0000 /* mbedtls 2.27.0 */
++ return mbedtls_mpi_random((mbedtls_mpi *)r, 0, (mbedtls_mpi *)m,
++ mbedtls_ctr_drbg_random,
++ crypto_mbedtls_ctr_drbg()) ? -1 : 0;
++ #else
++ /* (needed by EAP_PWD, SAE, DPP) */
++ wpa_printf(MSG_ERROR,
++ "mbedtls 2.27.0 or later required for mbedtls_mpi_random()");
++ return -1;
++ #endif
++}
++
++int crypto_bignum_add(const struct crypto_bignum *a,
++ const struct crypto_bignum *b,
++ struct crypto_bignum *c)
++{
++ return mbedtls_mpi_add_mpi((mbedtls_mpi *)c,
++ (const mbedtls_mpi *)a,
++ (const mbedtls_mpi *)b) ? -1 : 0;
++}
++
++int crypto_bignum_mod(const struct crypto_bignum *a,
++ const struct crypto_bignum *b,
++ struct crypto_bignum *c)
++{
++ return mbedtls_mpi_mod_mpi((mbedtls_mpi *)c,
++ (const mbedtls_mpi *)a,
++ (const mbedtls_mpi *)b) ? -1 : 0;
++}
++
++int crypto_bignum_exptmod(const struct crypto_bignum *a,
++ const struct crypto_bignum *b,
++ const struct crypto_bignum *c,
++ struct crypto_bignum *d)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ /* (check if input params match d; d is the result) */
++ /* (a == d) is ok in current mbedtls implementation */
++ if (b == d || c == d) { /*(not ok; store result in intermediate)*/
++ mbedtls_mpi R;
++ mbedtls_mpi_init(&R);
++ int rc = mbedtls_mpi_exp_mod(&R,
++ (const mbedtls_mpi *)a,
++ (const mbedtls_mpi *)b,
++ (const mbedtls_mpi *)c,
++ NULL)
++ || mbedtls_mpi_copy((mbedtls_mpi *)d, &R) ? -1 : 0;
++ mbedtls_mpi_free(&R);
++ return rc;
++ }
++ else {
++ return mbedtls_mpi_exp_mod((mbedtls_mpi *)d,
++ (const mbedtls_mpi *)a,
++ (const mbedtls_mpi *)b,
++ (const mbedtls_mpi *)c,
++ NULL) ? -1 : 0;
++ }
++}
++
++int crypto_bignum_inverse(const struct crypto_bignum *a,
++ const struct crypto_bignum *b,
++ struct crypto_bignum *c)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ return mbedtls_mpi_inv_mod((mbedtls_mpi *)c,
++ (const mbedtls_mpi *)a,
++ (const mbedtls_mpi *)b) ? -1 : 0;
++}
++
++int crypto_bignum_sub(const struct crypto_bignum *a,
++ const struct crypto_bignum *b,
++ struct crypto_bignum *c)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ return mbedtls_mpi_sub_mpi((mbedtls_mpi *)c,
++ (const mbedtls_mpi *)a,
++ (const mbedtls_mpi *)b) ? -1 : 0;
++}
++
++int crypto_bignum_div(const struct crypto_bignum *a,
++ const struct crypto_bignum *b,
++ struct crypto_bignum *c)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ /*(most current use of this crypto.h interface has a == c (result),
++ * so store result in an intermediate to avoid overwritten input)*/
++ mbedtls_mpi R;
++ mbedtls_mpi_init(&R);
++ int rc = mbedtls_mpi_div_mpi(&R, NULL,
++ (const mbedtls_mpi *)a,
++ (const mbedtls_mpi *)b)
++ || mbedtls_mpi_copy((mbedtls_mpi *)c, &R) ? -1 : 0;
++ mbedtls_mpi_free(&R);
++ return rc;
++}
++
++int crypto_bignum_addmod(const struct crypto_bignum *a,
++ const struct crypto_bignum *b,
++ const struct crypto_bignum *c,
++ struct crypto_bignum *d)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ return mbedtls_mpi_add_mpi((mbedtls_mpi *)d,
++ (const mbedtls_mpi *)a,
++ (const mbedtls_mpi *)b)
++ || mbedtls_mpi_mod_mpi((mbedtls_mpi *)d,
++ (mbedtls_mpi *)d,
++ (const mbedtls_mpi *)c) ? -1 : 0;
++}
++
++int crypto_bignum_mulmod(const struct crypto_bignum *a,
++ const struct crypto_bignum *b,
++ const struct crypto_bignum *c,
++ struct crypto_bignum *d)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ return mbedtls_mpi_mul_mpi((mbedtls_mpi *)d,
++ (const mbedtls_mpi *)a,
++ (const mbedtls_mpi *)b)
++ || mbedtls_mpi_mod_mpi((mbedtls_mpi *)d,
++ (mbedtls_mpi *)d,
++ (const mbedtls_mpi *)c) ? -1 : 0;
++}
++
++int crypto_bignum_sqrmod(const struct crypto_bignum *a,
++ const struct crypto_bignum *b,
++ struct crypto_bignum *c)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ #if 1
++ return crypto_bignum_mulmod(a, a, b, c);
++ #else
++ mbedtls_mpi bn;
++ mbedtls_mpi_init(&bn);
++ if (mbedtls_mpi_lset(&bn, 2)) /* alt?: mbedtls_mpi_set_bit(&bn, 1) */
++ return -1;
++ int ret = mbedtls_mpi_exp_mod((mbedtls_mpi *)c,
++ (const mbedtls_mpi *)a, &bn,
++ (const mbedtls_mpi *)b, NULL) ? -1 : 0;
++ mbedtls_mpi_free(&bn);
++ return ret;
++ #endif
++}
++
++int crypto_bignum_rshift(const struct crypto_bignum *a, int n,
++ struct crypto_bignum *r)
++{
++ return mbedtls_mpi_copy((mbedtls_mpi *)r, (const mbedtls_mpi *)a)
++ || mbedtls_mpi_shift_r((mbedtls_mpi *)r, n) ? -1 : 0;
++}
++
++int crypto_bignum_cmp(const struct crypto_bignum *a,
++ const struct crypto_bignum *b)
++{
++ return mbedtls_mpi_cmp_mpi((const mbedtls_mpi *)a, (const mbedtls_mpi *)b);
++}
++
++int crypto_bignum_is_zero(const struct crypto_bignum *a)
++{
++ /* XXX: src/common/sae.c:sswu() contains comment:
++ * "TODO: Make sure crypto_bignum_is_zero() is constant time"
++ * Note: mbedtls_mpi_cmp_int() *is not* constant time */
++ return (mbedtls_mpi_cmp_int((const mbedtls_mpi *)a, 0) == 0);
++}
++
++int crypto_bignum_is_one(const struct crypto_bignum *a)
++{
++ return (mbedtls_mpi_cmp_int((const mbedtls_mpi *)a, 1) == 0);
++}
++
++int crypto_bignum_is_odd(const struct crypto_bignum *a)
++{
++ return mbedtls_mpi_get_bit((const mbedtls_mpi *)a, 0);
++}
++
++#include "utils/const_time.h"
++int crypto_bignum_legendre(const struct crypto_bignum *a,
++ const struct crypto_bignum *p)
++{
++ if (TEST_FAIL())
++ return -2;
++
++ /* Security Note:
++ * mbedtls_mpi_exp_mod() is not documented to run in constant time,
++ * though mbedtls/library/bignum.c uses constant_time_internal.h funcs.
++ * Compare to crypto_openssl.c:crypto_bignum_legendre()
++ * which uses openssl BN_mod_exp_mont_consttime()
++ * mbedtls/library/ecp.c has further countermeasures to timing attacks,
++ * (but ecp.c funcs are not used here) */
++
++ mbedtls_mpi exp, tmp;
++ mbedtls_mpi_init(&exp);
++ mbedtls_mpi_init(&tmp);
++
++ /* exp = (p-1) / 2 */
++ int res;
++ if (mbedtls_mpi_sub_int(&exp, (const mbedtls_mpi *)p, 1) == 0
++ && mbedtls_mpi_shift_r(&exp, 1) == 0
++ && mbedtls_mpi_exp_mod(&tmp, (const mbedtls_mpi *)a, &exp,
++ (const mbedtls_mpi *)p, NULL) == 0) {
++ /*(modified from crypto_openssl.c:crypto_bignum_legendre())*/
++ /* Return 1 if tmp == 1, 0 if tmp == 0, or -1 otherwise. Need
++ * to use constant time selection to avoid branches here. */
++ unsigned int mask;
++ res = -1;
++ mask = const_time_eq((mbedtls_mpi_cmp_int(&tmp, 1) == 0), 1);
++ res = const_time_select_int(mask, 1, res);
++ mask = const_time_eq((mbedtls_mpi_cmp_int(&tmp, 0) == 0), 1);
++ res = const_time_select_int(mask, 0, res);
++ } else {
++ res = -2;
++ }
++
++ mbedtls_mpi_free(&tmp);
++ mbedtls_mpi_free(&exp);
++ return res;
++}
++
++#endif /* CRYPTO_MBEDTLS_CRYPTO_BIGNUM */
++
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_DH
++
++/* crypto_internal-modexp.c */
++
++#include <mbedtls/bignum.h>
++#include <mbedtls/dhm.h>
++
++#if 0 /* crypto_dh_init() and crypto_dh_derive_secret() prefer to use mbedtls */
++int crypto_mod_exp(const u8 *base, size_t base_len,
++ const u8 *power, size_t power_len,
++ const u8 *modulus, size_t modulus_len,
++ u8 *result, size_t *result_len)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ mbedtls_mpi bn_base, bn_exp, bn_modulus, bn_result;
++ mbedtls_mpi_init(&bn_base);
++ mbedtls_mpi_init(&bn_exp);
++ mbedtls_mpi_init(&bn_modulus);
++ mbedtls_mpi_init(&bn_result);
++
++ size_t len;
++ int ret = mbedtls_mpi_read_binary(&bn_base, base, base_len)
++ || mbedtls_mpi_read_binary(&bn_exp, power, power_len)
++ || mbedtls_mpi_read_binary(&bn_modulus, modulus, modulus_len)
++ || mbedtls_mpi_exp_mod(&bn_result,&bn_base,&bn_exp,&bn_modulus,NULL)
++ || (len = mbedtls_mpi_size(&bn_result)) > *result_len
++ || mbedtls_mpi_write_binary(&bn_result, result, (*result_len = len))
++ ? -1
++ : 0;
++
++ mbedtls_mpi_free(&bn_base);
++ mbedtls_mpi_free(&bn_exp);
++ mbedtls_mpi_free(&bn_modulus);
++ mbedtls_mpi_free(&bn_result);
++ return ret;
++}
++#endif
++
++static int crypto_mbedtls_dh_set_bin_pg(mbedtls_dhm_context *ctx, u8 generator,
++ const u8 *prime, size_t prime_len)
++{
++ /*(could set these directly in MBEDTLS_PRIVATE members)*/
++ mbedtls_mpi P, G;
++ mbedtls_mpi_init(&P);
++ mbedtls_mpi_init(&G);
++ int ret = mbedtls_mpi_lset(&G, generator)
++ || mbedtls_mpi_read_binary(&P, prime, prime_len)
++ || mbedtls_dhm_set_group(ctx, &P, &G);
++ mbedtls_mpi_free(&P);
++ mbedtls_mpi_free(&G);
++ return ret;
++}
++
++__attribute_noinline__
++static int crypto_mbedtls_dh_init_public(mbedtls_dhm_context *ctx, u8 generator,
++ const u8 *prime, size_t prime_len,
++ u8 *privkey, u8 *pubkey)
++{
++ if (crypto_mbedtls_dh_set_bin_pg(ctx, generator, prime, prime_len)
++ || mbedtls_dhm_make_public(ctx, (int)prime_len, pubkey, prime_len,
++ mbedtls_ctr_drbg_random,
++ crypto_mbedtls_ctr_drbg()))
++ return -1;
++
++ /*(enable later when upstream mbedtls interface changes require)*/
++ #if 0 && MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
++ mbedtls_mpi X;
++ mbedtls_mpi_init(&X);
++ int ret = mbedtls_dhm_get_value(ctx, MBEDTLS_DHM_PARAM_X, &X)
++ || mbedtls_mpi_write_binary(&X, privkey, prime_len) ? -1 : 0;
++ mbedtls_mpi_free(&X);
++ return ret;
++ #else
++ return mbedtls_mpi_write_binary(&ctx->MBEDTLS_PRIVATE(X),
++ privkey, prime_len) ? -1 : 0;
++ #endif
++}
++
++int crypto_dh_init(u8 generator, const u8 *prime, size_t prime_len, u8 *privkey,
++ u8 *pubkey)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ #if 0 /*(crypto_dh_init() duplicated (and identical) in crypto_*.c modules)*/
++ size_t pubkey_len, pad;
++
++ if (os_get_random(privkey, prime_len) < 0)
++ return -1;
++ if (os_memcmp(privkey, prime, prime_len) > 0) {
++ /* Make sure private value is smaller than prime */
++ privkey[0] = 0;
++ }
++
++ pubkey_len = prime_len;
++ if (crypto_mod_exp(&generator, 1, privkey, prime_len, prime, prime_len,
++ pubkey, &pubkey_len) < 0)
++ return -1;
++ if (pubkey_len < prime_len) {
++ pad = prime_len - pubkey_len;
++ os_memmove(pubkey + pad, pubkey, pubkey_len);
++ os_memset(pubkey, 0, pad);
++ }
++
++ return 0;
++ #else
++ /* Prefer to use mbedtls to derive our public/private key, as doing so
++ * leverages mbedtls to properly format output and to perform blinding*/
++ mbedtls_dhm_context ctx;
++ mbedtls_dhm_init(&ctx);
++ int ret = crypto_mbedtls_dh_init_public(&ctx, generator, prime,
++ prime_len, privkey, pubkey);
++ mbedtls_dhm_free(&ctx);
++ return ret;
++ #endif
++}
++
++/*(crypto_dh_derive_secret() could be implemented using crypto.h APIs
++ * instead of being reimplemented in each crypto_*.c)*/
++int crypto_dh_derive_secret(u8 generator, const u8 *prime, size_t prime_len,
++ const u8 *order, size_t order_len,
++ const u8 *privkey, size_t privkey_len,
++ const u8 *pubkey, size_t pubkey_len,
++ u8 *secret, size_t *len)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ #if 0
++ if (pubkey_len > prime_len ||
++ (pubkey_len == prime_len &&
++ os_memcmp(pubkey, prime, prime_len) >= 0))
++ return -1;
++
++ int res = 0;
++ mbedtls_mpi pub;
++ mbedtls_mpi_init(&pub);
++ if (mbedtls_mpi_read_binary(&pub, pubkey, pubkey_len)
++ || mbedtls_mpi_cmp_int(&pub, 1) <= 0) {
++ res = -1;
++ } else if (order) {
++ mbedtls_mpi p, q, tmp;
++ mbedtls_mpi_init(&p);
++ mbedtls_mpi_init(&q);
++ mbedtls_mpi_init(&tmp);
++
++ /* verify: pubkey^q == 1 mod p */
++ res = (mbedtls_mpi_read_binary(&p, prime, prime_len)
++ || mbedtls_mpi_read_binary(&q, order, order_len)
++ || mbedtls_mpi_exp_mod(&tmp, &pub, &q, &p, NULL)
++ || mbedtls_mpi_cmp_int(&tmp, 1) != 0);
++
++ mbedtls_mpi_free(&p);
++ mbedtls_mpi_free(&q);
++ mbedtls_mpi_free(&tmp);
++ }
++ mbedtls_mpi_free(&pub);
++
++ return (res == 0)
++ ? crypto_mod_exp(pubkey, pubkey_len, privkey, privkey_len,
++ prime, prime_len, secret, len)
++ : -1;
++ #else
++ /* Prefer to use mbedtls to derive DH shared secret, as doing so
++ * leverages mbedtls to validate params and to perform blinding.
++ *
++ * Attempt to reconstitute DH context to derive shared secret
++ * (due to limitations of the interface, which ought to pass context).
++ * Force provided G (our private key) into context without validation.
++ * Regenerating GX (our public key) not needed to derive shared secret.
++ */
++ /*(older compilers might not support VLAs)*/
++ /*unsigned char buf[2+prime_len+2+1+2+pubkey_len];*/
++ unsigned char buf[2+MBEDTLS_MPI_MAX_SIZE+2+1+2+MBEDTLS_MPI_MAX_SIZE];
++ unsigned char *p = buf + 2 + prime_len;
++ if (2+prime_len+2+1+2+pubkey_len > sizeof(buf))
++ return -1;
++ WPA_PUT_BE16(buf, prime_len); /*(2-byte big-endian size of prime)*/
++ p[0] = 0; /*(2-byte big-endian size of generator)*/
++ p[1] = 1;
++ p[2] = generator;
++ WPA_PUT_BE16(p+3, pubkey_len); /*(2-byte big-endian size of pubkey)*/
++ os_memcpy(p+5, pubkey, pubkey_len);
++ os_memcpy(buf+2, prime, prime_len);
++
++ mbedtls_dhm_context ctx;
++ mbedtls_dhm_init(&ctx);
++ p = buf;
++ int ret = mbedtls_dhm_read_params(&ctx, &p, p+2+prime_len+5+pubkey_len)
++ || mbedtls_mpi_read_binary(&ctx.MBEDTLS_PRIVATE(X),
++ privkey, privkey_len)
++ || mbedtls_dhm_calc_secret(&ctx, secret, *len, len,
++ mbedtls_ctr_drbg_random,
++ crypto_mbedtls_ctr_drbg()) ? -1 : 0;
++ mbedtls_dhm_free(&ctx);
++ return ret;
++ #endif
++}
++
++/* dh_group5.c */
++
++#include "dh_group5.h"
++
++/* RFC3526_PRIME_1536[] and RFC3526_GENERATOR_1536[] from crypto_wolfssl.c */
++
++static const unsigned char RFC3526_PRIME_1536[] = {
++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2,
++ 0x21, 0x68, 0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
++ 0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74, 0x02, 0x0B, 0xBE, 0xA6,
++ 0x3B, 0x13, 0x9B, 0x22, 0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD,
++ 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B, 0x30, 0x2B, 0x0A, 0x6D,
++ 0xF2, 0x5F, 0x14, 0x37, 0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45,
++ 0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6, 0xF4, 0x4C, 0x42, 0xE9,
++ 0xA6, 0x37, 0xED, 0x6B, 0x0B, 0xFF, 0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED,
++ 0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5, 0xAE, 0x9F, 0x24, 0x11,
++ 0x7C, 0x4B, 0x1F, 0xE6, 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE4, 0x5B, 0x3D,
++ 0xC2, 0x00, 0x7C, 0xB8, 0xA1, 0x63, 0xBF, 0x05, 0x98, 0xDA, 0x48, 0x36,
++ 0x1C, 0x55, 0xD3, 0x9A, 0x69, 0x16, 0x3F, 0xA8, 0xFD, 0x24, 0xCF, 0x5F,
++ 0x83, 0x65, 0x5D, 0x23, 0xDC, 0xA3, 0xAD, 0x96, 0x1C, 0x62, 0xF3, 0x56,
++ 0x20, 0x85, 0x52, 0xBB, 0x9E, 0xD5, 0x29, 0x07, 0x70, 0x96, 0x96, 0x6D,
++ 0x67, 0x0C, 0x35, 0x4E, 0x4A, 0xBC, 0x98, 0x04, 0xF1, 0x74, 0x6C, 0x08,
++ 0xCA, 0x23, 0x73, 0x27, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
++};
++
++static const unsigned char RFC3526_GENERATOR_1536[] = {
++ 0x02
++};
++
++void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
++{
++ const unsigned char * const prime = RFC3526_PRIME_1536;
++ const size_t prime_len = sizeof(RFC3526_PRIME_1536);
++ const u8 generator = *RFC3526_GENERATOR_1536;
++ struct wpabuf *wpubl = NULL, *wpriv = NULL;
++
++ mbedtls_dhm_context *ctx = os_malloc(sizeof(*ctx));
++ if (ctx == NULL)
++ return NULL;
++ mbedtls_dhm_init(ctx);
++
++ if ( (wpubl = wpabuf_alloc(prime_len))
++ && (wpriv = wpabuf_alloc(prime_len))
++ && crypto_mbedtls_dh_init_public(ctx, generator, prime, prime_len,
++ wpabuf_put(wpriv, prime_len),
++ wpabuf_put(wpubl, prime_len))==0) {
++ wpabuf_free(*publ);
++ wpabuf_clear_free(*priv);
++ *publ = wpubl;
++ *priv = wpriv;
++ return ctx;
++ }
++
++ wpabuf_clear_free(wpriv);
++ wpabuf_free(wpubl);
++ mbedtls_dhm_free(ctx);
++ os_free(ctx);
++ return NULL;
++}
++
++#ifdef CRYPTO_MBEDTLS_DH5_INIT_FIXED
++void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
++{
++ const unsigned char * const prime = RFC3526_PRIME_1536;
++ const size_t prime_len = sizeof(RFC3526_PRIME_1536);
++ const u8 generator = *RFC3526_GENERATOR_1536;
++
++ mbedtls_dhm_context *ctx = os_malloc(sizeof(*ctx));
++ if (ctx == NULL)
++ return NULL;
++ mbedtls_dhm_init(ctx);
++
++ if (crypto_mbedtls_dh_set_bin_pg(ctx, generator, prime, prime_len)==0
++ #if 0 /*(ignore; not required to derive shared secret)*/
++ && mbedtls_mpi_read_binary(&ctx->MBEDTLS_PRIVATE(GX),
++ wpabuf_head(publ),wpabuf_len(publ))==0
++ #endif
++ && mbedtls_mpi_read_binary(&ctx->MBEDTLS_PRIVATE(X),
++ wpabuf_head(priv),wpabuf_len(priv))==0) {
++ return ctx;
++ }
++
++ mbedtls_dhm_free(ctx);
++ os_free(ctx);
++ return NULL;
++}
++#endif
++
++struct wpabuf * dh5_derive_shared(void *ctx, const struct wpabuf *peer_public,
++ const struct wpabuf *own_private)
++{
++ /*((mbedtls_dhm_context *)ctx must already contain own_private)*/
++ /* mbedtls 2.x: prime_len = ctx->len; */
++ /* mbedtls 3.x: prime_len = mbedtls_dhm_get_len(ctx); */
++ size_t olen = sizeof(RFC3526_PRIME_1536); /*(sizeof(); prime known)*/
++ struct wpabuf *buf = wpabuf_alloc(olen);
++ if (buf == NULL)
++ return NULL;
++ if (mbedtls_dhm_read_public((mbedtls_dhm_context *)ctx,
++ wpabuf_head(peer_public),
++ wpabuf_len(peer_public)) == 0
++ && mbedtls_dhm_calc_secret(ctx, wpabuf_mhead(buf), olen, &olen,
++ mbedtls_ctr_drbg_random,
++ crypto_mbedtls_ctr_drbg()) == 0) {
++ wpabuf_put(buf, olen);
++ return buf;
++ }
++
++ wpabuf_free(buf);
++ return NULL;
++}
++
++void dh5_free(void *ctx)
++{
++ mbedtls_dhm_free(ctx);
++ os_free(ctx);
++}
++
++#endif /* CRYPTO_MBEDTLS_CRYPTO_DH */
++
++
++#if defined(CRYPTO_MBEDTLS_CRYPTO_ECDH) || defined(CRYPTO_MBEDTLS_CRYPTO_EC)
++
++#include <mbedtls/ecp.h>
++
++#define CRYPTO_EC_pbits(e) (((mbedtls_ecp_group *)(e))->pbits)
++#define CRYPTO_EC_plen(e) ((((mbedtls_ecp_group *)(e))->pbits+7)>>3)
++#define CRYPTO_EC_P(e) (&((mbedtls_ecp_group *)(e))->P)
++#define CRYPTO_EC_N(e) (&((mbedtls_ecp_group *)(e))->N)
++#define CRYPTO_EC_A(e) (&((mbedtls_ecp_group *)(e))->A)
++#define CRYPTO_EC_B(e) (&((mbedtls_ecp_group *)(e))->B)
++#define CRYPTO_EC_G(e) (&((mbedtls_ecp_group *)(e))->G)
++
++static mbedtls_ecp_group_id crypto_mbedtls_ecp_group_id_from_ike_id(int group)
++{
++ /* https://www.iana.org/assignments/ikev2-parameters/ikev2-parameters.xhtml */
++ switch (group) {
++ #ifdef MBEDTLS_ECP_DP_SECP256R1_ENABLED
++ case 19: return MBEDTLS_ECP_DP_SECP256R1;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_SECP384R1_ENABLED
++ case 20: return MBEDTLS_ECP_DP_SECP384R1;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_SECP521R1_ENABLED
++ case 21: return MBEDTLS_ECP_DP_SECP521R1;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_SECP192R1_ENABLED
++ case 25: return MBEDTLS_ECP_DP_SECP192R1;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_SECP224R1_ENABLED
++ case 26: return MBEDTLS_ECP_DP_SECP224R1;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_BP256R1_ENABLED
++ case 28: return MBEDTLS_ECP_DP_BP256R1;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_BP384R1_ENABLED
++ case 29: return MBEDTLS_ECP_DP_BP384R1;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_BP512R1_ENABLED
++ case 30: return MBEDTLS_ECP_DP_BP512R1;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_CURVE25519_ENABLED
++ case 31: return MBEDTLS_ECP_DP_CURVE25519;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_CURVE448_ENABLED
++ case 32: return MBEDTLS_ECP_DP_CURVE448;
++ #endif
++ default: return MBEDTLS_ECP_DP_NONE;
++ }
++}
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_EC
++static int crypto_mbedtls_ike_id_from_ecp_group_id(mbedtls_ecp_group_id grp_id)
++{
++ /* https://www.iana.org/assignments/ikev2-parameters/ikev2-parameters.xhtml */
++ /*(for crypto_ec_key_group())*/
++ switch (grp_id) {
++ #ifdef MBEDTLS_ECP_DP_SECP256R1_ENABLED
++ case MBEDTLS_ECP_DP_SECP256R1: return 19;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_SECP384R1_ENABLED
++ case MBEDTLS_ECP_DP_SECP384R1: return 20;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_SECP521R1_ENABLED
++ case MBEDTLS_ECP_DP_SECP521R1: return 21;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_SECP192R1_ENABLED
++ case MBEDTLS_ECP_DP_SECP192R1: return 25;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_SECP224R1_ENABLED
++ case MBEDTLS_ECP_DP_SECP224R1: return 26;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_BP256R1_ENABLED
++ case MBEDTLS_ECP_DP_BP256R1: return 28;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_BP384R1_ENABLED
++ case MBEDTLS_ECP_DP_BP384R1: return 29;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_BP512R1_ENABLED
++ case MBEDTLS_ECP_DP_BP512R1: return 30;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_CURVE25519_ENABLED
++ case MBEDTLS_ECP_DP_CURVE25519: return 31;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_CURVE448_ENABLED
++ case MBEDTLS_ECP_DP_CURVE448: return 32;
++ #endif
++ default: return -1;
++ }
++}
++#endif
++
++#endif /* CRYPTO_MBEDTLS_CRYPTO_ECDH || CRYPTO_MBEDTLS_CRYPTO_EC */
++
++
++#if defined(CRYPTO_MBEDTLS_CRYPTO_ECDH) || defined(CRYPTO_MBEDTLS_CRYPTO_EC_DPP)
++
++#include <mbedtls/ecp.h>
++#include <mbedtls/pk.h>
++
++static int crypto_mbedtls_keypair_gen(int group, mbedtls_pk_context *pk)
++{
++ mbedtls_ecp_group_id grp_id =
++ crypto_mbedtls_ecp_group_id_from_ike_id(group);
++ if (grp_id == MBEDTLS_ECP_DP_NONE)
++ return -1;
++ const mbedtls_pk_info_t *pk_info =
++ mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY);
++ if (pk_info == NULL)
++ return -1;
++ return mbedtls_pk_setup(pk, pk_info)
++ || mbedtls_ecp_gen_key(grp_id, mbedtls_pk_ec(*pk),
++ mbedtls_ctr_drbg_random,
++ crypto_mbedtls_ctr_drbg()) ? -1 : 0;
++}
++
++#endif
++
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_ECDH
++
++#include <mbedtls/ecdh.h>
++#include <mbedtls/ecdsa.h>
++#include <mbedtls/ecp.h>
++#include <mbedtls/pk.h>
++
++/* wrap mbedtls_ecdh_context for more future-proof direct access to components
++ * (mbedtls_ecdh_context internal implementation may change between releases)
++ *
++ * If mbedtls_pk_context -- specifically underlying mbedtls_ecp_keypair --
++ * lifetime were guaranteed to be longer than that of mbedtls_ecdh_context,
++ * then mbedtls_pk_context or mbedtls_ecp_keypair could be stored in crypto_ecdh
++ * (or crypto_ec_key could be stored in crypto_ecdh, and crypto_ec_key could
++ * wrap mbedtls_ecp_keypair and components, to avoid MBEDTLS_PRIVATE access) */
++struct crypto_ecdh {
++ mbedtls_ecdh_context ctx;
++ mbedtls_ecp_group grp;
++ mbedtls_ecp_point Q;
++};
++
++struct crypto_ecdh * crypto_ecdh_init(int group)
++{
++ mbedtls_pk_context pk;
++ mbedtls_pk_init(&pk);
++ struct crypto_ecdh *ecdh = crypto_mbedtls_keypair_gen(group, &pk) == 0
++ ? crypto_ecdh_init2(group, (struct crypto_ec_key *)&pk)
++ : NULL;
++ mbedtls_pk_free(&pk);
++ return ecdh;
++}
++
++struct crypto_ecdh * crypto_ecdh_init2(int group,
++ struct crypto_ec_key *own_key)
++{
++ mbedtls_ecp_group_id grp_id =
++ crypto_mbedtls_ecp_group_id_from_ike_id(group);
++ if (grp_id == MBEDTLS_ECP_DP_NONE)
++ return NULL;
++ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*(mbedtls_pk_context *)own_key);
++ struct crypto_ecdh *ecdh = os_malloc(sizeof(*ecdh));
++ if (ecdh == NULL)
++ return NULL;
++ mbedtls_ecdh_init(&ecdh->ctx);
++ mbedtls_ecp_group_init(&ecdh->grp);
++ mbedtls_ecp_point_init(&ecdh->Q);
++ if (mbedtls_ecdh_setup(&ecdh->ctx, grp_id) == 0
++ && mbedtls_ecdh_get_params(&ecdh->ctx,ecp_kp,MBEDTLS_ECDH_OURS) == 0) {
++ /* copy grp and Q for later use
++ * (retrieving this info later is more convoluted
++ * even if mbedtls_ecdh_make_public() is considered)*/
++ #if MBEDTLS_VERSION_NUMBER >= 0x03020000 /* mbedtls 3.2.0 */
++ mbedtls_mpi d;
++ mbedtls_mpi_init(&d);
++ if (mbedtls_ecp_export(ecp_kp, &ecdh->grp, &d, &ecdh->Q) == 0) {
++ mbedtls_mpi_free(&d);
++ return ecdh;
++ }
++ mbedtls_mpi_free(&d);
++ #else
++ if (mbedtls_ecp_group_load(&ecdh->grp, grp_id) == 0
++ && mbedtls_ecp_copy(&ecdh->Q, &ecp_kp->MBEDTLS_PRIVATE(Q)) == 0)
++ return ecdh;
++ #endif
++ }
++
++ mbedtls_ecp_point_free(&ecdh->Q);
++ mbedtls_ecp_group_free(&ecdh->grp);
++ mbedtls_ecdh_free(&ecdh->ctx);
++ os_free(ecdh);
++ return NULL;
++}
++
++struct wpabuf * crypto_ecdh_get_pubkey(struct crypto_ecdh *ecdh, int inc_y)
++{
++ mbedtls_ecp_group *grp = &ecdh->grp;
++ size_t prime_len = CRYPTO_EC_plen(grp);
++ size_t output_len = prime_len;
++ u8 output_offset = 0;
++ u8 buf[256];
++
++ #ifdef MBEDTLS_ECP_MONTGOMERY_ENABLED
++ /* len */
++ #endif
++ #ifdef MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED
++ if (mbedtls_ecp_get_type(grp) == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS) {
++ output_len = inc_y ? prime_len * 2 + 1 : prime_len + 1;
++ output_offset = 1;
++ }
++ #endif
++
++ if (output_len > sizeof(buf))
++ return NULL;
++
++ inc_y = inc_y ? MBEDTLS_ECP_PF_UNCOMPRESSED : MBEDTLS_ECP_PF_COMPRESSED;
++ if (mbedtls_ecp_point_write_binary(grp, &ecdh->Q, inc_y, &output_len,
++ buf, output_len) == 0) {
++ return wpabuf_alloc_copy(buf + output_offset, output_len - output_offset);
++ }
++
++ return NULL;
++}
++
++#if defined(MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED)
++static int crypto_mbedtls_short_weierstrass_derive_y(mbedtls_ecp_group *grp,
++ mbedtls_mpi *bn,
++ int parity_bit)
++{
++ /* y^2 = x^3 + ax + b
++ * sqrt(w) = w^((p+1)/4) mod p (for prime p where p = 3 mod 4) */
++ mbedtls_mpi *cy2 = (mbedtls_mpi *)
++ crypto_ec_point_compute_y_sqr((struct crypto_ec *)grp,
++ (const struct crypto_bignum *)bn); /*x*/
++ if (cy2 == NULL)
++ return -1;
++
++ /*mbedtls_mpi_free(bn);*/
++ /*(reuse bn to store result (y))*/
++
++ mbedtls_mpi exp;
++ mbedtls_mpi_init(&exp);
++ int ret = mbedtls_mpi_get_bit(&grp->P, 0) != 1 /*(p = 3 mod 4)*/
++ || mbedtls_mpi_get_bit(&grp->P, 1) != 1 /*(p = 3 mod 4)*/
++ || mbedtls_mpi_add_int(&exp, &grp->P, 1)
++ || mbedtls_mpi_shift_r(&exp, 2)
++ || mbedtls_mpi_exp_mod(bn, cy2, &exp, &grp->P, NULL)
++ || (mbedtls_mpi_get_bit(bn, 0) != parity_bit
++ && mbedtls_mpi_sub_mpi(bn, &grp->P, bn));
++ mbedtls_mpi_free(&exp);
++ mbedtls_mpi_free(cy2);
++ os_free(cy2);
++ return ret;
++}
++#endif
++
++struct wpabuf * crypto_ecdh_set_peerkey(struct crypto_ecdh *ecdh, int inc_y,
++ const u8 *key, size_t len)
++{
++ if (len == 0) /*(invalid peer key)*/
++ return NULL;
++
++ mbedtls_ecp_group *grp = &ecdh->grp;
++
++ #if defined(MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED)
++ if (mbedtls_ecp_get_type(grp) == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS) {
++ /* add header for mbedtls_ecdh_read_public() */
++ u8 buf[256];
++ if (sizeof(buf)-1 < len)
++ return NULL;
++ buf[0] = (u8)(len);
++ os_memcpy(buf+1, key, len);
++
++ if (inc_y) {
++ if (!(len & 1)) { /*(dpp code/tests does not include tag?!?)*/
++ if (sizeof(buf)-2 < len)
++ return NULL;
++ buf[0] = (u8)(1+len);
++ buf[1] = 0x04;
++ os_memcpy(buf+2, key, len);
++ }
++ len >>= 1; /*(repurpose len to prime_len)*/
++ } else { /* (inc_y == 0) */
++ /* mbedtls_ecp_point_read_binary() does not currently support
++ * MBEDTLS_ECP_PF_COMPRESSED format (buf[1] = 0x02 or 0x03)
++ * (returns MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE) */
++
++ /* derive y, amend buf[] with y for UNCOMPRESSED format */
++ if (sizeof(buf)-2 < len*2 || len == 0)
++ return NULL;
++
++ buf[0] = (u8)(1+len*2);
++ buf[1] = 0x04;
++ os_memcpy(buf+2, key, len);
++
++ mbedtls_mpi bn;
++ mbedtls_mpi_init(&bn);
++ int ret = mbedtls_mpi_read_binary(&bn, key, len)
++ || crypto_mbedtls_short_weierstrass_derive_y(grp, &bn, 0)
++ || mbedtls_mpi_write_binary(&bn, buf+2+len, len);
++ mbedtls_mpi_free(&bn);
++ if (ret != 0)
++ return NULL;
++ }
++
++ if (mbedtls_ecdh_read_public(&ecdh->ctx, buf, buf[0]+1))
++ return NULL;
++ }
++ #endif
++ #if defined(MBEDTLS_ECP_MONTGOMERY_ENABLED)
++ if (mbedtls_ecp_get_type(grp) == MBEDTLS_ECP_TYPE_MONTGOMERY) {
++ if (mbedtls_ecdh_read_public(&ecdh->ctx, key, len))
++ return NULL;
++ }
++ #endif
++
++ struct wpabuf *buf = wpabuf_alloc(len);
++ if (buf == NULL)
++ return NULL;
++
++ if (mbedtls_ecdh_calc_secret(&ecdh->ctx, &len,
++ wpabuf_mhead(buf), len,
++ mbedtls_ctr_drbg_random,
++ crypto_mbedtls_ctr_drbg()) == 0) {
++ wpabuf_put(buf, len);
++ return buf;
++ }
++
++ wpabuf_clear_free(buf);
++ return NULL;
++}
++
++void crypto_ecdh_deinit(struct crypto_ecdh *ecdh)
++{
++ if (ecdh == NULL)
++ return;
++ mbedtls_ecp_point_free(&ecdh->Q);
++ mbedtls_ecp_group_free(&ecdh->grp);
++ mbedtls_ecdh_free(&ecdh->ctx);
++ os_free(ecdh);
++}
++
++size_t crypto_ecdh_prime_len(struct crypto_ecdh *ecdh)
++{
++ return CRYPTO_EC_plen(&ecdh->grp);
++}
++
++#endif /* CRYPTO_MBEDTLS_CRYPTO_ECDH */
++
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_EC
++
++#include <mbedtls/ecp.h>
++
++struct crypto_ec *crypto_ec_init(int group)
++{
++ mbedtls_ecp_group_id grp_id =
++ crypto_mbedtls_ecp_group_id_from_ike_id(group);
++ if (grp_id == MBEDTLS_ECP_DP_NONE)
++ return NULL;
++ mbedtls_ecp_group *e = os_malloc(sizeof(*e));
++ if (e == NULL)
++ return NULL;
++ mbedtls_ecp_group_init(e);
++ if (mbedtls_ecp_group_load(e, grp_id) == 0)
++ return (struct crypto_ec *)e;
++
++ mbedtls_ecp_group_free(e);
++ os_free(e);
++ return NULL;
++}
++
++void crypto_ec_deinit(struct crypto_ec *e)
++{
++ mbedtls_ecp_group_free((mbedtls_ecp_group *)e);
++ os_free(e);
++}
++
++size_t crypto_ec_prime_len(struct crypto_ec *e)
++{
++ return CRYPTO_EC_plen(e);
++}
++
++size_t crypto_ec_prime_len_bits(struct crypto_ec *e)
++{
++ return CRYPTO_EC_pbits(e);
++}
++
++size_t crypto_ec_order_len(struct crypto_ec *e)
++{
++ return (mbedtls_mpi_bitlen(CRYPTO_EC_N(e)) + 7) / 8;
++}
++
++const struct crypto_bignum *crypto_ec_get_prime(struct crypto_ec *e)
++{
++ return (const struct crypto_bignum *)CRYPTO_EC_P(e);
++}
++
++const struct crypto_bignum *crypto_ec_get_order(struct crypto_ec *e)
++{
++ return (const struct crypto_bignum *)CRYPTO_EC_N(e);
++}
++
++const struct crypto_bignum *crypto_ec_get_a(struct crypto_ec *e)
++{
++ static const uint8_t secp256r1_a[] =
++ {0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x01,
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
++ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfc};
++ static const uint8_t secp384r1_a[] =
++ {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
++ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
++ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
++ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,
++ 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xfc};
++ static const uint8_t secp521r1_a[] =
++ {0x01,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
++ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
++ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
++ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
++ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
++ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
++ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
++ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
++ 0xff,0xfc};
++ static const uint8_t secp192r1_a[] =
++ {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
++ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,
++ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfc};
++ static const uint8_t secp224r1_a[] =
++ {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
++ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,
++ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
++ 0xff,0xff,0xff,0xfe};
++
++ const uint8_t *bin = NULL;
++ size_t len = 0;
++
++ /* (mbedtls groups matching supported sswu_curve_param() IKE groups) */
++ switch (((mbedtls_ecp_group *)e)->id) {
++ #ifdef MBEDTLS_ECP_DP_SECP256R1_ENABLED
++ case MBEDTLS_ECP_DP_SECP256R1:
++ bin = secp256r1_a;
++ len = sizeof(secp256r1_a);
++ break;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_SECP384R1_ENABLED
++ case MBEDTLS_ECP_DP_SECP384R1:
++ bin = secp384r1_a;
++ len = sizeof(secp384r1_a);
++ break;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_SECP521R1_ENABLED
++ case MBEDTLS_ECP_DP_SECP521R1:
++ bin = secp521r1_a;
++ len = sizeof(secp521r1_a);
++ break;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_SECP192R1_ENABLED
++ case MBEDTLS_ECP_DP_SECP192R1:
++ bin = secp192r1_a;
++ len = sizeof(secp192r1_a);
++ break;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_SECP224R1_ENABLED
++ case MBEDTLS_ECP_DP_SECP224R1:
++ bin = secp224r1_a;
++ len = sizeof(secp224r1_a);
++ break;
++ #endif
++ #ifdef MBEDTLS_ECP_DP_BP256R1_ENABLED
++ case MBEDTLS_ECP_DP_BP256R1:
++ return (const struct crypto_bignum *)CRYPTO_EC_A(e);
++ #endif
++ #ifdef MBEDTLS_ECP_DP_BP384R1_ENABLED
++ case MBEDTLS_ECP_DP_BP384R1:
++ return (const struct crypto_bignum *)CRYPTO_EC_A(e);
++ #endif
++ #ifdef MBEDTLS_ECP_DP_BP512R1_ENABLED
++ case MBEDTLS_ECP_DP_BP512R1:
++ return (const struct crypto_bignum *)CRYPTO_EC_A(e);
++ #endif
++ #ifdef MBEDTLS_ECP_DP_CURVE25519_ENABLED
++ case MBEDTLS_ECP_DP_CURVE25519:
++ return (const struct crypto_bignum *)CRYPTO_EC_A(e);
++ #endif
++ #ifdef MBEDTLS_ECP_DP_CURVE448_ENABLED
++ case MBEDTLS_ECP_DP_CURVE448:
++ return (const struct crypto_bignum *)CRYPTO_EC_A(e);
++ #endif
++ default:
++ return NULL;
++ }
++
++ /*(note: not thread-safe; returns file-scoped static storage)*/
++ if (mbedtls_mpi_read_binary(&mpi_sw_A, bin, len) == 0)
++ return (const struct crypto_bignum *)&mpi_sw_A;
++ return NULL;
++}
++
++const struct crypto_bignum *crypto_ec_get_b(struct crypto_ec *e)
++{
++ return (const struct crypto_bignum *)CRYPTO_EC_B(e);
++}
++
++const struct crypto_ec_point * crypto_ec_get_generator(struct crypto_ec *e)
++{
++ return (const struct crypto_ec_point *)CRYPTO_EC_G(e);
++}
++
++struct crypto_ec_point *crypto_ec_point_init(struct crypto_ec *e)
++{
++ if (TEST_FAIL())
++ return NULL;
++
++ mbedtls_ecp_point *p = os_malloc(sizeof(*p));
++ if (p != NULL)
++ mbedtls_ecp_point_init(p);
++ return (struct crypto_ec_point *)p;
++}
++
++void crypto_ec_point_deinit(struct crypto_ec_point *p, int clear)
++{
++ mbedtls_ecp_point_free((mbedtls_ecp_point *)p);
++ os_free(p);
++}
++
++int crypto_ec_point_x(struct crypto_ec *e, const struct crypto_ec_point *p,
++ struct crypto_bignum *x)
++{
++ mbedtls_mpi *px = &((mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(X);
++ return mbedtls_mpi_copy((mbedtls_mpi *)x, px)
++ ? -1
++ : 0;
++}
++
++int crypto_ec_point_to_bin(struct crypto_ec *e,
++ const struct crypto_ec_point *point, u8 *x, u8 *y)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ /* crypto.h documents crypto_ec_point_to_bin() output is big-endian */
++ size_t len = CRYPTO_EC_plen(e);
++ if (x) {
++ mbedtls_mpi *px = &((mbedtls_ecp_point *)point)->MBEDTLS_PRIVATE(X);
++ if (mbedtls_mpi_write_binary(px, x, len))
++ return -1;
++ }
++ if (y) {
++ #if 0 /*(should not be necessary; py mpi should be in initial state)*/
++ #ifdef MBEDTLS_ECP_MONTGOMERY_ENABLED
++ if (mbedtls_ecp_get_type((mbedtls_ecp_group *)e)
++ == MBEDTLS_ECP_TYPE_MONTGOMERY) {
++ os_memset(y, 0, len);
++ return 0;
++ }
++ #endif
++ #endif
++ mbedtls_mpi *py = &((mbedtls_ecp_point *)point)->MBEDTLS_PRIVATE(Y);
++ if (mbedtls_mpi_write_binary(py, y, len))
++ return -1;
++ }
++ return 0;
++}
++
++struct crypto_ec_point * crypto_ec_point_from_bin(struct crypto_ec *e,
++ const u8 *val)
++{
++ if (TEST_FAIL())
++ return NULL;
++
++ size_t len = CRYPTO_EC_plen(e);
++ mbedtls_ecp_point *p = os_malloc(sizeof(*p));
++ u8 buf[1+MBEDTLS_MPI_MAX_SIZE*2];
++ if (p == NULL)
++ return NULL;
++ mbedtls_ecp_point_init(p);
++
++ #ifdef MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED
++ if (mbedtls_ecp_get_type((mbedtls_ecp_group *)e)
++ == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS) {
++ #if 0 /* prefer alternative to MBEDTLS_PRIVATE() access */
++ mbedtls_mpi *px = &((mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(X);
++ mbedtls_mpi *py = &((mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(Y);
++ mbedtls_mpi *pz = &((mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(Z);
++
++ if (mbedtls_mpi_read_binary(px, val, len) == 0
++ && mbedtls_mpi_read_binary(py, val + len, len) == 0
++ && mbedtls_mpi_lset(pz, 1) == 0)
++ return (struct crypto_ec_point *)p;
++ #else
++ buf[0] = 0x04;
++ os_memcpy(buf+1, val, len*2);
++ if (mbedtls_ecp_point_read_binary((mbedtls_ecp_group *)e, p,
++ buf, 1+len*2) == 0)
++ return (struct crypto_ec_point *)p;
++ #endif
++ }
++ #endif
++ #ifdef MBEDTLS_ECP_MONTGOMERY_ENABLED
++ if (mbedtls_ecp_get_type((mbedtls_ecp_group *)e)
++ == MBEDTLS_ECP_TYPE_MONTGOMERY) {
++ /* crypto.h interface documents crypto_ec_point_from_bin()
++ * val is length: prime_len * 2 and is big-endian
++ * (Short Weierstrass is assumed by hostap)
++ * Reverse to little-endian format for Montgomery */
++ for (unsigned int i = 0; i < len; ++i)
++ buf[i] = val[len-1-i];
++ if (mbedtls_ecp_point_read_binary((mbedtls_ecp_group *)e, p,
++ buf, len) == 0)
++ return (struct crypto_ec_point *)p;
++ }
++ #endif
++
++ mbedtls_ecp_point_free(p);
++ os_free(p);
++ return NULL;
++}
++
++int crypto_ec_point_add(struct crypto_ec *e, const struct crypto_ec_point *a,
++ const struct crypto_ec_point *b,
++ struct crypto_ec_point *c)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ /* mbedtls does not provide an mbedtls_ecp_point add function */
++ mbedtls_mpi one;
++ mbedtls_mpi_init(&one);
++ int ret = mbedtls_mpi_lset(&one, 1)
++ || mbedtls_ecp_muladd(
++ (mbedtls_ecp_group *)e, (mbedtls_ecp_point *)c,
++ &one, (const mbedtls_ecp_point *)a,
++ &one, (const mbedtls_ecp_point *)b) ? -1 : 0;
++ mbedtls_mpi_free(&one);
++ return ret;
++}
++
++int crypto_ec_point_mul(struct crypto_ec *e, const struct crypto_ec_point *p,
++ const struct crypto_bignum *b,
++ struct crypto_ec_point *res)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ return mbedtls_ecp_mul(
++ (mbedtls_ecp_group *)e, (mbedtls_ecp_point *)res,
++ (const mbedtls_mpi *)b, (const mbedtls_ecp_point *)p,
++ mbedtls_ctr_drbg_random, crypto_mbedtls_ctr_drbg()) ? -1 : 0;
++}
++
++int crypto_ec_point_invert(struct crypto_ec *e, struct crypto_ec_point *p)
++{
++ if (TEST_FAIL())
++ return -1;
++
++ if (mbedtls_ecp_get_type((mbedtls_ecp_group *)e)
++ == MBEDTLS_ECP_TYPE_MONTGOMERY) {
++ /* e.g. MBEDTLS_ECP_DP_CURVE25519 and MBEDTLS_ECP_DP_CURVE448 */
++ wpa_printf(MSG_ERROR,
++ "%s not implemented for Montgomery curves",__func__);
++ return -1;
++ }
++
++ /* mbedtls does not provide an mbedtls_ecp_point invert function */
++ /* below works for Short Weierstrass; incorrect for Montgomery curves */
++ mbedtls_mpi *py = &((mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(Y);
++ return mbedtls_ecp_is_zero((mbedtls_ecp_point *)p) /*point at infinity*/
++ || mbedtls_mpi_cmp_int(py, 0) == 0 /*point is its own inverse*/
++ || mbedtls_mpi_sub_abs(py, CRYPTO_EC_P(e), py) == 0 ? 0 : -1;
++}
++
++#ifdef MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED
++static int
++crypto_ec_point_y_sqr_weierstrass(mbedtls_ecp_group *e, const mbedtls_mpi *x,
++ mbedtls_mpi *y2)
++{
++ /* MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS y^2 = x^3 + a x + b */
++
++ /* Short Weierstrass elliptic curve group w/o A set treated as A = -3 */
++ /* Attempt to match mbedtls/library/ecp.c:ecp_check_pubkey_sw() behavior
++ * and elsewhere in mbedtls/library/ecp.c where if A is not set, it is
++ * treated as if A = -3. */
++
++ #if 0
++ /* y^2 = x^3 + ax + b */
++ mbedtls_mpi *A = &e->A;
++ mbedtls_mpi t, A_neg3;
++ if (&e->A.p == NULL) {
++ mbedtls_mpi_init(&A_neg3);
++ if (mbedtls_mpi_lset(&A_neg3, -3) != 0) {
++ mbedtls_mpi_free(&A_neg3);
++ return -1;
++ }
++ A = &A_neg3;
++ }
++ mbedtls_mpi_init(&t);
++ int ret = /* x^3 */
++ mbedtls_mpi_lset(&t, 3)
++ || mbedtls_mpi_exp_mod(y2, x, &t, &e->P, NULL)
++ /* ax */
++ || mbedtls_mpi_mul_mpi(y2, y2, A)
++ || mbedtls_mpi_mod_mpi(&t, &t, &e->P)
++ /* ax + b */
++ || mbedtls_mpi_add_mpi(&t, &t, &e->B)
++ || mbedtls_mpi_mod_mpi(&t, &t, &e->P)
++ /* x^3 + ax + b */
++ || mbedtls_mpi_add_mpi(&t, &t, y2) /* ax + b + x^3 */
++ || mbedtls_mpi_mod_mpi(y2, &t, &e->P);
++ mbedtls_mpi_free(&t);
++ if (A == &A_neg3)
++ mbedtls_mpi_free(&A_neg3);
++ return ret; /* 0: success, non-zero: failure */
++ #else
++ /* y^2 = x^3 + ax + b = (x^2 + a)x + b */
++ return /* x^2 */
++ mbedtls_mpi_mul_mpi(y2, x, x)
++ || mbedtls_mpi_mod_mpi(y2, y2, &e->P)
++ /* x^2 + a */
++ || (e->A.MBEDTLS_PRIVATE(p)
++ ? mbedtls_mpi_add_mpi(y2, y2, &e->A)
++ : mbedtls_mpi_sub_int(y2, y2, 3))
++ || mbedtls_mpi_mod_mpi(y2, y2, &e->P)
++ /* (x^2 + a)x */
++ || mbedtls_mpi_mul_mpi(y2, y2, x)
++ || mbedtls_mpi_mod_mpi(y2, y2, &e->P)
++ /* (x^2 + a)x + b */
++ || mbedtls_mpi_add_mpi(y2, y2, &e->B)
++ || mbedtls_mpi_mod_mpi(y2, y2, &e->P);
++ #endif
++}
++#endif /* MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED */
++
++#if 0 /* not used by hostap */
++#ifdef MBEDTLS_ECP_MONTGOMERY_ENABLED
++static int
++crypto_ec_point_y_sqr_montgomery(mbedtls_ecp_group *e, const mbedtls_mpi *x,
++ mbedtls_mpi *y2)
++{
++ /* XXX: !!! must be reviewed and audited for correctness !!! */
++
++ /* MBEDTLS_ECP_TYPE_MONTGOMERY y^2 = x^3 + a x^2 + x */
++
++ /* y^2 = x^3 + a x^2 + x = (x + a)x^2 + x */
++ mbedtls_mpi x2;
++ mbedtls_mpi_init(&x2);
++ int ret = /* x^2 */
++ mbedtls_mpi_mul_mpi(&x2, x, x)
++ || mbedtls_mpi_mod_mpi(&x2, &x2, &e->P)
++ /* x + a */
++ || mbedtls_mpi_add_mpi(y2, x, &e->A)
++ || mbedtls_mpi_mod_mpi(y2, y2, &e->P)
++ /* (x + a)x^2 */
++ || mbedtls_mpi_mul_mpi(y2, y2, &x2)
++ || mbedtls_mpi_mod_mpi(y2, y2, &e->P)
++ /* (x + a)x^2 + x */
++ || mbedtls_mpi_add_mpi(y2, y2, x)
++ || mbedtls_mpi_mod_mpi(y2, y2, &e->P);
++ mbedtls_mpi_free(&x2);
++ return ret; /* 0: success, non-zero: failure */
++}
++#endif /* MBEDTLS_ECP_MONTGOMERY_ENABLED */
++#endif
++
++struct crypto_bignum *
++crypto_ec_point_compute_y_sqr(struct crypto_ec *e,
++ const struct crypto_bignum *x)
++{
++ if (TEST_FAIL())
++ return NULL;
++
++ mbedtls_mpi *y2 = os_malloc(sizeof(*y2));
++ if (y2 == NULL)
++ return NULL;
++ mbedtls_mpi_init(y2);
++
++ #ifdef MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED
++ if (mbedtls_ecp_get_type((mbedtls_ecp_group *)e)
++ == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS
++ && crypto_ec_point_y_sqr_weierstrass((mbedtls_ecp_group *)e,
++ (const mbedtls_mpi *)x,
++ y2) == 0)
++ return (struct crypto_bignum *)y2;
++ #endif
++ #if 0 /* not used by hostap */
++ #ifdef MBEDTLS_ECP_MONTGOMERY_ENABLED
++ if (mbedtls_ecp_get_type((mbedtls_ecp_group *)e)
++ == MBEDTLS_ECP_TYPE_MONTGOMERY
++ && crypto_ec_point_y_sqr_montgomery((mbedtls_ecp_group *)e,
++ (const mbedtls_mpi *)x,
++ y2) == 0)
++ return (struct crypto_bignum *)y2;
++ #endif
++ #endif
++
++ mbedtls_mpi_free(y2);
++ os_free(y2);
++ return NULL;
++}
++
++int crypto_ec_point_is_at_infinity(struct crypto_ec *e,
++ const struct crypto_ec_point *p)
++{
++ return mbedtls_ecp_is_zero((mbedtls_ecp_point *)p);
++}
++
++int crypto_ec_point_is_on_curve(struct crypto_ec *e,
++ const struct crypto_ec_point *p)
++{
++ #if 1
++ return mbedtls_ecp_check_pubkey((const mbedtls_ecp_group *)e,
++ (const mbedtls_ecp_point *)p) == 0;
++ #else
++ /* compute y^2 mod P and compare to y^2 mod P */
++ /*(ref: src/eap_common/eap_pwd_common.c:compute_password_element())*/
++ const mbedtls_mpi *px = &((const mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(X);
++ mbedtls_mpi *cy2 = (mbedtls_mpi *)
++ crypto_ec_point_compute_y_sqr(e, (const struct crypto_bignum *)px);
++ if (cy2 == NULL)
++ return 0;
++
++ mbedtls_mpi y2;
++ mbedtls_mpi_init(&y2);
++ const mbedtls_mpi *py = &((const mbedtls_ecp_point *)p)->MBEDTLS_PRIVATE(Y);
++ int is_on_curve = mbedtls_mpi_mul_mpi(&y2, py, py) /* y^2 mod P */
++ || mbedtls_mpi_mod_mpi(&y2, &y2, CRYPTO_EC_P(e))
++ || mbedtls_mpi_cmp_mpi(&y2, cy2) != 0 ? 0 : 1;
++
++ mbedtls_mpi_free(&y2);
++ mbedtls_mpi_free(cy2);
++ os_free(cy2);
++ return is_on_curve;
++ #endif
++}
++
++int crypto_ec_point_cmp(const struct crypto_ec *e,
++ const struct crypto_ec_point *a,
++ const struct crypto_ec_point *b)
++{
++ return mbedtls_ecp_point_cmp((const mbedtls_ecp_point *)a,
++ (const mbedtls_ecp_point *)b);
++}
++
++#if !defined(CONFIG_NO_STDOUT_DEBUG)
++void crypto_ec_point_debug_print(const struct crypto_ec *e,
++ const struct crypto_ec_point *p,
++ const char *title)
++{
++ u8 x[MBEDTLS_MPI_MAX_SIZE];
++ u8 y[MBEDTLS_MPI_MAX_SIZE];
++ size_t len = CRYPTO_EC_plen(e);
++ /* crypto_ec_point_to_bin ought to take (const struct crypto_ec *e) */
++ struct crypto_ec *ee;
++ *(const struct crypto_ec **)&ee = e; /*(cast away const)*/
++ if (crypto_ec_point_to_bin(ee, p, x, y) == 0) {
++ if (title)
++ wpa_printf(MSG_DEBUG, "%s", title);
++ wpa_hexdump(MSG_DEBUG, "x:", x, len);
++ wpa_hexdump(MSG_DEBUG, "y:", y, len);
++ }
++}
++#endif
++
++
++struct crypto_ec_key * crypto_ec_key_parse_priv(const u8 *der, size_t der_len)
++{
++ mbedtls_pk_context *ctx = os_malloc(sizeof(*ctx));
++ if (ctx == NULL)
++ return NULL;
++ mbedtls_pk_init(ctx);
++ #if MBEDTLS_VERSION_NUMBER < 0x03000000 /* mbedtls 3.0.0 */
++ if (mbedtls_pk_parse_key(ctx, der, der_len, NULL, 0) == 0)
++ #else
++ if (mbedtls_pk_parse_key(ctx, der, der_len, NULL, 0,
++ mbedtls_ctr_drbg_random,
++ crypto_mbedtls_ctr_drbg()) == 0)
++ #endif
++ return (struct crypto_ec_key *)ctx;
++
++ mbedtls_pk_free(ctx);
++ os_free(ctx);
++ return NULL;
++}
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_HPKE
++#ifdef CONFIG_MODULE_TESTS
++/*(for crypto_module_tests.c)*/
++struct crypto_ec_key * crypto_ec_key_set_priv(int group,
++ const u8 *raw, size_t raw_len)
++{
++ mbedtls_ecp_group_id grp_id =
++ crypto_mbedtls_ecp_group_id_from_ike_id(group);
++ if (grp_id == MBEDTLS_ECP_DP_NONE)
++ return NULL;
++ const mbedtls_pk_info_t *pk_info =
++ mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY);
++ if (pk_info == NULL)
++ return NULL;
++ mbedtls_pk_context *ctx = os_malloc(sizeof(*ctx));
++ if (ctx == NULL)
++ return NULL;
++ mbedtls_pk_init(ctx);
++ if (mbedtls_pk_setup(ctx, pk_info) == 0
++ && mbedtls_ecp_read_key(grp_id,mbedtls_pk_ec(*ctx),raw,raw_len) == 0) {
++ return (struct crypto_ec_key *)ctx;
++ }
++
++ mbedtls_pk_free(ctx);
++ os_free(ctx);
++ return NULL;
++}
++#endif
++#endif
++
++#include <mbedtls/error.h>
++#include <mbedtls/oid.h>
++static int crypto_mbedtls_pk_parse_subpubkey_compressed(mbedtls_pk_context *ctx, const u8 *der, size_t der_len)
++{
++ /* The following is modified from:
++ * mbedtls/library/pkparse.c:mbedtls_pk_parse_subpubkey()
++ * mbedtls/library/pkparse.c:pk_get_pk_alg()
++ * mbedtls/library/pkparse.c:pk_use_ecparams()
++ */
++ mbedtls_pk_type_t pk_alg = MBEDTLS_PK_NONE;
++ const mbedtls_pk_info_t *pk_info;
++ int ret;
++ size_t len;
++ const unsigned char *end = der+der_len;
++ unsigned char *p;
++ *(const unsigned char **)&p = der;
++
++ if( ( ret = mbedtls_asn1_get_tag( &p, end, &len,
++ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
++ {
++ return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT, ret ) );
++ }
++
++ end = p + len;
++
++ /*
++ if( ( ret = pk_get_pk_alg( &p, end, &pk_alg, &alg_params ) ) != 0 )
++ return( ret );
++ */
++ mbedtls_asn1_buf alg_oid, params;
++ memset( ¶ms, 0, sizeof(mbedtls_asn1_buf) );
++ if( ( ret = mbedtls_asn1_get_alg( &p, end, &alg_oid, ¶ms ) ) != 0 )
++ return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PK_INVALID_ALG, ret ) );
++ if( mbedtls_oid_get_pk_alg( &alg_oid, &pk_alg ) != 0 )
++ return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
++
++ if( ( ret = mbedtls_asn1_get_bitstring_null( &p, end, &len ) ) != 0 )
++ return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PK_INVALID_PUBKEY, ret ) );
++
++ if( p + len != end )
++ return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PK_INVALID_PUBKEY,
++ MBEDTLS_ERR_ASN1_LENGTH_MISMATCH ) );
++
++ if( ( pk_info = mbedtls_pk_info_from_type( pk_alg ) ) == NULL )
++ return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
++
++ if( ( ret = mbedtls_pk_setup( ctx, pk_info ) ) != 0 )
++ return( ret );
++
++ /* assume mbedtls_pk_parse_subpubkey(&der, der+der_len, ctx)
++ * has already run with ctx initialized up to pk_get_ecpubkey(),
++ * and pk_get_ecpubkey() has returned MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE
++ *
++ * mbedtls mbedtls_ecp_point_read_binary()
++ * does not handle point in COMPRESSED format
++ *
++ * (validate assumption that algorithm is EC) */
++ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*ctx);
++ if (ecp_kp == NULL)
++ return( MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE );
++ mbedtls_ecp_group *ecp_kp_grp = &ecp_kp->MBEDTLS_PRIVATE(grp);
++ mbedtls_ecp_point *ecp_kp_Q = &ecp_kp->MBEDTLS_PRIVATE(Q);
++ mbedtls_ecp_group_id grp_id;
++
++
++ /* mbedtls/library/pkparse.c:pk_use_ecparams() */
++
++ if( params.tag == MBEDTLS_ASN1_OID )
++ {
++ if( mbedtls_oid_get_ec_grp( ¶ms, &grp_id ) != 0 )
++ return( MBEDTLS_ERR_PK_UNKNOWN_NAMED_CURVE );
++ }
++ else
++ {
++#if defined(MBEDTLS_PK_PARSE_EC_EXTENDED)
++ /*(large code block not copied from mbedtls; unsupported)*/
++ #if 0
++ if( ( ret = pk_group_id_from_specified( ¶ms, &grp_id ) ) != 0 )
++ return( ret );
++ #endif
++#endif
++ return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
++ }
++
++ /*
++ * grp may already be initialized; if so, make sure IDs match
++ */
++ if( ecp_kp_grp->id != MBEDTLS_ECP_DP_NONE && ecp_kp_grp->id != grp_id )
++ return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
++
++ if( ( ret = mbedtls_ecp_group_load( ecp_kp_grp, grp_id ) ) != 0 )
++ return( ret );
++
++
++ /* (validate assumption that EC point is in COMPRESSED format) */
++ len = CRYPTO_EC_plen(ecp_kp_grp);
++ if( mbedtls_ecp_get_type(ecp_kp_grp) != MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS
++ || (end - p) != 1+len
++ || (*p != 0x02 && *p != 0x03) )
++ return( MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE );
++
++ /* Instead of calling mbedtls/library/pkparse.c:pk_get_ecpubkey() to call
++ * mbedtls_ecp_point_read_binary(), manually parse point into ecp_kp_Q */
++ mbedtls_mpi *X = &ecp_kp_Q->MBEDTLS_PRIVATE(X);
++ mbedtls_mpi *Y = &ecp_kp_Q->MBEDTLS_PRIVATE(Y);
++ mbedtls_mpi *Z = &ecp_kp_Q->MBEDTLS_PRIVATE(Z);
++ ret = mbedtls_mpi_lset(Z, 1);
++ if (ret != 0)
++ return( ret );
++ ret = mbedtls_mpi_read_binary(X, p+1, len);
++ if (ret != 0)
++ return( ret );
++ /* derive Y
++ * (similar derivation of Y in crypto_mbedtls.c:crypto_ecdh_set_peerkey())*/
++ ret = mbedtls_mpi_copy(Y, X) /*(Y is used as input and output obj below)*/
++ || crypto_mbedtls_short_weierstrass_derive_y(ecp_kp_grp, Y, (*p & 1));
++ if (ret != 0)
++ return( ret );
++
++ return mbedtls_ecp_check_pubkey( ecp_kp_grp, ecp_kp_Q );
++}
++
++struct crypto_ec_key * crypto_ec_key_parse_pub(const u8 *der, size_t der_len)
++{
++ mbedtls_pk_context *ctx = os_malloc(sizeof(*ctx));
++ if (ctx == NULL)
++ return NULL;
++ mbedtls_pk_init(ctx);
++ /*int rc = mbedtls_pk_parse_subpubkey(&der, der+der_len, ctx);*/
++ int rc = mbedtls_pk_parse_public_key(ctx, der, der_len);
++ if (rc == 0)
++ return (struct crypto_ec_key *)ctx;
++ else if (rc == MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE) {
++ /* mbedtls mbedtls_ecp_point_read_binary()
++ * does not handle point in COMPRESSED format; parse internally */
++ rc = crypto_mbedtls_pk_parse_subpubkey_compressed(ctx,der,der_len);
++ if (rc == 0)
++ return (struct crypto_ec_key *)ctx;
++ }
++
++ mbedtls_pk_free(ctx);
++ os_free(ctx);
++ return NULL;
++}
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_EC_DPP
++
++static struct crypto_ec_key *
++crypto_ec_key_set_pub_point_for_group(mbedtls_ecp_group_id grp_id,
++ const mbedtls_ecp_point *pub,
++ const u8 *buf, size_t len)
++{
++ const mbedtls_pk_info_t *pk_info =
++ mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY);
++ if (pk_info == NULL)
++ return NULL;
++ mbedtls_pk_context *ctx = os_malloc(sizeof(*ctx));
++ if (ctx == NULL)
++ return NULL;
++ mbedtls_pk_init(ctx);
++ if (mbedtls_pk_setup(ctx, pk_info) == 0) {
++ /* (Is private key generation necessary for callers?)
++ * alt: gen key then overwrite Q
++ * mbedtls_ecp_gen_key(grp_id, ecp_kp,
++ * mbedtls_ctr_drbg_random,
++ * crypto_mbedtls_ctr_drbg()) == 0
++ */
++ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*ctx);
++ mbedtls_ecp_group *ecp_kp_grp = &ecp_kp->MBEDTLS_PRIVATE(grp);
++ mbedtls_ecp_point *ecp_kp_Q = &ecp_kp->MBEDTLS_PRIVATE(Q);
++ mbedtls_mpi *ecp_kp_d = &ecp_kp->MBEDTLS_PRIVATE(d);
++ if (mbedtls_ecp_group_load(ecp_kp_grp, grp_id) == 0
++ && (pub
++ ? mbedtls_ecp_copy(ecp_kp_Q, pub) == 0
++ : mbedtls_ecp_point_read_binary(ecp_kp_grp, ecp_kp_Q,
++ buf, len) == 0)
++ && mbedtls_ecp_gen_privkey(ecp_kp_grp, ecp_kp_d,
++ mbedtls_ctr_drbg_random,
++ crypto_mbedtls_ctr_drbg()) == 0){
++ return (struct crypto_ec_key *)ctx;
++ }
++ }
++
++ mbedtls_pk_free(ctx);
++ os_free(ctx);
++ return NULL;
++}
++
++struct crypto_ec_key * crypto_ec_key_set_pub(int group, const u8 *x,
++ const u8 *y, size_t len)
++{
++ mbedtls_ecp_group_id grp_id =
++ crypto_mbedtls_ecp_group_id_from_ike_id(group);
++ if (grp_id == MBEDTLS_ECP_DP_NONE)
++ return NULL;
++ if (len > MBEDTLS_MPI_MAX_SIZE)
++ return NULL;
++ u8 buf[1+MBEDTLS_MPI_MAX_SIZE*2];
++ buf[0] = 0x04; /* assume x,y for Short Weierstrass */
++ os_memcpy(buf+1, x, len);
++ os_memcpy(buf+1+len, y, len);
++
++ return crypto_ec_key_set_pub_point_for_group(grp_id,NULL,buf,1+len*2);
++}
++
++struct crypto_ec_key *
++crypto_ec_key_set_pub_point(struct crypto_ec *e,
++ const struct crypto_ec_point *pub)
++{
++ mbedtls_ecp_group_id grp_id = ((mbedtls_ecp_group *)e)->id;
++ mbedtls_ecp_point *p = (mbedtls_ecp_point *)pub;
++ return crypto_ec_key_set_pub_point_for_group(grp_id, p, NULL, 0);
++}
++
++
++struct crypto_ec_key * crypto_ec_key_gen(int group)
++{
++ mbedtls_pk_context *ctx = os_malloc(sizeof(*ctx));
++ if (ctx == NULL)
++ return NULL;
++ mbedtls_pk_init(ctx);
++ if (crypto_mbedtls_keypair_gen(group, ctx) == 0)
++ return (struct crypto_ec_key *)ctx;
++ mbedtls_pk_free(ctx);
++ os_free(ctx);
++ return NULL;
++}
++
++#endif /* CRYPTO_MBEDTLS_CRYPTO_EC_DPP */
++
++void crypto_ec_key_deinit(struct crypto_ec_key *key)
++{
++ mbedtls_pk_free((mbedtls_pk_context *)key);
++ os_free(key);
++}
++
++struct wpabuf * crypto_ec_key_get_subject_public_key(struct crypto_ec_key *key)
++{
++ /* (similar to crypto_ec_key_get_pubkey_point(),
++ * but compressed point format and ASN.1 DER wrapping)*/
++#ifndef MBEDTLS_PK_ECP_PUB_DER_MAX_BYTES /*(mbedtls/library/pkwrite.h)*/
++#define MBEDTLS_PK_ECP_PUB_DER_MAX_BYTES ( 30 + 2 * MBEDTLS_ECP_MAX_BYTES )
++#endif
++ unsigned char buf[MBEDTLS_PK_ECP_PUB_DER_MAX_BYTES];
++ int len = mbedtls_pk_write_pubkey_der((mbedtls_pk_context *)key,
++ buf, sizeof(buf));
++ if (len < 0)
++ return NULL;
++ /* Note: data is written at the end of the buffer! Use the
++ * return value to determine where you should start
++ * using the buffer */
++ unsigned char *p = buf+sizeof(buf)-len;
++
++ #ifdef MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED
++ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*(mbedtls_pk_context *)key);
++ if (ecp_kp == NULL)
++ return NULL;
++ mbedtls_ecp_group *grp = &ecp_kp->MBEDTLS_PRIVATE(grp);
++ /* Note: sae_pk.c expects pubkey point in compressed format,
++ * but mbedtls_pk_write_pubkey_der() writes uncompressed format.
++ * Manually translate format and update lengths in DER format */
++ if (mbedtls_ecp_get_type(grp) == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS) {
++ unsigned char *end = buf+sizeof(buf);
++ size_t n;
++ /* SubjectPublicKeyInfo SEQUENCE */
++ mbedtls_asn1_get_tag(&p, end, &n,
++ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
++ /* algorithm AlgorithmIdentifier */
++ unsigned char *a = p;
++ size_t alen;
++ mbedtls_asn1_get_tag(&p, end, &alen,
++ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
++ p += alen;
++ alen = (size_t)(p - a);
++ /* subjectPublicKey BIT STRING */
++ mbedtls_asn1_get_tag(&p, end, &n, MBEDTLS_ASN1_BIT_STRING);
++ /* rewrite into compressed point format and rebuild ASN.1 */
++ p[1] = (buf[sizeof(buf)-1] & 1) ? 0x03 : 0x02;
++ n = 1 + 1 + (n-2)/2;
++ len = mbedtls_asn1_write_len(&p, buf, n) + (int)n;
++ len += mbedtls_asn1_write_tag(&p, buf, MBEDTLS_ASN1_BIT_STRING);
++ os_memmove(p-alen, a, alen);
++ len += alen;
++ p -= alen;
++ len += mbedtls_asn1_write_len(&p, buf, (size_t)len);
++ len += mbedtls_asn1_write_tag(&p, buf,
++ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
++ }
++ #endif
++ return wpabuf_alloc_copy(p, (size_t)len);
++}
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_EC_DPP
++
++struct wpabuf * crypto_ec_key_get_ecprivate_key(struct crypto_ec_key *key,
++ bool include_pub)
++{
++#ifndef MBEDTLS_PK_ECP_PRV_DER_MAX_BYTES /*(mbedtls/library/pkwrite.h)*/
++#define MBEDTLS_PK_ECP_PRV_DER_MAX_BYTES ( 29 + 3 * MBEDTLS_ECP_MAX_BYTES )
++#endif
++ unsigned char priv[MBEDTLS_PK_ECP_PRV_DER_MAX_BYTES];
++ int privlen = mbedtls_pk_write_key_der((mbedtls_pk_context *)key,
++ priv, sizeof(priv));
++ if (privlen < 0)
++ return NULL;
++
++ struct wpabuf *wbuf;
++
++ /* Note: data is written at the end of the buffer! Use the
++ * return value to determine where you should start
++ * using the buffer */
++ /* mbedtls_pk_write_key_der() includes publicKey in DER */
++ if (include_pub)
++ wbuf = wpabuf_alloc_copy(priv+sizeof(priv)-privlen, privlen);
++ else {
++ /* calculate publicKey offset and skip from end of buffer */
++ unsigned char *p = priv+sizeof(priv)-privlen;
++ unsigned char *end = priv+sizeof(priv);
++ size_t len;
++ /* ECPrivateKey SEQUENCE */
++ mbedtls_asn1_get_tag(&p, end, &len,
++ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
++ /* version INTEGER */
++ unsigned char *v = p;
++ mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_INTEGER);
++ p += len;
++ /* privateKey OCTET STRING */
++ mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OCTET_STRING);
++ p += len;
++ /* parameters ECParameters */
++ mbedtls_asn1_get_tag(&p, end, &len,
++ MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED);
++ p += len;
++
++ /* write new SEQUENCE header (we know that it fits in priv[]) */
++ len = (size_t)(p - v);
++ p = v;
++ len += mbedtls_asn1_write_len(&p, priv, len);
++ len += mbedtls_asn1_write_tag(&p, priv,
++ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
++ wbuf = wpabuf_alloc_copy(p, len);
++ }
++
++ forced_memzero(priv, sizeof(priv));
++ return wbuf;
++}
++
++struct wpabuf * crypto_ec_key_get_pubkey_point(struct crypto_ec_key *key,
++ int prefix)
++{
++ /*(similarities to crypto_ecdh_get_pubkey(), but different struct)*/
++ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*(mbedtls_pk_context *)key);
++ if (ecp_kp == NULL)
++ return NULL;
++ mbedtls_ecp_group *grp = &ecp_kp->MBEDTLS_PRIVATE(grp);
++ size_t len = CRYPTO_EC_plen(grp);
++ #ifdef MBEDTLS_ECP_MONTGOMERY_ENABLED
++ /* len */
++ #endif
++ #ifdef MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED
++ if (mbedtls_ecp_get_type(grp) == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS)
++ len = len*2+1;
++ #endif
++ struct wpabuf *buf = wpabuf_alloc(len);
++ if (buf == NULL)
++ return NULL;
++ mbedtls_ecp_point *ecp_kp_Q = &ecp_kp->MBEDTLS_PRIVATE(Q);
++ if (mbedtls_ecp_point_write_binary(grp, ecp_kp_Q,
++ MBEDTLS_ECP_PF_UNCOMPRESSED, &len,
++ wpabuf_mhead_u8(buf), len) == 0) {
++ if (!prefix) /* Remove 0x04 prefix if requested */
++ os_memmove(wpabuf_mhead(buf),wpabuf_mhead(buf)+1,--len);
++ wpabuf_put(buf, len);
++ return buf;
++ }
++
++ wpabuf_free(buf);
++ return NULL;
++}
++
++struct crypto_ec_point *
++crypto_ec_key_get_public_key(struct crypto_ec_key *key)
++{
++ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*(mbedtls_pk_context *)key);
++ if (ecp_kp == NULL)
++ return NULL;
++ mbedtls_ecp_point *p = os_malloc(sizeof(*p));
++ if (p != NULL) {
++ /*(mbedtls_ecp_export() uses &ecp_kp->MBEDTLS_PRIVATE(grp))*/
++ mbedtls_ecp_point_init(p);
++ mbedtls_ecp_point *ecp_kp_Q = &ecp_kp->MBEDTLS_PRIVATE(Q);
++ if (mbedtls_ecp_copy(p, ecp_kp_Q)) {
++ mbedtls_ecp_point_free(p);
++ os_free(p);
++ p = NULL;
++ }
++ }
++ return (struct crypto_ec_point *)p;
++}
++
++struct crypto_bignum *
++crypto_ec_key_get_private_key(struct crypto_ec_key *key)
++{
++ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*(mbedtls_pk_context *)key);
++ if (ecp_kp == NULL)
++ return NULL;
++ mbedtls_mpi *bn = os_malloc(sizeof(*bn));
++ if (bn) {
++ /*(mbedtls_ecp_export() uses &ecp_kp->MBEDTLS_PRIVATE(grp))*/
++ mbedtls_mpi_init(bn);
++ mbedtls_mpi *ecp_kp_d = &ecp_kp->MBEDTLS_PRIVATE(d);
++ if (mbedtls_mpi_copy(bn, ecp_kp_d)) {
++ mbedtls_mpi_free(bn);
++ os_free(bn);
++ bn = NULL;
++ }
++ }
++ return (struct crypto_bignum *)bn;
++}
++
++#endif /* CRYPTO_MBEDTLS_CRYPTO_EC_DPP */
++
++static mbedtls_md_type_t crypto_ec_key_sign_md(size_t len)
++{
++ /* get mbedtls_md_type_t from length of hash data to be signed */
++ switch (len) {
++ case 64: return MBEDTLS_MD_SHA512;
++ case 48: return MBEDTLS_MD_SHA384;
++ case 32: return MBEDTLS_MD_SHA256;
++ case 20: return MBEDTLS_MD_SHA1;
++ case 16: return MBEDTLS_MD_MD5;
++ default: return MBEDTLS_MD_NONE;
++ }
++}
++
++struct wpabuf * crypto_ec_key_sign(struct crypto_ec_key *key, const u8 *data,
++ size_t len)
++{
++ #ifndef MBEDTLS_PK_SIGNATURE_MAX_SIZE /*(defined since mbedtls 2.20.0)*/
++ #if MBEDTLS_ECDSA_MAX_LEN > MBEDTLS_MPI_MAX_SIZE
++ #define MBEDTLS_PK_SIGNATURE_MAX_SIZE MBEDTLS_ECDSA_MAX_LEN
++ #else
++ #define MBEDTLS_PK_SIGNATURE_MAX_SIZE MBEDTLS_MPI_MAX_SIZE
++ #endif
++ #endif
++ size_t sig_len = MBEDTLS_PK_SIGNATURE_MAX_SIZE;
++ struct wpabuf *buf = wpabuf_alloc(sig_len);
++ if (buf == NULL)
++ return NULL;
++ if (mbedtls_pk_sign((mbedtls_pk_context *)key,
++ crypto_ec_key_sign_md(len), data, len,
++ wpabuf_mhead_u8(buf),
++ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
++ sig_len,
++ #endif
++ &sig_len,
++ mbedtls_ctr_drbg_random,
++ crypto_mbedtls_ctr_drbg()) == 0) {
++ wpabuf_put(buf, sig_len);
++ return buf;
++ }
++
++ wpabuf_free(buf);
++ return NULL;
++}
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_EC_DPP
++struct wpabuf * crypto_ec_key_sign_r_s(struct crypto_ec_key *key,
++ const u8 *data, size_t len)
++{
++ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*(mbedtls_pk_context *)key);
++ if (ecp_kp == NULL)
++ return NULL;
++
++ size_t sig_len = MBEDTLS_ECDSA_MAX_LEN;
++ u8 buf[MBEDTLS_ECDSA_MAX_LEN];
++ if (mbedtls_ecdsa_write_signature(ecp_kp, crypto_ec_key_sign_md(len),
++ data, len, buf,
++ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
++ sig_len,
++ #endif
++ &sig_len,
++ mbedtls_ctr_drbg_random,
++ crypto_mbedtls_ctr_drbg())) {
++ return NULL;
++ }
++
++ /*(mbedtls_ecdsa_write_signature() writes signature in ASN.1)*/
++ /* parse ASN.1 to get r and s and lengths */
++ u8 *p = buf, *r, *s;
++ u8 *end = p + sig_len;
++ size_t rlen, slen;
++ mbedtls_asn1_get_tag(&p, end, &rlen,
++ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
++ mbedtls_asn1_get_tag(&p, end, &rlen, MBEDTLS_ASN1_INTEGER);
++ r = p;
++ p += rlen;
++ mbedtls_asn1_get_tag(&p, end, &slen, MBEDTLS_ASN1_INTEGER);
++ s = p;
++
++ /* write raw r and s into out
++ * (including removal of leading 0 if added for ASN.1 integer)
++ * note: DPP caller expects raw r, s each padded to prime len */
++ mbedtls_ecp_group *ecp_kp_grp = &ecp_kp->MBEDTLS_PRIVATE(grp);
++ size_t plen = CRYPTO_EC_plen(ecp_kp_grp);
++ if (rlen > plen) {
++ r += (rlen - plen);
++ rlen = plen;
++ }
++ if (slen > plen) {
++ s += (slen - plen);
++ slen = plen;
++ }
++ struct wpabuf *out = wpabuf_alloc(plen*2);
++ if (out) {
++ wpabuf_put(out, plen*2);
++ p = wpabuf_mhead_u8(out);
++ os_memset(p, 0, plen*2);
++ os_memcpy(p+plen*1-rlen, r, rlen);
++ os_memcpy(p+plen*2-slen, s, slen);
++ }
++ return out;
++}
++#endif /* CRYPTO_MBEDTLS_CRYPTO_EC_DPP */
++
++int crypto_ec_key_verify_signature(struct crypto_ec_key *key, const u8 *data,
++ size_t len, const u8 *sig, size_t sig_len)
++{
++ switch (mbedtls_pk_verify((mbedtls_pk_context *)key,
++ crypto_ec_key_sign_md(len), data, len,
++ sig, sig_len)) {
++ case 0:
++ /*case MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH:*//* XXX: allow? */
++ return 1;
++ case MBEDTLS_ERR_ECP_VERIFY_FAILED:
++ return 0;
++ default:
++ return -1;
++ }
++}
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_EC_DPP
++int crypto_ec_key_verify_signature_r_s(struct crypto_ec_key *key,
++ const u8 *data, size_t len,
++ const u8 *r, size_t r_len,
++ const u8 *s, size_t s_len)
++{
++ /* reimplement mbedtls_ecdsa_read_signature() without encoding r and s
++ * into ASN.1 just for mbedtls_ecdsa_read_signature() to decode ASN.1 */
++ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*(mbedtls_pk_context *)key);
++ if (ecp_kp == NULL)
++ return -1;
++ mbedtls_ecp_group *ecp_kp_grp = &ecp_kp->MBEDTLS_PRIVATE(grp);
++ mbedtls_ecp_point *ecp_kp_Q = &ecp_kp->MBEDTLS_PRIVATE(Q);
++
++ mbedtls_mpi mpi_r;
++ mbedtls_mpi mpi_s;
++ mbedtls_mpi_init(&mpi_r);
++ mbedtls_mpi_init(&mpi_s);
++ int ret = mbedtls_mpi_read_binary(&mpi_r, r, r_len)
++ || mbedtls_mpi_read_binary(&mpi_s, s, s_len) ? -1 : 0;
++ if (ret == 0) {
++ ret = mbedtls_ecdsa_verify(ecp_kp_grp, data, len,
++ ecp_kp_Q, &mpi_r, &mpi_s);
++ ret = ret ? ret == MBEDTLS_ERR_ECP_BAD_INPUT_DATA ? 0 : -1 : 1;
++ }
++ mbedtls_mpi_free(&mpi_r);
++ mbedtls_mpi_free(&mpi_s);
++ return ret;
++}
++#endif /* CRYPTO_MBEDTLS_CRYPTO_EC_DPP */
++
++int crypto_ec_key_group(struct crypto_ec_key *key)
++{
++ mbedtls_ecp_keypair *ecp_kp = mbedtls_pk_ec(*(mbedtls_pk_context *)key);
++ if (ecp_kp == NULL)
++ return -1;
++ mbedtls_ecp_group *ecp_group = &ecp_kp->MBEDTLS_PRIVATE(grp);
++ return crypto_mbedtls_ike_id_from_ecp_group_id(ecp_group->id);
++}
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_EC_DPP
++
++int crypto_ec_key_cmp(struct crypto_ec_key *key1, struct crypto_ec_key *key2)
++{
++#if 0 /*(DPP is passing two public keys; unable to use pk_check_pair())*/
++ #if MBEDTLS_VERSION_NUMBER < 0x03000000 /* mbedtls 3.0.0 */
++ return mbedtls_pk_check_pair((const mbedtls_pk_context *)key1,
++ (const mbedtls_pk_context *)key2) ? -1 : 0;
++ #else
++ return mbedtls_pk_check_pair((const mbedtls_pk_context *)key1,
++ (const mbedtls_pk_context *)key2,
++ mbedtls_ctr_drbg_random,
++ crypto_mbedtls_ctr_drbg()) ? -1 : 0;
++ #endif
++#else
++ mbedtls_ecp_keypair *ecp_kp1=mbedtls_pk_ec(*(mbedtls_pk_context *)key1);
++ mbedtls_ecp_keypair *ecp_kp2=mbedtls_pk_ec(*(mbedtls_pk_context *)key2);
++ if (ecp_kp1 == NULL || ecp_kp2 == NULL)
++ return -1;
++ mbedtls_ecp_group *ecp_kp1_grp = &ecp_kp1->MBEDTLS_PRIVATE(grp);
++ mbedtls_ecp_group *ecp_kp2_grp = &ecp_kp2->MBEDTLS_PRIVATE(grp);
++ mbedtls_ecp_point *ecp_kp1_Q = &ecp_kp1->MBEDTLS_PRIVATE(Q);
++ mbedtls_ecp_point *ecp_kp2_Q = &ecp_kp2->MBEDTLS_PRIVATE(Q);
++ return ecp_kp1_grp->id != ecp_kp2_grp->id
++ || mbedtls_ecp_point_cmp(ecp_kp1_Q, ecp_kp2_Q) ? -1 : 0;
++#endif
++}
++
++void crypto_ec_key_debug_print(const struct crypto_ec_key *key,
++ const char *title)
++{
++ /* TBD: what info is desirable here and in what human readable format?*/
++ /*(crypto_openssl.c prints a human-readably public key and attributes)*/
++ #if 0
++ struct mbedtls_pk_debug_item debug_item;
++ if (mbedtls_pk_debug((const mbedtls_pk_context *)key, &debug_item))
++ return;
++ /* ... */
++ #endif
++ wpa_printf(MSG_DEBUG, "%s: %s not implemented", title, __func__);
++}
++
++#endif /* CRYPTO_MBEDTLS_CRYPTO_EC_DPP */
++
++#endif /* CRYPTO_MBEDTLS_CRYPTO_EC */
++
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_CSR
++
++#include <mbedtls/x509_csr.h>
++#include <mbedtls/oid.h>
++
++struct crypto_csr * crypto_csr_init(void)
++{
++ mbedtls_x509write_csr *csr = os_malloc(sizeof(*csr));
++ if (csr != NULL)
++ mbedtls_x509write_csr_init(csr);
++ return (struct crypto_csr *)csr;
++}
++
++struct crypto_csr * crypto_csr_verify(const struct wpabuf *req)
++{
++ /* future: look for alternatives to MBEDTLS_PRIVATE() access */
++
++ /* sole caller src/common/dpp_crypto.c:dpp_validate_csr()
++ * uses (mbedtls_x509_csr *) to obtain CSR_ATTR_CHALLENGE_PASSWORD
++ * so allocate different object (mbedtls_x509_csr *) and special-case
++ * object when used in crypto_csr_get_attribute() and when free()d in
++ * crypto_csr_deinit(). */
++
++ mbedtls_x509_csr *csr = os_malloc(sizeof(*csr));
++ if (csr == NULL)
++ return NULL;
++ mbedtls_x509_csr_init(csr);
++ const mbedtls_md_info_t *md_info;
++ unsigned char digest[MBEDTLS_MD_MAX_SIZE];
++ if (mbedtls_x509_csr_parse_der(csr,wpabuf_head(req),wpabuf_len(req))==0
++ && (md_info=mbedtls_md_info_from_type(csr->MBEDTLS_PRIVATE(sig_md)))
++ != NULL
++ && mbedtls_md(md_info, csr->cri.p, csr->cri.len, digest) == 0) {
++ switch (mbedtls_pk_verify(&csr->pk,csr->MBEDTLS_PRIVATE(sig_md),
++ digest, mbedtls_md_get_size(md_info),
++ csr->MBEDTLS_PRIVATE(sig).p,
++ csr->MBEDTLS_PRIVATE(sig).len)) {
++ case 0:
++ /*case MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH:*//* XXX: allow? */
++ return (struct crypto_csr *)((uintptr_t)csr | 1uL);
++ default:
++ break;
++ }
++ }
++
++ mbedtls_x509_csr_free(csr);
++ os_free(csr);
++ return NULL;
++}
++
++void crypto_csr_deinit(struct crypto_csr *csr)
++{
++ if ((uintptr_t)csr & 1uL) {
++ csr = (struct crypto_csr *)((uintptr_t)csr & ~1uL);
++ mbedtls_x509_csr_free((mbedtls_x509_csr *)csr);
++ }
++ else
++ mbedtls_x509write_csr_free((mbedtls_x509write_csr *)csr);
++ os_free(csr);
++}
++
++int crypto_csr_set_ec_public_key(struct crypto_csr *csr,
++ struct crypto_ec_key *key)
++{
++ mbedtls_x509write_csr_set_key((mbedtls_x509write_csr *)csr,
++ (mbedtls_pk_context *)key);
++ return 0;
++}
++
++int crypto_csr_set_name(struct crypto_csr *csr, enum crypto_csr_name type,
++ const char *name)
++{
++ /* specialized for src/common/dpp_crypto.c */
++
++ /* sole caller src/common/dpp_crypto.c:dpp_build_csr()
++ * calls this function only once, using type == CSR_NAME_CN
++ * (If called more than once, this code would need to append
++ * components to the subject name, which we could do by
++ * appending to (mbedtls_x509write_csr *) private member
++ * mbedtls_asn1_named_data *MBEDTLS_PRIVATE(subject)) */
++
++ const char *label;
++ switch (type) {
++ case CSR_NAME_CN: label = "CN="; break;
++ case CSR_NAME_SN: label = "SN="; break;
++ case CSR_NAME_C: label = "C="; break;
++ case CSR_NAME_O: label = "O="; break;
++ case CSR_NAME_OU: label = "OU="; break;
++ default: return -1;
++ }
++
++ size_t len = strlen(name);
++ struct wpabuf *buf = wpabuf_alloc(3+len+1);
++ if (buf == NULL)
++ return -1;
++ wpabuf_put_data(buf, label, strlen(label));
++ wpabuf_put_data(buf, name, len+1); /*(include trailing '\0')*/
++ /* Note: 'name' provided is set as given and should be backslash-escaped
++ * by caller when necessary, e.g. literal ',' which are not separating
++ * components should be backslash-escaped */
++
++ int ret =
++ mbedtls_x509write_csr_set_subject_name((mbedtls_x509write_csr *)csr,
++ wpabuf_head(buf)) ? -1 : 0;
++ wpabuf_free(buf);
++ return ret;
++}
++
++/* OBJ_pkcs9_challengePassword 1 2 840 113549 1 9 7 */
++static const char OBJ_pkcs9_challengePassword[] = MBEDTLS_OID_PKCS9 "\x07";
++
++int crypto_csr_set_attribute(struct crypto_csr *csr, enum crypto_csr_attr attr,
++ int attr_type, const u8 *value, size_t len)
++{
++ /* specialized for src/common/dpp_crypto.c */
++ /* sole caller src/common/dpp_crypto.c:dpp_build_csr() passes
++ * attr == CSR_ATTR_CHALLENGE_PASSWORD
++ * attr_type == ASN1_TAG_UTF8STRING */
++
++ const char *oid;
++ size_t oid_len;
++ switch (attr) {
++ case CSR_ATTR_CHALLENGE_PASSWORD:
++ oid = OBJ_pkcs9_challengePassword;
++ oid_len = sizeof(OBJ_pkcs9_challengePassword)-1;
++ break;
++ default:
++ return -1;
++ }
++
++ #if 0 /*(incorrect; sets an extension, not an attribute)*/
++ return mbedtls_x509write_csr_set_extension((mbedtls_x509write_csr *)csr,
++ oid, oid_len,
++ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
++ 0, /*(critical flag)*/
++ #endif
++ value, len) ? -1 : 0;
++ #else
++ (void)oid;
++ (void)oid_len;
++ #endif
++
++ /* mbedtls does not currently provide way to set an attribute in a CSR:
++ * https://github.com/Mbed-TLS/mbedtls/issues/4886 */
++ wpa_printf(MSG_ERROR,
++ "mbedtls does not currently support setting challengePassword "
++ "attribute in CSR");
++ return -1;
++}
++
++const u8 * mbedtls_x509_csr_attr_oid_value(mbedtls_x509_csr *csr,
++ const char *oid, size_t oid_len,
++ size_t *vlen, int *vtype)
++{
++ /* Note: mbedtls_x509_csr_parse_der() has parsed and validated CSR,
++ * so validation checks are not repeated here
++ *
++ * It would be nicer if (mbedtls_x509_csr *) had an mbedtls_x509_buf of
++ * Attributes (or at least a pointer) since mbedtls_x509_csr_parse_der()
++ * already parsed the rest of CertificationRequestInfo, some of which is
++ * repeated here to step to Attributes. Since csr->subject_raw.p points
++ * into csr->cri.p, which points into csr->raw.p, step over version and
++ * subject of CertificationRequestInfo (SEQUENCE) */
++ unsigned char *p = csr->subject_raw.p + csr->subject_raw.len;
++ unsigned char *end = csr->cri.p + csr->cri.len, *ext;
++ size_t len;
++
++ /* step over SubjectPublicKeyInfo */
++ mbedtls_asn1_get_tag(&p, end, &len,
++ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
++ p += len;
++
++ /* Attributes
++ * { ATTRIBUTE:IOSet } ::= SET OF { SEQUENCE { OID, value } }
++ */
++ if (mbedtls_asn1_get_tag(&p, end, &len,
++ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_CONTEXT_SPECIFIC) != 0) {
++ return NULL;
++ }
++ while (p < end) {
++ if (mbedtls_asn1_get_tag(&p, end, &len,
++ MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE) != 0) {
++ return NULL;
++ }
++ ext = p;
++ p += len;
++
++ if (mbedtls_asn1_get_tag(&ext,end,&len,MBEDTLS_ASN1_OID) != 0)
++ return NULL;
++ if (oid_len != len || 0 != memcmp(ext, oid, oid_len))
++ continue;
++
++ /* found oid; return value */
++ *vtype = *ext++; /* tag */
++ return (mbedtls_asn1_get_len(&ext,end,vlen) == 0) ? ext : NULL;
++ }
++
++ return NULL;
++}
++
++const u8 * crypto_csr_get_attribute(struct crypto_csr *csr,
++ enum crypto_csr_attr attr,
++ size_t *len, int *type)
++{
++ /* specialized for src/common/dpp_crypto.c */
++ /* sole caller src/common/dpp_crypto.c:dpp_build_csr() passes
++ * attr == CSR_ATTR_CHALLENGE_PASSWORD */
++
++ const char *oid;
++ size_t oid_len;
++ switch (attr) {
++ case CSR_ATTR_CHALLENGE_PASSWORD:
++ oid = OBJ_pkcs9_challengePassword;
++ oid_len = sizeof(OBJ_pkcs9_challengePassword)-1;
++ break;
++ default:
++ return NULL;
++ }
++
++ /* see crypto_csr_verify(); expecting (mbedtls_x509_csr *) tagged |=1 */
++ if (!((uintptr_t)csr & 1uL))
++ return NULL;
++ csr = (struct crypto_csr *)((uintptr_t)csr & ~1uL);
++
++ return mbedtls_x509_csr_attr_oid_value((mbedtls_x509_csr *)csr,
++ oid, oid_len, len, type);
++}
++
++struct wpabuf * crypto_csr_sign(struct crypto_csr *csr,
++ struct crypto_ec_key *key,
++ enum crypto_hash_alg algo)
++{
++ mbedtls_md_type_t sig_md;
++ switch (algo) {
++ #ifdef MBEDTLS_SHA256_C
++ case CRYPTO_HASH_ALG_SHA256: sig_md = MBEDTLS_MD_SHA256; break;
++ #endif
++ #ifdef MBEDTLS_SHA512_C
++ case CRYPTO_HASH_ALG_SHA384: sig_md = MBEDTLS_MD_SHA384; break;
++ case CRYPTO_HASH_ALG_SHA512: sig_md = MBEDTLS_MD_SHA512; break;
++ #endif
++ default:
++ return NULL;
++ }
++ mbedtls_x509write_csr_set_md_alg((mbedtls_x509write_csr *)csr, sig_md);
++
++ #if 0
++ unsigned char key_usage = MBEDTLS_X509_KU_DIGITAL_SIGNATURE
++ | MBEDTLS_X509_KU_KEY_CERT_SIGN;
++ if (mbedtls_x509write_csr_set_key_usage((mbedtls_x509write_csr *)csr,
++ key_usage))
++ return NULL;
++ #endif
++
++ #if 0
++ unsigned char ns_cert_type = MBEDTLS_X509_NS_CERT_TYPE_SSL_CLIENT
++ | MBEDTLS_X509_NS_CERT_TYPE_EMAIL;
++ if (mbedtls_x509write_csr_set_ns_cert_type((mbedtls_x509write_csr *)csr,
++ ns_cert_type))
++ return NULL;
++ #endif
++
++ #if 0
++ /* mbedtls does not currently provide way to set an attribute in a CSR:
++ * https://github.com/Mbed-TLS/mbedtls/issues/4886
++ * XXX: hwsim dpp_enterprise test fails due to this limitation.
++ *
++ * Current usage of this function is solely by dpp_build_csr(),
++ * so as a kludge, might consider custom (struct crypto_csr *)
++ * containing (mbedtls_x509write_csr *) and a list of attributes
++ * (i.e. challengePassword). Might have to totally reimplement
++ * mbedtls_x509write_csr_der(); underlying x509write_csr_der_internal()
++ * handles signing the CSR. (This is more work that appending an
++ * Attributes section to end of CSR and adjusting ASN.1 length of CSR.)
++ */
++ #endif
++
++ unsigned char buf[4096]; /* XXX: large enough? too large? */
++ int len = mbedtls_x509write_csr_der((mbedtls_x509write_csr *)csr,
++ buf, sizeof(buf),
++ mbedtls_ctr_drbg_random,
++ crypto_mbedtls_ctr_drbg());
++ if (len < 0)
++ return NULL;
++ /* Note: data is written at the end of the buffer! Use the
++ * return value to determine where you should start
++ * using the buffer */
++ return wpabuf_alloc_copy(buf+sizeof(buf)-len, (size_t)len);
++}
++
++#endif /* CRYPTO_MBEDTLS_CRYPTO_CSR */
++
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_PKCS7
++
++#if 0
++#include <mbedtls/pkcs7.h> /* PKCS7 is not currently supported in mbedtls */
++#include <mbedtls/pem.h>
++#endif
++
++struct wpabuf * crypto_pkcs7_get_certificates(const struct wpabuf *pkcs7)
++{
++ /* PKCS7 is not currently supported in mbedtls */
++ return NULL;
++
++#if 0
++ /* https://github.com/naynajain/mbedtls-1 branch: development-pkcs7
++ * (??? potential future contribution to mbedtls ???) */
++
++ /* Note: PKCS7 signature *is not* verified by this function.
++ * The function interface does not provide for passing a certificate */
++
++ mbedtls_pkcs7 mpkcs7;
++ mbedtls_pkcs7_init(&mpkcs7);
++ int pkcs7_type = mbedtls_pkcs7_parse_der(wpabuf_head(pkcs7),
++ wpabuf_len(pkcs7),
++ &mpkcs7);
++ wpabuf *buf = NULL;
++ do {
++ if (pkcs7_type < 0)
++ break;
++
++ /* src/common/dpp.c:dpp_parse_cred_dot1x() interested in certs
++ * for wpa_supplicant/dpp_supplicant.c:wpas_dpp_add_network()
++ * (? are adding certificate headers and footers desired ?) */
++
++ /* development-pkcs7 branch does not currently provide
++ * additional interfaces to retrieve the parsed data */
++
++ mbedtls_x509_crt *certs =
++ &mpkcs7.MBEDTLS_PRIVATE(signed_data).MBEDTLS_PRIVATE(certs);
++ int ncerts =
++ mpkcs7.MBEDTLS_PRIVATE(signed_data).MBEDTLS_PRIVATE(no_of_certs);
++
++ /* allocate buffer for PEM (base64-encoded DER)
++ * plus header, footer, newlines, and some extra */
++ buf = wpabuf_alloc((wpabuf_len(pkcs7)+2)/3*4 + ncerts*64);
++ if (buf == NULL)
++ break;
++
++ #define PEM_BEGIN_CRT "-----BEGIN CERTIFICATE-----\n"
++ #define PEM_END_CRT "-----END CERTIFICATE-----\n"
++ size_t olen;
++ for (int i = 0; i < ncerts; ++i) {
++ int ret = mbedtls_pem_write_buffer(
++ PEM_BEGIN_CRT, PEM_END_CRT,
++ certs[i].raw.p, certs[i].raw.len,
++ wpabuf_mhead(buf, 0), wpabuf_tailroom(buf),
++ &olen));
++ if (ret == 0)
++ wpabuf_put(buf, olen);
++ } else {
++ if (ret == MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL)
++ ret = wpabuf_resize(
++ &buf,olen-wpabuf_tailroom(buf));
++ if (ret == 0) {
++ --i;/*(adjust loop iterator for retry)*/
++ continue;
++ }
++ wpabuf_free(buf);
++ buf = NULL;
++ break;
++ }
++ }
++ } while (0);
++
++ mbedtls_pkcs7_free(&mpkcs7);
++ return buf;
++#endif
++}
++
++#endif /* CRYPTO_MBEDTLS_CRYPTO_PKCS7 */
++
++
++#ifdef MBEDTLS_ARC4_C
++#include <mbedtls/arc4.h>
++int rc4_skip(const u8 *key, size_t keylen, size_t skip,
++ u8 *data, size_t data_len)
++{
++ mbedtls_arc4_context ctx;
++ mbedtls_arc4_init(&ctx);
++ mbedtls_arc4_setup(&ctx, key, keylen);
++
++ if (skip) {
++ /*(prefer [16] on ancient hardware with smaller cache lines)*/
++ unsigned char skip_buf[64]; /*('skip' is generally small)*/
++ /*os_memset(skip_buf, 0, sizeof(skip_buf));*/ /*(necessary?)*/
++ size_t len;
++ do {
++ len = skip > sizeof(skip_buf) ? sizeof(skip_buf) : skip;
++ mbedtls_arc4_crypt(&ctx, len, skip_buf, skip_buf);
++ } while ((skip -= len));
++ }
++
++ int ret = mbedtls_arc4_crypt(&ctx, data_len, data, data);
++ mbedtls_arc4_free(&ctx);
++ return ret;
++}
++#endif
++
++
++/* duplicated in tls_mbedtls.c:tls_mbedtls_readfile()*/
++__attribute_noinline__
++static int crypto_mbedtls_readfile(const char *path, u8 **buf, size_t *n)
++{
++ #if 0 /* #ifdef MBEDTLS_FS_IO */
++ /*(includes +1 for '\0' needed by mbedtls PEM parsing funcs)*/
++ if (mbedtls_pk_load_file(path, (unsigned char **)buf, n) != 0) {
++ wpa_printf(MSG_ERROR, "error: mbedtls_pk_load_file %s", path);
++ return -1;
++ }
++ #else
++ /*(use os_readfile() so that we can use os_free()
++ *(if we use mbedtls_pk_load_file() above, macros prevent calling free()
++ * directly #if defined(OS_REJECT_C_LIB_FUNCTIONS) and calling os_free()
++ * on buf aborts in tests if buf not allocated via os_malloc())*/
++ *buf = (u8 *)os_readfile(path, n);
++ if (!*buf) {
++ wpa_printf(MSG_ERROR, "error: os_readfile %s", path);
++ return -1;
++ }
++ u8 *buf0 = os_realloc(*buf, *n+1);
++ if (!buf0) {
++ bin_clear_free(*buf, *n);
++ *buf = NULL;
++ return -1;
++ }
++ buf0[(*n)++] = '\0';
++ *buf = buf0;
++ #endif
++ return 0;
++}
++
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_RSA
++#ifdef MBEDTLS_RSA_C
++
++#include <mbedtls/pk.h>
++#include <mbedtls/rsa.h>
++
++struct crypto_rsa_key * crypto_rsa_key_read(const char *file, bool private_key)
++{
++ /* mbedtls_pk_parse_keyfile() and mbedtls_pk_parse_public_keyfile()
++ * require #ifdef MBEDTLS_FS_IO in mbedtls library. Prefer to use
++ * crypto_mbedtls_readfile(), which wraps os_readfile() */
++ u8 *data;
++ size_t len;
++ if (crypto_mbedtls_readfile(file, &data, &len) != 0)
++ return NULL;
++
++ mbedtls_pk_context *ctx = os_malloc(sizeof(*ctx));
++ if (ctx == NULL) {
++ bin_clear_free(data, len);
++ return NULL;
++ }
++ mbedtls_pk_init(ctx);
++
++ int rc;
++ rc = (private_key
++ ? mbedtls_pk_parse_key(ctx, data, len, NULL, 0
++ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
++ ,mbedtls_ctr_drbg_random,
++ crypto_mbedtls_ctr_drbg()
++ #endif
++ )
++ : mbedtls_pk_parse_public_key(ctx, data, len)) == 0
++ && mbedtls_pk_can_do(ctx, MBEDTLS_PK_RSA);
++
++ bin_clear_free(data, len);
++
++ if (rc) {
++ /* use MBEDTLS_RSA_PKCS_V21 padding for RSAES-OAEP */
++ /* use MBEDTLS_MD_SHA256 for these hostap interfaces */
++ #if MBEDTLS_VERSION_NUMBER < 0x03000000 /* mbedtls 3.0.0 */
++ /*(no return value in mbedtls 2.x)*/
++ mbedtls_rsa_set_padding(mbedtls_pk_rsa(*ctx),
++ MBEDTLS_RSA_PKCS_V21,
++ MBEDTLS_MD_SHA256);
++ #else
++ if (mbedtls_rsa_set_padding(mbedtls_pk_rsa(*ctx),
++ MBEDTLS_RSA_PKCS_V21,
++ MBEDTLS_MD_SHA256) == 0)
++ #endif
++ return (struct crypto_rsa_key *)ctx;
++ }
++
++ mbedtls_pk_free(ctx);
++ os_free(ctx);
++ return NULL;
++}
++
++struct wpabuf * crypto_rsa_oaep_sha256_encrypt(struct crypto_rsa_key *key,
++ const struct wpabuf *in)
++{
++ mbedtls_rsa_context *pk_rsa = mbedtls_pk_rsa(*(mbedtls_pk_context*)key);
++ size_t olen = mbedtls_rsa_get_len(pk_rsa);
++ struct wpabuf *buf = wpabuf_alloc(olen);
++ if (buf == NULL)
++ return NULL;
++
++ /* mbedtls_pk_encrypt() takes a few more hops to get to same func */
++ if (mbedtls_rsa_rsaes_oaep_encrypt(pk_rsa,
++ mbedtls_ctr_drbg_random,
++ crypto_mbedtls_ctr_drbg(),
++ #if MBEDTLS_VERSION_NUMBER < 0x03000000 /* mbedtls 3.0.0 */
++ MBEDTLS_RSA_PRIVATE,
++ #endif
++ NULL, 0,
++ wpabuf_len(in), wpabuf_head(in),
++ wpabuf_put(buf, olen)) == 0) {
++ return buf;
++ }
++
++ wpabuf_clear_free(buf);
++ return NULL;
++}
++
++struct wpabuf * crypto_rsa_oaep_sha256_decrypt(struct crypto_rsa_key *key,
++ const struct wpabuf *in)
++{
++ mbedtls_rsa_context *pk_rsa = mbedtls_pk_rsa(*(mbedtls_pk_context*)key);
++ size_t olen = mbedtls_rsa_get_len(pk_rsa);
++ struct wpabuf *buf = wpabuf_alloc(olen);
++ if (buf == NULL)
++ return NULL;
++
++ /* mbedtls_pk_decrypt() takes a few more hops to get to same func */
++ if (mbedtls_rsa_rsaes_oaep_decrypt(pk_rsa,
++ mbedtls_ctr_drbg_random,
++ crypto_mbedtls_ctr_drbg(),
++ #if MBEDTLS_VERSION_NUMBER < 0x03000000 /* mbedtls 3.0.0 */
++ MBEDTLS_RSA_PUBLIC,
++ #endif
++ NULL, 0, &olen, wpabuf_head(in),
++ wpabuf_mhead(buf), olen) == 0) {
++ wpabuf_put(buf, olen);
++ return buf;
++ }
++
++ wpabuf_clear_free(buf);
++ return NULL;
++}
++
++void crypto_rsa_key_free(struct crypto_rsa_key *key)
++{
++ mbedtls_pk_free((mbedtls_pk_context *)key);
++ os_free(key);
++}
++
++#endif /* MBEDTLS_RSA_C */
++#endif /* CRYPTO_MBEDTLS_CRYPTO_RSA */
++
++#ifdef CRYPTO_MBEDTLS_CRYPTO_HPKE
++
++struct wpabuf * hpke_base_seal(enum hpke_kem_id kem_id,
++ enum hpke_kdf_id kdf_id,
++ enum hpke_aead_id aead_id,
++ struct crypto_ec_key *peer_pub,
++ const u8 *info, size_t info_len,
++ const u8 *aad, size_t aad_len,
++ const u8 *pt, size_t pt_len)
++{
++ /* not yet implemented */
++ return NULL;
++}
++
++struct wpabuf * hpke_base_open(enum hpke_kem_id kem_id,
++ enum hpke_kdf_id kdf_id,
++ enum hpke_aead_id aead_id,
++ struct crypto_ec_key *own_priv,
++ const u8 *info, size_t info_len,
++ const u8 *aad, size_t aad_len,
++ const u8 *enc_ct, size_t enc_ct_len)
++{
++ /* not yet implemented */
++ return NULL;
++}
++
++#endif
+diff --git a/src/crypto/crypto_module_tests.c b/src/crypto/crypto_module_tests.c
+index ffeddbadd..07c36d850 100644
+--- a/src/crypto/crypto_module_tests.c
++++ b/src/crypto/crypto_module_tests.c
+@@ -2470,6 +2470,139 @@ static int test_hpke(void)
+ }
+
+
++static int test_ecc(void)
++{
++#ifdef CONFIG_ECC
++#ifndef CONFIG_TLS_INTERNAL
++#ifndef CONFIG_TLS_GNUTLS
++#if defined(CONFIG_TLS_MBEDTLS) \
++ || defined(CONFIG_TLS_OPENSSL) \
++ || defined(CONFIG_TLS_WOLFSSL)
++ wpa_printf(MSG_INFO, "Testing ECC");
++ /* Note: some tests below are valid on supported Short Weierstrass
++ * curves, but not on Montgomery curves (e.g. IKE groups 31 and 32)
++ * (e.g. deriving and comparing y^2 test below not valid on Montgomery)
++ */
++#ifdef CONFIG_TLS_MBEDTLS
++ const int grps[] = {19, 20, 21, 25, 26, 28};
++#endif
++#ifdef CONFIG_TLS_OPENSSL
++ const int grps[] = {19, 20, 21, 26};
++#endif
++#ifdef CONFIG_TLS_WOLFSSL
++ const int grps[] = {19, 20, 21, 26};
++#endif
++ uint32_t i;
++ struct crypto_ec *e = NULL;
++ struct crypto_ec_point *p = NULL, *q = NULL;
++ struct crypto_bignum *x = NULL, *y = NULL;
++#ifdef CONFIG_DPP
++ u8 bin[4096];
++#endif
++ for (i = 0; i < ARRAY_SIZE(grps); ++i) {
++ e = crypto_ec_init(grps[i]);
++ if (e == NULL
++ || crypto_ec_prime_len(e) == 0
++ || crypto_ec_prime_len_bits(e) == 0
++ || crypto_ec_order_len(e) == 0
++ || crypto_ec_get_prime(e) == NULL
++ || crypto_ec_get_order(e) == NULL
++ || crypto_ec_get_a(e) == NULL
++ || crypto_ec_get_b(e) == NULL
++ || crypto_ec_get_generator(e) == NULL) {
++ break;
++ }
++#ifdef CONFIG_DPP
++ struct crypto_ec_key *key = crypto_ec_key_gen(grps[i]);
++ if (key == NULL)
++ break;
++ p = crypto_ec_key_get_public_key(key);
++ q = crypto_ec_key_get_public_key(key);
++ crypto_ec_key_deinit(key);
++ if (p == NULL || q == NULL)
++ break;
++ if (!crypto_ec_point_is_on_curve(e, p))
++ break;
++
++ /* inverted point should not match original;
++ * double-invert should match */
++ if (crypto_ec_point_invert(e, q) != 0
++ || crypto_ec_point_cmp(e, p, q) == 0
++ || crypto_ec_point_invert(e, q) != 0
++ || crypto_ec_point_cmp(e, p, q) != 0) {
++ break;
++ }
++
++ /* crypto_ec_point_to_bin() and crypto_ec_point_from_bin()
++ * imbalanced interfaces? */
++ size_t prime_len = crypto_ec_prime_len(e);
++ if (prime_len * 2 > sizeof(bin))
++ break;
++ if (crypto_ec_point_to_bin(e, p, bin, bin+prime_len) != 0)
++ break;
++ struct crypto_ec_point *tmp = crypto_ec_point_from_bin(e, bin);
++ if (tmp == NULL)
++ break;
++ if (crypto_ec_point_cmp(e, p, tmp) != 0) {
++ crypto_ec_point_deinit(tmp, 0);
++ break;
++ }
++ crypto_ec_point_deinit(tmp, 0);
++
++ x = crypto_bignum_init();
++ y = crypto_bignum_init_set(bin+prime_len, prime_len);
++ if (x == NULL || y == NULL || crypto_ec_point_x(e, p, x) != 0)
++ break;
++ struct crypto_bignum *y2 = crypto_ec_point_compute_y_sqr(e, x);
++ if (y2 == NULL)
++ break;
++ if (crypto_bignum_sqrmod(y, crypto_ec_get_prime(e), y) != 0
++ || crypto_bignum_cmp(y, y2) != 0) {
++ crypto_bignum_deinit(y2, 0);
++ break;
++ }
++ crypto_bignum_deinit(y2, 0);
++ crypto_bignum_deinit(x, 0);
++ crypto_bignum_deinit(y, 0);
++ x = NULL;
++ y = NULL;
++
++ x = crypto_bignum_init();
++ if (x == NULL)
++ break;
++ if (crypto_bignum_rand(x, crypto_ec_get_prime(e)) != 0)
++ break;
++ crypto_bignum_deinit(x, 0);
++ x = NULL;
++
++ crypto_ec_point_deinit(p, 0);
++ p = NULL;
++ crypto_ec_point_deinit(q, 0);
++ q = NULL;
++#endif /* CONFIG_DPP */
++ crypto_ec_deinit(e);
++ e = NULL;
++ }
++ if (i != ARRAY_SIZE(grps)) {
++ crypto_bignum_deinit(x, 0);
++ crypto_bignum_deinit(y, 0);
++ crypto_ec_point_deinit(p, 0);
++ crypto_ec_point_deinit(q, 0);
++ crypto_ec_deinit(e);
++ wpa_printf(MSG_INFO,
++ "ECC test case failed tls_id:%d", grps[i]);
++ return -1;
++ }
++
++ wpa_printf(MSG_INFO, "ECC test cases passed");
++#endif
++#endif /* !CONFIG_TLS_GNUTLS */
++#endif /* !CONFIG_TLS_INTERNAL */
++#endif /* CONFIG_ECC */
++ return 0;
++}
++
++
+ static int test_ms_funcs(void)
+ {
+ #ifndef CONFIG_FIPS
+@@ -2591,6 +2724,7 @@ int crypto_module_tests(void)
+ test_fips186_2_prf() ||
+ test_extract_expand_hkdf() ||
+ test_hpke() ||
++ test_ecc() ||
+ test_ms_funcs())
+ ret = -1;
+
+diff --git a/src/crypto/crypto_wolfssl.c b/src/crypto/crypto_wolfssl.c
+index 269174321..a554fd8a8 100644
+--- a/src/crypto/crypto_wolfssl.c
++++ b/src/crypto/crypto_wolfssl.c
+@@ -1633,6 +1633,7 @@ struct crypto_ec {
+ #ifdef CONFIG_DPP
+ ecc_point *g; /* Only used in DPP for now */
+ #endif /* CONFIG_DPP */
++ WC_RNG rng;
+ mp_int a;
+ mp_int prime;
+ mp_int order;
+@@ -1666,6 +1667,20 @@ struct crypto_ec * crypto_ec_init(int group)
+ e->key = ecc_key_init();
+ if (!e->key) {
+ LOG_WOLF_ERROR_FUNC_NULL(ecc_key_init);
++
++ if (wc_ecc_init(e->key) != 0 ||
++ wc_InitRng(e->rng) != 0 ||
++ wc_ecc_set_rng(e->key, e->rng) != 0 ||
++ wc_ecc_set_curve(e->key, 0, curve_id) != 0 ||
++ mp_init(e->a) != MP_OKAY ||
++ mp_init(e->prime) != MP_OKAY ||
++ mp_init(e->order) != MP_OKAY ||
++ mp_init(e->b) != MP_OKAY ||
++ mp_read_radix(e->a, e->key.dp->Af, 16) != MP_OKAY ||
++ mp_read_radix(e->b, e->key.dp->Bf, 16) != MP_OKAY ||
++ mp_read_radix(e->prime, e->key.dp->prime, 16) != MP_OKAY ||
++ mp_read_radix(e->order, e->key.dp->order, 16) != MP_OKAY ||
++ mp_montgomery_setup(e->prime, e->mont_b) != MP_OKAY)
+ goto done;
+ }
+
+@@ -1764,6 +1779,9 @@ void crypto_ec_deinit(struct crypto_ec* e)
+ #endif /* CONFIG_DPP */
+ if (e->own_key)
+ ecc_key_deinit(e->key);
++
++ wc_FreeRng(e->rng);
++ wc_ecc_free(e->key);
+ os_free(e);
+ }
+
+diff --git a/src/crypto/tls_mbedtls.c b/src/crypto/tls_mbedtls.c
+new file mode 100644
+index 000000000..2580a3a27
+--- /dev/null
++++ b/src/crypto/tls_mbedtls.c
+@@ -0,0 +1,3313 @@
++/*
++ * SSL/TLS interface functions for mbed TLS
++ *
++ * SPDX-FileCopyrightText: 2022 Glenn Strauss <gstrauss@gluelogic.com>
++ * SPDX-License-Identifier: BSD-3-Clause
++ *
++ * This software may be distributed under the terms of the BSD license.
++ * See README for more details.
++ *
++ * template: src/crypto/tls_none.c
++ * reference: src/crypto/tls_*.c
++ *
++ * Known Limitations:
++ * - no TLSv1.3 (not available in mbedtls 2.x; experimental in mbedtls 3.x)
++ * - no OCSP (not yet available in mbedtls)
++ * - mbedtls does not support all certificate encodings used by hwsim tests
++ * PCKS#5 v1.5
++ * PCKS#12
++ * DH DSA
++ * - EAP-FAST, EAP-TEAP session ticket support not implemented in tls_mbedtls.c
++ * - mbedtls does not currently provide way to set an attribute in a CSR
++ * https://github.com/Mbed-TLS/mbedtls/issues/4886
++ * so tests/hwsim dpp_enterprise tests fail
++ * - DPP2 not supported
++ * PKCS#7 parsing is not supported in mbedtls
++ * See crypto_mbedtls.c:crypto_pkcs7_get_certificates() comments
++ * - DPP3 not supported
++ * hpke_base_seal() and hpke_base_seal() not implemented in crypto_mbedtls.c
++ *
++ * Status:
++ * - code written to be compatible with mbedtls 2.x and mbedtls 3.x
++ * (currently requires mbedtls >= 2.27.0 for mbedtls_mpi_random())
++ * (currently requires mbedtls >= 2.18.0 for mbedtls_ssl_tls_prf())
++ * - builds with tests/build/build-wpa_supplicant-mbedtls.config
++ * - passes all tests/ crypto module tests (incomplete coverage)
++ * ($ cd tests; make clean; make -j 4 run-tests CONFIG_TLS=mbedtls)
++ * - passes almost all tests/hwsim tests
++ * (hwsim tests skipped for missing features)
++ *
++ * RFE:
++ * - EAP-FAST, EAP-TEAP session ticket support not implemented in tls_mbedtls.c
++ * - client/server session resumption, and/or save client session ticket
++ */
++
++#include "includes.h"
++#include "common.h"
++
++#include <mbedtls/version.h>
++#include <mbedtls/ctr_drbg.h>
++#include <mbedtls/error.h>
++#include <mbedtls/oid.h>
++#include <mbedtls/pem.h>
++#include <mbedtls/platform.h> /* mbedtls_calloc() mbedtls_free() */
++#include <mbedtls/platform_util.h> /* mbedtls_platform_zeroize() */
++#include <mbedtls/ssl.h>
++#include <mbedtls/ssl_ticket.h>
++#include <mbedtls/x509.h>
++#include <mbedtls/x509_crt.h>
++
++#if MBEDTLS_VERSION_NUMBER >= 0x02040000 /* mbedtls 2.4.0 */
++#include <mbedtls/net_sockets.h>
++#else
++#include <mbedtls/net.h>
++#endif
++
++#ifndef MBEDTLS_PRIVATE
++#define MBEDTLS_PRIVATE(x) x
++#endif
++
++#if MBEDTLS_VERSION_NUMBER < 0x03020000 /* mbedtls 3.2.0 */
++#define mbedtls_ssl_get_ciphersuite_id_from_ssl(ssl) \
++ ((ssl)->MBEDTLS_PRIVATE(session) \
++ ?(ssl)->MBEDTLS_PRIVATE(session)->MBEDTLS_PRIVATE(ciphersuite) \
++ : 0)
++#define mbedtls_ssl_ciphersuite_get_name(info) \
++ (info)->MBEDTLS_PRIVATE(name)
++#endif
++
++#include "crypto.h" /* sha256_vector() */
++#include "tls.h"
++
++#ifndef SHA256_DIGEST_LENGTH
++#define SHA256_DIGEST_LENGTH 32
++#endif
++
++#ifndef MBEDTLS_EXPKEY_FIXED_SECRET_LEN
++#define MBEDTLS_EXPKEY_FIXED_SECRET_LEN 48
++#endif
++
++#ifndef MBEDTLS_EXPKEY_RAND_LEN
++#define MBEDTLS_EXPKEY_RAND_LEN 32
++#endif
++
++#if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
++static mbedtls_ssl_export_keys_t tls_connection_export_keys_cb;
++#elif MBEDTLS_VERSION_NUMBER >= 0x02120000 /* mbedtls 2.18.0 */
++static mbedtls_ssl_export_keys_ext_t tls_connection_export_keys_cb;
++#else /*(not implemented; return error)*/
++#define mbedtls_ssl_tls_prf(a,b,c,d,e,f,g,h) (-1)
++typedef mbedtls_tls_prf_types int;
++#endif
++
++
++/* hostapd/wpa_supplicant provides forced_memzero(),
++ * but prefer mbedtls_platform_zeroize() */
++#define forced_memzero(ptr,sz) mbedtls_platform_zeroize(ptr,sz)
++
++
++#if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST) \
++ || defined(EAP_TEAP) || defined(EAP_SERVER_TEAP)
++#ifdef MBEDTLS_SSL_SESSION_TICKETS
++#ifdef MBEDTLS_SSL_TICKET_C
++#define TLS_MBEDTLS_SESSION_TICKETS
++#if defined(EAP_TEAP) || defined(EAP_SERVER_TEAP)
++#define TLS_MBEDTLS_EAP_TEAP
++#endif
++#if !defined(CONFIG_FIPS) /* EAP-FAST keys cannot be exported in FIPS mode */
++#if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST)
++#define TLS_MBEDTLS_EAP_FAST
++#endif
++#endif
++#endif
++#endif
++#endif
++
++
++struct tls_conf {
++ mbedtls_ssl_config conf;
++
++ unsigned int verify_peer:1;
++ unsigned int verify_depth0_only:1;
++ unsigned int check_crl:2; /*(needs :2 bits for 0, 1, 2)*/
++ unsigned int check_crl_strict:1; /*(needs :1 bit for 0, 1)*/
++ unsigned int ca_cert_probe:1;
++ unsigned int has_ca_cert:1;
++ unsigned int has_client_cert:1;
++ unsigned int has_private_key:1;
++ unsigned int suiteb128:1;
++ unsigned int suiteb192:1;
++ mbedtls_x509_crl *crl;
++ mbedtls_x509_crt ca_cert;
++ mbedtls_x509_crt client_cert;
++ mbedtls_pk_context private_key;
++
++ uint32_t refcnt;
++
++ unsigned int flags;
++ char *subject_match;
++ char *altsubject_match;
++ char *suffix_match;
++ char *domain_match;
++ char *check_cert_subject;
++ u8 ca_cert_hash[SHA256_DIGEST_LENGTH];
++
++ int *ciphersuites; /* list of ciphersuite ids for mbedtls_ssl_config */
++#if MBEDTLS_VERSION_NUMBER < 0x03010000 /* mbedtls 3.1.0 */
++ mbedtls_ecp_group_id *curves;
++#else
++ uint16_t *curves; /* list of curve ids for mbedtls_ssl_config */
++#endif
++};
++
++
++struct tls_global {
++ struct tls_conf *tls_conf;
++ char *ocsp_stapling_response;
++ mbedtls_ctr_drbg_context *ctr_drbg; /*(see crypto_mbedtls.c)*/
++ #ifdef MBEDTLS_SSL_SESSION_TICKETS
++ mbedtls_ssl_ticket_context ticket_ctx;
++ #endif
++ char *ca_cert_file;
++ struct os_reltime crl_reload_previous;
++ unsigned int crl_reload_interval;
++ uint32_t refcnt;
++ struct tls_config init_conf;
++};
++
++static struct tls_global tls_ctx_global;
++
++
++struct tls_connection {
++ struct tls_conf *tls_conf;
++ struct wpabuf *push_buf;
++ struct wpabuf *pull_buf;
++ size_t pull_buf_offset;
++
++ unsigned int established:1;
++ unsigned int resumed:1;
++ unsigned int verify_peer:1;
++ unsigned int is_server:1;
++
++ mbedtls_ssl_context ssl;
++
++ mbedtls_tls_prf_types tls_prf_type;
++ size_t expkey_keyblock_size;
++ size_t expkey_secret_len;
++ #if MBEDTLS_VERSION_NUMBER < 0x03000000 /* mbedtls 3.0.0 */
++ unsigned char expkey_secret[MBEDTLS_EXPKEY_FIXED_SECRET_LEN];
++ #else
++ unsigned char expkey_secret[MBEDTLS_MD_MAX_SIZE];
++ #endif
++ unsigned char expkey_randbytes[MBEDTLS_EXPKEY_RAND_LEN*2];
++
++ int read_alerts, write_alerts, failed;
++
++ #ifdef TLS_MBEDTLS_SESSION_TICKETS
++ tls_session_ticket_cb session_ticket_cb;
++ void *session_ticket_cb_ctx;
++ unsigned char *clienthello_session_ticket;
++ size_t clienthello_session_ticket_len;
++ #endif
++ char *peer_subject; /* peer subject info for authenticated peer */
++ struct wpabuf *success_data;
++};
++
++
++#ifndef __has_attribute
++#define __has_attribute(x) 0
++#endif
++
++#ifndef __GNUC_PREREQ
++#define __GNUC_PREREQ(maj,min) 0
++#endif
++
++#ifndef __attribute_cold__
++#if __has_attribute(cold) \
++ || __GNUC_PREREQ(4,3)
++#define __attribute_cold__ __attribute__((__cold__))
++#else
++#define __attribute_cold__
++#endif
++#endif
++
++#ifndef __attribute_noinline__
++#if __has_attribute(noinline) \
++ || __GNUC_PREREQ(3,1)
++#define __attribute_noinline__ __attribute__((__noinline__))
++#else
++#define __attribute_noinline__
++#endif
++#endif
++
++
++__attribute_cold__
++__attribute_noinline__
++static void emsg(int level, const char * const msg)
++{
++ wpa_printf(level, "MTLS: %s", msg);
++}
++
++
++__attribute_cold__
++__attribute_noinline__
++static void emsgrc(int level, const char * const msg, int rc)
++{
++ #ifdef MBEDTLS_ERROR_C
++ /* error logging convenience function that decodes mbedtls result codes */
++ char buf[256];
++ mbedtls_strerror(rc, buf, sizeof(buf));
++ wpa_printf(level, "MTLS: %s: %s (-0x%04x)", msg, buf, -rc);
++ #else
++ wpa_printf(level, "MTLS: %s: (-0x%04x)", msg, -rc);
++ #endif
++}
++
++
++#define elog(rc, msg) emsgrc(MSG_ERROR, (msg), (rc))
++#define ilog(rc, msg) emsgrc(MSG_INFO, (msg), (rc))
++
++
++struct tls_conf * tls_conf_init(void *tls_ctx)
++{
++ struct tls_conf *tls_conf = os_zalloc(sizeof(*tls_conf));
++ if (tls_conf == NULL)
++ return NULL;
++ tls_conf->refcnt = 1;
++
++ mbedtls_ssl_config_init(&tls_conf->conf);
++ mbedtls_ssl_conf_rng(&tls_conf->conf,
++ mbedtls_ctr_drbg_random, tls_ctx_global.ctr_drbg);
++ mbedtls_x509_crt_init(&tls_conf->ca_cert);
++ mbedtls_x509_crt_init(&tls_conf->client_cert);
++ mbedtls_pk_init(&tls_conf->private_key);
++
++ return tls_conf;
++}
++
++
++void tls_conf_deinit(struct tls_conf *tls_conf)
++{
++ if (tls_conf == NULL || --tls_conf->refcnt != 0)
++ return;
++
++ mbedtls_x509_crt_free(&tls_conf->ca_cert);
++ mbedtls_x509_crt_free(&tls_conf->client_cert);
++ if (tls_conf->crl) {
++ mbedtls_x509_crl_free(tls_conf->crl);
++ os_free(tls_conf->crl);
++ }
++ mbedtls_pk_free(&tls_conf->private_key);
++ mbedtls_ssl_config_free(&tls_conf->conf);
++ os_free(tls_conf->curves);
++ os_free(tls_conf->ciphersuites);
++ os_free(tls_conf->subject_match);
++ os_free(tls_conf->altsubject_match);
++ os_free(tls_conf->suffix_match);
++ os_free(tls_conf->domain_match);
++ os_free(tls_conf->check_cert_subject);
++ os_free(tls_conf);
++}
++
++
++mbedtls_ctr_drbg_context * crypto_mbedtls_ctr_drbg(void); /*(not in header)*/
++
++__attribute_cold__
++void * tls_init(const struct tls_config *conf)
++{
++ /* RFE: review struct tls_config *conf (different from tls_conf) */
++
++ if (++tls_ctx_global.refcnt > 1)
++ return &tls_ctx_global;
++
++ tls_ctx_global.ctr_drbg = crypto_mbedtls_ctr_drbg();
++ #ifdef MBEDTLS_SSL_SESSION_TICKETS
++ mbedtls_ssl_ticket_init(&tls_ctx_global.ticket_ctx);
++ mbedtls_ssl_ticket_setup(&tls_ctx_global.ticket_ctx,
++ mbedtls_ctr_drbg_random,
++ tls_ctx_global.ctr_drbg,
++ MBEDTLS_CIPHER_AES_256_GCM,
++ 43200); /* ticket timeout: 12 hours */
++ #endif
++ /* copy struct for future use */
++ tls_ctx_global.init_conf = *conf;
++ if (conf->openssl_ciphers)
++ tls_ctx_global.init_conf.openssl_ciphers =
++ os_strdup(conf->openssl_ciphers);
++
++ tls_ctx_global.crl_reload_interval = conf->crl_reload_interval;
++ os_get_reltime(&tls_ctx_global.crl_reload_previous);
++
++ return &tls_ctx_global;
++}
++
++
++__attribute_cold__
++void tls_deinit(void *tls_ctx)
++{
++ if (tls_ctx == NULL || --tls_ctx_global.refcnt != 0)
++ return;
++
++ tls_conf_deinit(tls_ctx_global.tls_conf);
++ os_free(tls_ctx_global.ca_cert_file);
++ os_free(tls_ctx_global.ocsp_stapling_response);
++ char *openssl_ciphers; /*(allocated in tls_init())*/
++ *(const char **)&openssl_ciphers =
++ tls_ctx_global.init_conf.openssl_ciphers;
++ os_free(openssl_ciphers);
++ #ifdef MBEDTLS_SSL_SESSION_TICKETS
++ mbedtls_ssl_ticket_free(&tls_ctx_global.ticket_ctx);
++ #endif
++ os_memset(&tls_ctx_global, 0, sizeof(tls_ctx_global));
++}
++
++
++int tls_get_errors(void *tls_ctx)
++{
++ return 0;
++}
++
++
++static void tls_connection_deinit_expkey(struct tls_connection *conn)
++{
++ conn->tls_prf_type = 0; /* MBEDTLS_SSL_TLS_PRF_NONE; */
++ conn->expkey_keyblock_size = 0;
++ conn->expkey_secret_len = 0;
++ forced_memzero(conn->expkey_secret, sizeof(conn->expkey_secret));
++ forced_memzero(conn->expkey_randbytes, sizeof(conn->expkey_randbytes));
++}
++
++
++#ifdef TLS_MBEDTLS_SESSION_TICKETS
++void tls_connection_deinit_clienthello_session_ticket(struct tls_connection *conn)
++{
++ if (conn->clienthello_session_ticket) {
++ mbedtls_platform_zeroize(conn->clienthello_session_ticket,
++ conn->clienthello_session_ticket_len);
++ mbedtls_free(conn->clienthello_session_ticket);
++ conn->clienthello_session_ticket = NULL;
++ conn->clienthello_session_ticket_len = 0;
++ }
++}
++#endif
++
++
++void tls_connection_deinit(void *tls_ctx, struct tls_connection *conn)
++{
++ if (conn == NULL)
++ return;
++
++ #if 0 /*(good intention, but never sent since we destroy self below)*/
++ if (conn->established)
++ mbedtls_ssl_close_notify(&conn->ssl);
++ #endif
++
++ if (conn->tls_prf_type)
++ tls_connection_deinit_expkey(conn);
++
++ #ifdef TLS_MBEDTLS_SESSION_TICKETS
++ if (conn->clienthello_session_ticket)
++ tls_connection_deinit_clienthello_session_ticket(conn);
++ #endif
++
++ os_free(conn->peer_subject);
++ wpabuf_free(conn->success_data);
++ wpabuf_free(conn->push_buf);
++ wpabuf_free(conn->pull_buf);
++ mbedtls_ssl_free(&conn->ssl);
++ tls_conf_deinit(conn->tls_conf);
++ os_free(conn);
++}
++
++
++static void tls_mbedtls_refresh_crl(void);
++static int tls_mbedtls_ssl_setup(struct tls_connection *conn);
++
++struct tls_connection * tls_connection_init(void *tls_ctx)
++{
++ struct tls_connection *conn = os_zalloc(sizeof(*conn));
++ if (conn == NULL)
++ return NULL;
++
++ mbedtls_ssl_init(&conn->ssl);
++
++ conn->tls_conf = tls_ctx_global.tls_conf; /*(inherit global conf, if set)*/
++ if (conn->tls_conf) {
++ ++conn->tls_conf->refcnt;
++ /* check for CRL refresh if inheriting from global config */
++ tls_mbedtls_refresh_crl();
++
++ conn->verify_peer = conn->tls_conf->verify_peer;
++ if (tls_mbedtls_ssl_setup(conn) != 0) {
++ tls_connection_deinit(&tls_ctx_global, conn);
++ return NULL;
++ }
++ }
++
++ return conn;
++}
++
++
++int tls_connection_established(void *tls_ctx, struct tls_connection *conn)
++{
++ return conn ? conn->established : 0;
++}
++
++
++__attribute_noinline__
++char * tls_mbedtls_peer_serial_num(const mbedtls_x509_crt *crt, char *serial_num, size_t len)
++{
++ /* mbedtls_x509_serial_gets() inefficiently formats to hex separated by
++ * colons, so generate the hex serial number here. The func
++ * wpa_snprintf_hex_uppercase() is similarly inefficient. */
++ size_t i = 0; /* skip leading 0's per Distinguished Encoding Rules (DER) */
++ while (i < crt->serial.len && crt->serial.p[i] == 0) ++i;
++ if (i == crt->serial.len) --i;
++
++ const unsigned char *s = crt->serial.p + i;
++ const size_t e = (crt->serial.len - i) * 2;
++ if (e >= len)
++ return NULL;
++ #if 0
++ wpa_snprintf_hex_uppercase(serial_num, len, s, crt->serial.len-i);
++ #else
++ for (i = 0; i < e; i+=2, ++s) {
++ serial_num[i+0] = "0123456789ABCDEF"[(*s >> 4)];
++ serial_num[i+1] = "0123456789ABCDEF"[(*s & 0xF)];
++ }
++ serial_num[e] = '\0';
++ #endif
++ return serial_num;
++}
++
++
++char * tls_connection_peer_serial_num(void *tls_ctx,
++ struct tls_connection *conn)
++{
++ const mbedtls_x509_crt *crt = mbedtls_ssl_get_peer_cert(&conn->ssl);
++ if (crt == NULL)
++ return NULL;
++ size_t len = crt->serial.len * 2 + 1;
++ char *serial_num = os_malloc(len);
++ if (!serial_num)
++ return NULL;
++ return tls_mbedtls_peer_serial_num(crt, serial_num, len);
++}
++
++
++static void tls_pull_buf_reset(struct tls_connection *conn);
++
++int tls_connection_shutdown(void *tls_ctx, struct tls_connection *conn)
++{
++ /* Note: this function called from eap_peer_tls_reauth_init()
++ * for session resumption, not for connection shutdown */
++
++ if (conn == NULL)
++ return -1;
++
++ tls_pull_buf_reset(conn);
++ wpabuf_free(conn->push_buf);
++ conn->push_buf = NULL;
++ conn->established = 0;
++ conn->resumed = 0;
++ if (conn->tls_prf_type)
++ tls_connection_deinit_expkey(conn);
++
++ /* RFE: prepare for session resumption? (see doc in crypto/tls.h) */
++
++ return mbedtls_ssl_session_reset(&conn->ssl);
++}
++
++
++static int tls_wpabuf_resize_put_data(struct wpabuf **buf,
++ const unsigned char *data, size_t dlen)
++{
++ if (wpabuf_resize(buf, dlen) < 0)
++ return 0;
++ wpabuf_put_data(*buf, data, dlen);
++ return 1;
++}
++
++
++static int tls_pull_buf_append(struct tls_connection *conn,
++ const struct wpabuf *in_data)
++{
++ /*(interface does not lend itself to move semantics)*/
++ return tls_wpabuf_resize_put_data(&conn->pull_buf,
++ wpabuf_head(in_data),
++ wpabuf_len(in_data));
++}
++
++
++static void tls_pull_buf_reset(struct tls_connection *conn)
++{
++ /*(future: might consider reusing conn->pull_buf)*/
++ wpabuf_free(conn->pull_buf);
++ conn->pull_buf = NULL;
++ conn->pull_buf_offset = 0;
++}
++
++
++__attribute_cold__
++static void tls_pull_buf_discard(struct tls_connection *conn, const char *func)
++{
++ size_t discard = wpabuf_len(conn->pull_buf) - conn->pull_buf_offset;
++ if (discard)
++ wpa_printf(MSG_DEBUG,
++ "%s - %zu bytes remaining in pull_buf; discarding",
++ func, discard);
++ tls_pull_buf_reset(conn);
++}
++
++
++static int tls_pull_func(void *ptr, unsigned char *buf, size_t len)
++{
++ struct tls_connection *conn = (struct tls_connection *) ptr;
++ if (conn->pull_buf == NULL)
++ return MBEDTLS_ERR_SSL_WANT_READ;
++ const size_t dlen = wpabuf_len(conn->pull_buf) - conn->pull_buf_offset;
++ if (dlen == 0)
++ return MBEDTLS_ERR_SSL_WANT_READ;
++
++ if (len > dlen)
++ len = dlen;
++ os_memcpy(buf, wpabuf_head(conn->pull_buf)+conn->pull_buf_offset, len);
++
++ if (len == dlen) {
++ tls_pull_buf_reset(conn);
++ /*wpa_printf(MSG_DEBUG, "%s - emptied pull_buf", __func__);*/
++ }
++ else {
++ conn->pull_buf_offset += len;
++ /*wpa_printf(MSG_DEBUG, "%s - %zu bytes remaining in pull_buf",
++ __func__, dlen - len);*/
++ }
++ return (int)len;
++}
++
++
++static int tls_push_func(void *ptr, const unsigned char *buf, size_t len)
++{
++ struct tls_connection *conn = (struct tls_connection *) ptr;
++ return tls_wpabuf_resize_put_data(&conn->push_buf, buf, len)
++ ? (int)len
++ : MBEDTLS_ERR_SSL_ALLOC_FAILED;
++}
++
++
++static int
++tls_mbedtls_verify_cb (void *arg, mbedtls_x509_crt *crt, int depth, uint32_t *flags);
++
++
++static int tls_mbedtls_ssl_setup(struct tls_connection *conn)
++{
++ #if 0
++ /* mbedtls_ssl_setup() must be called only once */
++ /* If this func might be called multiple times (e.g. via set_params),
++ * then we should set a flag in conn that ssl was initialized */
++ if (conn->ssl_is_init) {
++ mbedtls_ssl_free(&conn->ssl);
++ mbedtls_ssl_init(&conn->ssl);
++ }
++ #endif
++
++ int ret = mbedtls_ssl_setup(&conn->ssl, &conn->tls_conf->conf);
++ if (ret != 0) {
++ elog(ret, "mbedtls_ssl_setup");
++ return -1;
++ }
++
++ mbedtls_ssl_set_bio(&conn->ssl, conn, tls_push_func, tls_pull_func, NULL);
++ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
++ mbedtls_ssl_set_export_keys_cb(
++ &conn->ssl, tls_connection_export_keys_cb, conn);
++ #elif MBEDTLS_VERSION_NUMBER >= 0x02120000 /* mbedtls 2.18.0 */
++ mbedtls_ssl_conf_export_keys_ext_cb(
++ &conn->tls_conf->conf, tls_connection_export_keys_cb, conn);
++ #endif
++ if (conn->verify_peer)
++ mbedtls_ssl_set_verify(&conn->ssl, tls_mbedtls_verify_cb, conn);
++
++ return 0;
++}
++
++
++static int tls_mbedtls_data_is_pem(const u8 *data)
++{
++ return (NULL != os_strstr((char *)data, "-----"));
++}
++
++
++static void tls_mbedtls_set_allowed_tls_vers(struct tls_conf *tls_conf,
++ mbedtls_ssl_config *conf)
++{
++ #if !defined(MBEDTLS_SSL_PROTO_TLS1_3)
++ tls_conf->flags |= TLS_CONN_DISABLE_TLSv1_3;
++ #endif
++
++ /* unconditionally require TLSv1.2+ for TLS_CONN_SUITEB */
++ if (tls_conf->flags & TLS_CONN_SUITEB) {
++ tls_conf->flags |= TLS_CONN_DISABLE_TLSv1_0;
++ tls_conf->flags |= TLS_CONN_DISABLE_TLSv1_1;
++ }
++
++ const unsigned int flags = tls_conf->flags;
++
++ /* attempt to map flags to min and max TLS protocol version */
++
++ int min = (flags & TLS_CONN_DISABLE_TLSv1_0)
++ ? (flags & TLS_CONN_DISABLE_TLSv1_1)
++ ? (flags & TLS_CONN_DISABLE_TLSv1_2)
++ ? (flags & TLS_CONN_DISABLE_TLSv1_3)
++ ? 4
++ : 3
++ : 2
++ : 1
++ : 0;
++
++ int max = (flags & TLS_CONN_DISABLE_TLSv1_3)
++ ? (flags & TLS_CONN_DISABLE_TLSv1_2)
++ ? (flags & TLS_CONN_DISABLE_TLSv1_1)
++ ? (flags & TLS_CONN_DISABLE_TLSv1_0)
++ ? -1
++ : 0
++ : 1
++ : 2
++ : 3;
++
++ if ((flags & TLS_CONN_ENABLE_TLSv1_2) && min > 2) min = 2;
++ if ((flags & TLS_CONN_ENABLE_TLSv1_1) && min > 1) min = 1;
++ if ((flags & TLS_CONN_ENABLE_TLSv1_0) && min > 0) min = 0;
++ if (max < min) {
++ emsg(MSG_ERROR, "invalid tls_disable_tlsv* params; ignoring");
++ return;
++ }
++ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
++ /* mbed TLS 3.0.0 removes support for protocols < TLSv1.2 */
++ if (min < 2 || max < 2) {
++ emsg(MSG_ERROR, "invalid tls_disable_tlsv* params; ignoring");
++ if (min < 2) min = 2;
++ if (max < 2) max = 2;
++ }
++ #endif
++
++ #if MBEDTLS_VERSION_NUMBER >= 0x03020000 /* mbedtls 3.2.0 */
++ /* MBEDTLS_SSL_VERSION_TLS1_2 = 0x0303 *//*!< (D)TLS 1.2 */
++ /* MBEDTLS_SSL_VERSION_TLS1_3 = 0x0304 *//*!< (D)TLS 1.3 */
++ min = (min == 2) ? MBEDTLS_SSL_VERSION_TLS1_2 : MBEDTLS_SSL_VERSION_TLS1_3;
++ max = (max == 2) ? MBEDTLS_SSL_VERSION_TLS1_2 : MBEDTLS_SSL_VERSION_TLS1_3;
++ mbedtls_ssl_conf_min_tls_version(conf, min);
++ mbedtls_ssl_conf_max_tls_version(conf, max);
++ #else
++ #ifndef MBEDTLS_SSL_MINOR_VERSION_4
++ if (min == 3) min = 2;
++ if (max == 3) max = 2;
++ #endif
++ /* MBEDTLS_SSL_MINOR_VERSION_0 0 *//*!< SSL v3.0 */
++ /* MBEDTLS_SSL_MINOR_VERSION_1 1 *//*!< TLS v1.0 */
++ /* MBEDTLS_SSL_MINOR_VERSION_2 2 *//*!< TLS v1.1 */
++ /* MBEDTLS_SSL_MINOR_VERSION_3 3 *//*!< TLS v1.2 */
++ /* MBEDTLS_SSL_MINOR_VERSION_4 4 *//*!< TLS v1.3 */
++ mbedtls_ssl_conf_min_version(conf, MBEDTLS_SSL_MAJOR_VERSION_3, min+1);
++ mbedtls_ssl_conf_max_version(conf, MBEDTLS_SSL_MAJOR_VERSION_3, max+1);
++ #endif
++}
++
++
++__attribute_noinline__
++static int tls_mbedtls_readfile(const char *path, u8 **buf, size_t *n);
++
++
++static int
++tls_mbedtls_set_dhparams(struct tls_conf *tls_conf, const char *dh_file)
++{
++ size_t len;
++ u8 *data;
++ if (tls_mbedtls_readfile(dh_file, &data, &len))
++ return 0;
++
++ /* parse only if DH parameters if in PEM format */
++ if (tls_mbedtls_data_is_pem(data)
++ && NULL == os_strstr((char *)data, "-----BEGIN DH PARAMETERS-----")) {
++ if (os_strstr((char *)data, "-----BEGIN DSA PARAMETERS-----"))
++ wpa_printf(MSG_WARNING, "DSA parameters not handled (%s)", dh_file);
++ else
++ wpa_printf(MSG_WARNING, "unexpected DH param content (%s)",dh_file);
++ forced_memzero(data, len);
++ os_free(data);
++ return 0;
++ }
++
++ /* mbedtls_dhm_parse_dhm() expects "-----BEGIN DH PARAMETERS-----" if PEM */
++ mbedtls_dhm_context dhm;
++ mbedtls_dhm_init(&dhm);
++ int rc = mbedtls_dhm_parse_dhm(&dhm, data, len);
++ if (0 == rc)
++ rc = mbedtls_ssl_conf_dh_param_ctx(&tls_conf->conf, &dhm);
++ if (0 != rc)
++ elog(rc, dh_file);
++ mbedtls_dhm_free(&dhm);
++
++ forced_memzero(data, len);
++ os_free(data);
++ return (0 == rc);
++}
++
++
++/* reference: lighttpd src/mod_mbedtls.c:mod_mbedtls_ssl_append_curve()
++ * (same author: gstrauss@gluelogic.com; same license: BSD-3-Clause) */
++#if MBEDTLS_VERSION_NUMBER < 0x03010000 /* mbedtls 3.1.0 */
++static int
++tls_mbedtls_append_curve (mbedtls_ecp_group_id *ids, int nids, int idsz, const mbedtls_ecp_group_id id)
++{
++ if (1 >= idsz - (nids + 1)) {
++ emsg(MSG_ERROR, "error: too many curves during list expand");
++ return -1;
++ }
++ ids[++nids] = id;
++ return nids;
++}
++
++
++static int
++tls_mbedtls_set_curves(struct tls_conf *tls_conf, const char *curvelist)
++{
++ mbedtls_ecp_group_id ids[512];
++ int nids = -1;
++ const int idsz = (int)(sizeof(ids)/sizeof(*ids)-1);
++ const mbedtls_ecp_curve_info * const curve_info = mbedtls_ecp_curve_list();
++
++ for (const char *e = curvelist-1; e; ) {
++ const char * const n = e+1;
++ e = os_strchr(n, ':');
++ size_t len = e ? (size_t)(e - n) : os_strlen(n);
++ mbedtls_ecp_group_id grp_id = MBEDTLS_ECP_DP_NONE;
++ switch (len) {
++ case 5:
++ if (0 == os_memcmp("P-521", n, 5))
++ grp_id = MBEDTLS_ECP_DP_SECP521R1;
++ else if (0 == os_memcmp("P-384", n, 5))
++ grp_id = MBEDTLS_ECP_DP_SECP384R1;
++ else if (0 == os_memcmp("P-256", n, 5))
++ grp_id = MBEDTLS_ECP_DP_SECP256R1;
++ break;
++ case 6:
++ if (0 == os_memcmp("BP-521", n, 6))
++ grp_id = MBEDTLS_ECP_DP_BP512R1;
++ else if (0 == os_memcmp("BP-384", n, 6))
++ grp_id = MBEDTLS_ECP_DP_BP384R1;
++ else if (0 == os_memcmp("BP-256", n, 6))
++ grp_id = MBEDTLS_ECP_DP_BP256R1;
++ break;
++ default:
++ break;
++ }
++ if (grp_id != MBEDTLS_ECP_DP_NONE) {
++ nids = tls_mbedtls_append_curve(ids, nids, idsz, grp_id);
++ if (-1 == nids) return 0;
++ continue;
++ }
++ /* similar to mbedtls_ecp_curve_info_from_name() */
++ const mbedtls_ecp_curve_info *info;
++ for (info = curve_info; info->grp_id != MBEDTLS_ECP_DP_NONE; ++info) {
++ if (0 == os_strncmp(info->name, n, len) && info->name[len] == '\0')
++ break;
++ }
++ if (info->grp_id == MBEDTLS_ECP_DP_NONE) {
++ wpa_printf(MSG_ERROR, "MTLS: unrecognized curve: %.*s",(int)len,n);
++ return 0;
++ }
++
++ nids = tls_mbedtls_append_curve(ids, nids, idsz, info->grp_id);
++ if (-1 == nids) return 0;
++ }
++
++ /* mod_openssl configures "prime256v1" if curve list not specified,
++ * but mbedtls provides a list of supported curves if not explicitly set */
++ if (-1 == nids) return 1; /* empty list; no-op */
++
++ ids[++nids] = MBEDTLS_ECP_DP_NONE; /* terminate list */
++ ++nids;
++
++ /* curves list must be persistent for lifetime of mbedtls_ssl_config */
++ tls_conf->curves = os_malloc(nids * sizeof(mbedtls_ecp_group_id));
++ if (tls_conf->curves == NULL)
++ return 0;
++ os_memcpy(tls_conf->curves, ids, nids * sizeof(mbedtls_ecp_group_id));
++
++ mbedtls_ssl_conf_curves(&tls_conf->conf, tls_conf->curves);
++ return 1;
++}
++#else
++static int
++tls_mbedtls_append_curve (uint16_t *ids, int nids, int idsz, const uint16_t id)
++{
++ if (1 >= idsz - (nids + 1)) {
++ emsg(MSG_ERROR, "error: too many curves during list expand");
++ return -1;
++ }
++ ids[++nids] = id;
++ return nids;
++}
++
++
++static int
++tls_mbedtls_set_curves(struct tls_conf *tls_conf, const char *curvelist)
++{
++ /* TLS Supported Groups (renamed from "EC Named Curve Registry")
++ * https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8
++ */
++ uint16_t ids[512];
++ int nids = -1;
++ const int idsz = (int)(sizeof(ids)/sizeof(*ids)-1);
++ const mbedtls_ecp_curve_info * const curve_info = mbedtls_ecp_curve_list();
++
++ for (const char *e = curvelist-1; e; ) {
++ const char * const n = e+1;
++ e = os_strchr(n, ':');
++ size_t len = e ? (size_t)(e - n) : os_strlen(n);
++ uint16_t tls_id = 0;
++ switch (len) {
++ case 5:
++ if (0 == os_memcmp("P-521", n, 5))
++ tls_id = 25; /* mbedtls_ecp_group_id MBEDTLS_ECP_DP_SECP521R1 */
++ else if (0 == os_memcmp("P-384", n, 5))
++ tls_id = 24; /* mbedtls_ecp_group_id MBEDTLS_ECP_DP_SECP384R1 */
++ else if (0 == os_memcmp("P-256", n, 5))
++ tls_id = 23; /* mbedtls_ecp_group_id MBEDTLS_ECP_DP_SECP256R1 */
++ break;
++ case 6:
++ if (0 == os_memcmp("BP-521", n, 6))
++ tls_id = 28; /* mbedtls_ecp_group_id MBEDTLS_ECP_DP_BP512R1 */
++ else if (0 == os_memcmp("BP-384", n, 6))
++ tls_id = 27; /* mbedtls_ecp_group_id MBEDTLS_ECP_DP_BP384R1 */
++ else if (0 == os_memcmp("BP-256", n, 6))
++ tls_id = 26; /* mbedtls_ecp_group_id MBEDTLS_ECP_DP_BP256R1 */
++ break;
++ default:
++ break;
++ }
++ if (tls_id != 0) {
++ nids = tls_mbedtls_append_curve(ids, nids, idsz, tls_id);
++ if (-1 == nids) return 0;
++ continue;
++ }
++ /* similar to mbedtls_ecp_curve_info_from_name() */
++ const mbedtls_ecp_curve_info *info;
++ for (info = curve_info; info->tls_id != 0; ++info) {
++ if (0 == os_strncmp(info->name, n, len) && info->name[len] == '\0')
++ break;
++ }
++ if (info->tls_id == 0) {
++ wpa_printf(MSG_ERROR, "MTLS: unrecognized curve: %.*s",(int)len,n);
++ return 0;
++ }
++
++ nids = tls_mbedtls_append_curve(ids, nids, idsz, info->tls_id);
++ if (-1 == nids) return 0;
++ }
++
++ /* mod_openssl configures "prime256v1" if curve list not specified,
++ * but mbedtls provides a list of supported curves if not explicitly set */
++ if (-1 == nids) return 1; /* empty list; no-op */
++
++ ids[++nids] = 0; /* terminate list */
++ ++nids;
++
++ /* curves list must be persistent for lifetime of mbedtls_ssl_config */
++ tls_conf->curves = os_malloc(nids * sizeof(uint16_t));
++ if (tls_conf->curves == NULL)
++ return 0;
++ os_memcpy(tls_conf->curves, ids, nids * sizeof(uint16_t));
++
++ mbedtls_ssl_conf_groups(&tls_conf->conf, tls_conf->curves);
++ return 1;
++}
++#endif /* MBEDTLS_VERSION_NUMBER >= 0x03010000 */ /* mbedtls 3.1.0 */
++
++
++/* data copied from lighttpd src/mod_mbedtls.c (BSD-3-Clause) */
++static const int suite_AES_256_ephemeral[] = {
++ /* All AES-256 ephemeral suites */
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
++ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CCM,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CCM,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
++ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
++ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CCM_8
++};
++
++/* data copied from lighttpd src/mod_mbedtls.c (BSD-3-Clause) */
++static const int suite_AES_128_ephemeral[] = {
++ /* All AES-128 ephemeral suites */
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
++ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CCM,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CCM,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
++ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
++ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CCM_8
++};
++
++/* data copied from lighttpd src/mod_mbedtls.c (BSD-3-Clause) */
++/* HIGH cipher list (mapped from openssl list to mbedtls) */
++static const int suite_HIGH[] = {
++ MBEDTLS_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
++ MBEDTLS_TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
++ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CCM,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CCM,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
++ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
++ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CCM_8,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384,
++ MBEDTLS_TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384,
++ MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256,
++ MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384,
++ MBEDTLS_TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384,
++ MBEDTLS_TLS_DHE_RSA_WITH_ARIA_256_GCM_SHA384,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
++ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CCM,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CCM,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
++ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
++ MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8,
++ MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CCM_8,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256,
++ MBEDTLS_TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
++ MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
++ MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256,
++ MBEDTLS_TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256,
++ MBEDTLS_TLS_DHE_RSA_WITH_ARIA_128_GCM_SHA256,
++ MBEDTLS_TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256,
++ MBEDTLS_TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256,
++ MBEDTLS_TLS_DHE_PSK_WITH_AES_256_GCM_SHA384,
++ MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CCM,
++ MBEDTLS_TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384,
++ MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CBC_SHA384,
++ MBEDTLS_TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA,
++ MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CBC_SHA,
++ MBEDTLS_TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
++ MBEDTLS_TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
++ MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CCM_8,
++ MBEDTLS_TLS_DHE_PSK_WITH_ARIA_256_GCM_SHA384,
++ MBEDTLS_TLS_DHE_PSK_WITH_AES_128_GCM_SHA256,
++ MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CCM,
++ MBEDTLS_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256,
++ MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CBC_SHA256,
++ MBEDTLS_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA,
++ MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CBC_SHA,
++ MBEDTLS_TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
++ MBEDTLS_TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
++ MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CCM_8,
++ MBEDTLS_TLS_DHE_PSK_WITH_ARIA_128_GCM_SHA256,
++ MBEDTLS_TLS_RSA_WITH_AES_256_GCM_SHA384,
++ MBEDTLS_TLS_RSA_WITH_AES_256_CCM,
++ MBEDTLS_TLS_RSA_WITH_AES_256_CBC_SHA256,
++ MBEDTLS_TLS_RSA_WITH_AES_256_CBC_SHA,
++ MBEDTLS_TLS_RSA_WITH_AES_256_CCM_8,
++ MBEDTLS_TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256,
++ MBEDTLS_TLS_RSA_WITH_CAMELLIA_256_CBC_SHA,
++ MBEDTLS_TLS_RSA_WITH_ARIA_256_GCM_SHA384,
++ MBEDTLS_TLS_RSA_WITH_AES_128_GCM_SHA256,
++ MBEDTLS_TLS_RSA_WITH_AES_128_CCM,
++ MBEDTLS_TLS_RSA_WITH_AES_128_CBC_SHA256,
++ MBEDTLS_TLS_RSA_WITH_AES_128_CBC_SHA,
++ MBEDTLS_TLS_RSA_WITH_AES_128_CCM_8,
++ MBEDTLS_TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256,
++ MBEDTLS_TLS_RSA_WITH_CAMELLIA_128_CBC_SHA,
++ MBEDTLS_TLS_RSA_WITH_ARIA_128_GCM_SHA256,
++ MBEDTLS_TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256,
++ MBEDTLS_TLS_RSA_PSK_WITH_AES_256_GCM_SHA384,
++ MBEDTLS_TLS_RSA_PSK_WITH_AES_256_CBC_SHA384,
++ MBEDTLS_TLS_RSA_PSK_WITH_AES_256_CBC_SHA,
++ MBEDTLS_TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384,
++ MBEDTLS_TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384,
++ MBEDTLS_TLS_RSA_PSK_WITH_AES_128_GCM_SHA256,
++ MBEDTLS_TLS_RSA_PSK_WITH_AES_128_CBC_SHA256,
++ MBEDTLS_TLS_RSA_PSK_WITH_AES_128_CBC_SHA,
++ MBEDTLS_TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256,
++ MBEDTLS_TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256,
++ MBEDTLS_TLS_PSK_WITH_CHACHA20_POLY1305_SHA256,
++ MBEDTLS_TLS_PSK_WITH_AES_256_GCM_SHA384,
++ MBEDTLS_TLS_PSK_WITH_AES_256_CCM,
++ MBEDTLS_TLS_PSK_WITH_AES_256_CBC_SHA384,
++ MBEDTLS_TLS_PSK_WITH_AES_256_CBC_SHA,
++ MBEDTLS_TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384,
++ MBEDTLS_TLS_PSK_WITH_AES_256_CCM_8,
++ MBEDTLS_TLS_PSK_WITH_ARIA_256_GCM_SHA384,
++ MBEDTLS_TLS_PSK_WITH_AES_128_GCM_SHA256,
++ MBEDTLS_TLS_PSK_WITH_AES_128_CCM,
++ MBEDTLS_TLS_PSK_WITH_AES_128_CBC_SHA256,
++ MBEDTLS_TLS_PSK_WITH_AES_128_CBC_SHA,
++ MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256,
++ MBEDTLS_TLS_PSK_WITH_AES_128_CCM_8,
++ MBEDTLS_TLS_PSK_WITH_ARIA_128_GCM_SHA256
++};
++
++
++__attribute_noinline__
++static int
++tls_mbedtls_append_ciphersuite (int *ids, int nids, int idsz, const int *x, int xsz)
++{
++ if (xsz >= idsz - (nids + 1)) {
++ emsg(MSG_ERROR, "error: too many ciphers during list expand");
++ return -1;
++ }
++
++ for (int i = 0; i < xsz; ++i)
++ ids[++nids] = x[i];
++
++ return nids;
++}
++
++
++static int
++tls_mbedtls_translate_ciphername(int id, char *buf, size_t buflen)
++{
++ const mbedtls_ssl_ciphersuite_t *info =
++ mbedtls_ssl_ciphersuite_from_id(id);
++ if (info == NULL)
++ return 0;
++ const char *name = mbedtls_ssl_ciphersuite_get_name(info);
++ const size_t len = os_strlen(name);
++ if (len == 7 && 0 == os_memcmp(name, "unknown", 7))
++ return 0;
++ if (len >= buflen)
++ return 0;
++ os_strlcpy(buf, name, buflen);
++
++ /* attempt to translate mbedtls string to openssl string
++ * (some heuristics; incomplete) */
++ size_t i = 0, j = 0;
++ if (buf[0] == 'T') {
++ if (os_strncmp(buf, "TLS1-3-", 7) == 0) {
++ buf[3] = '-';
++ j = 4; /* remove "1-3" from "TLS1-3-" prefix */
++ i = 7;
++ }
++ else if (os_strncmp(buf, "TLS-", 4) == 0)
++ i = 4; /* remove "TLS-" prefix */
++ }
++ for (; buf[i]; ++i) {
++ if (buf[i] == '-') {
++ if (i >= 3) {
++ if (0 == os_memcmp(buf+i-3, "AES", 3))
++ continue; /* "AES-" -> "AES" */
++ }
++ if (i >= 4) {
++ if (0 == os_memcmp(buf+i-4, "WITH", 4)) {
++ j -= 4; /* remove "WITH-" */
++ continue;
++ }
++ }
++ }
++ buf[j++] = buf[i];
++ }
++ buf[j] = '\0';
++
++ return j;
++}
++
++
++__attribute_noinline__
++static int
++tls_mbedtls_set_ciphersuites(struct tls_conf *tls_conf, int *ids, int nids)
++{
++ /* ciphersuites list must be persistent for lifetime of mbedtls_ssl_config*/
++ os_free(tls_conf->ciphersuites);
++ tls_conf->ciphersuites = os_malloc(nids * sizeof(int));
++ if (tls_conf->ciphersuites == NULL)
++ return 0;
++ os_memcpy(tls_conf->ciphersuites, ids, nids * sizeof(int));
++ mbedtls_ssl_conf_ciphersuites(&tls_conf->conf, tls_conf->ciphersuites);
++ return 1;
++}
++
++
++static int
++tls_mbedtls_set_ciphers(struct tls_conf *tls_conf, const char *ciphers)
++{
++ char buf[64];
++ int ids[512];
++ int nids = -1;
++ const int idsz = (int)(sizeof(ids)/sizeof(*ids)-1);
++ const char *next;
++ size_t blen, clen;
++ do {
++ next = os_strchr(ciphers, ':');
++ clen = next ? (size_t)(next - ciphers) : os_strlen(ciphers);
++ if (!clen)
++ continue;
++
++ /* special-case a select set of openssl group names for hwsim tests */
++ /* (review; remove excess code if tests are not run for non-OpenSSL?) */
++ if (clen == 9 && os_memcmp(ciphers, "SUITEB192", 9) == 0) {
++ static int ssl_preset_suiteb192_ciphersuites[] = {
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
++ 0
++ };
++ return tls_mbedtls_set_ciphersuites(tls_conf,
++ ssl_preset_suiteb192_ciphersuites,
++ 2);
++ }
++ if (clen == 9 && os_memcmp(ciphers, "SUITEB128", 9) == 0) {
++ static int ssl_preset_suiteb128_ciphersuites[] = {
++ MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
++ 0
++ };
++ return tls_mbedtls_set_ciphersuites(tls_conf,
++ ssl_preset_suiteb128_ciphersuites,
++ 2);
++ }
++ if (clen == 7 && os_memcmp(ciphers, "DEFAULT", 7) == 0)
++ continue;
++ if (clen == 6 && os_memcmp(ciphers, "AES128", 6) == 0) {
++ nids = tls_mbedtls_append_ciphersuite(ids, nids, idsz,
++ suite_AES_128_ephemeral,
++ (int)ARRAY_SIZE(suite_AES_128_ephemeral));
++ if (nids == -1)
++ return 0;
++ continue;
++ }
++ if (clen == 6 && os_memcmp(ciphers, "AES256", 6) == 0) {
++ nids = tls_mbedtls_append_ciphersuite(ids, nids, idsz,
++ suite_AES_256_ephemeral,
++ (int)ARRAY_SIZE(suite_AES_256_ephemeral));
++ if (nids == -1)
++ return 0;
++ continue;
++ }
++ if (clen == 4 && os_memcmp(ciphers, "HIGH", 4) == 0) {
++ nids = tls_mbedtls_append_ciphersuite(ids, nids, idsz, suite_HIGH,
++ (int)ARRAY_SIZE(suite_HIGH));
++ if (nids == -1)
++ return 0;
++ continue;
++ }
++ /* ignore anonymous cipher group names (?not supported by mbedtls?) */
++ if (clen == 4 && os_memcmp(ciphers, "!ADH", 4) == 0)
++ continue;
++ if (clen == 6 && os_memcmp(ciphers, "-aECDH", 6) == 0)
++ continue;
++ if (clen == 7 && os_memcmp(ciphers, "-aECDSA", 7) == 0)
++ continue;
++
++ /* attempt to match mbedtls cipher names
++ * nb: does not support openssl group names or list manipulation syntax
++ * (alt: could copy almost 1200 lines (!!!) of lighttpd mod_mbedtls.c
++ * mod_mbedtls_ssl_conf_ciphersuites() to translate strings)
++ * note: not efficient to rewrite list for each ciphers entry,
++ * but this code is expected to run only at startup
++ */
++ const int *list = mbedtls_ssl_list_ciphersuites();
++ for (; *list; ++list) {
++ blen = tls_mbedtls_translate_ciphername(*list,buf,sizeof(buf));
++ if (!blen)
++ continue;
++
++ /* matching heuristics additional to translate_ciphername above */
++ if (blen == clen+4) {
++ char *cbc = os_strstr(buf, "CBC-");
++ if (cbc) {
++ os_memmove(cbc, cbc+4, blen-(cbc+4-buf)+1); /*(w/ '\0')*/
++ blen -= 4;
++ }
++ }
++ if (blen >= clen && os_memcmp(ciphers, buf, clen) == 0
++ && (blen == clen
++ || (blen == clen+7 && os_memcmp(buf+clen, "-SHA256", 7)))) {
++ if (1 >= idsz - (nids + 1)) {
++ emsg(MSG_ERROR,
++ "error: too many ciphers during list expand");
++ return 0;
++ }
++ ids[++nids] = *list;
++ break;
++ }
++ }
++ if (*list == 0) {
++ wpa_printf(MSG_ERROR,
++ "MTLS: unrecognized cipher: %.*s", (int)clen, ciphers);
++ return 0;
++ }
++ } while ((ciphers = next ? next+1 : NULL));
++
++ if (-1 == nids) return 1; /* empty list; no-op */
++
++ ids[++nids] = 0; /* terminate list */
++ ++nids;
++
++ return tls_mbedtls_set_ciphersuites(tls_conf, ids, nids);
++}
++
++
++__attribute_noinline__
++static int tls_mbedtls_set_item(char **config_item, const char *item)
++{
++ os_free(*config_item);
++ *config_item = NULL;
++ return item ? (*config_item = os_strdup(item)) != NULL : 1;
++}
++
++
++static int tls_connection_set_subject_match(struct tls_conf *tls_conf,
++ const struct tls_connection_params *params)
++{
++ int rc = 1;
++ rc &= tls_mbedtls_set_item(&tls_conf->subject_match,
++ params->subject_match);
++ rc &= tls_mbedtls_set_item(&tls_conf->altsubject_match,
++ params->altsubject_match);
++ rc &= tls_mbedtls_set_item(&tls_conf->suffix_match,
++ params->suffix_match);
++ rc &= tls_mbedtls_set_item(&tls_conf->domain_match,
++ params->domain_match);
++ rc &= tls_mbedtls_set_item(&tls_conf->check_cert_subject,
++ params->check_cert_subject);
++ return rc;
++}
++
++
++/* duplicated in crypto_mbedtls.c:crypto_mbedtls_readfile()*/
++__attribute_noinline__
++static int tls_mbedtls_readfile(const char *path, u8 **buf, size_t *n)
++{
++ #if 0 /* #ifdef MBEDTLS_FS_IO */
++ /*(includes +1 for '\0' needed by mbedtls PEM parsing funcs)*/
++ if (mbedtls_pk_load_file(path, (unsigned char **)buf, n) != 0) {
++ wpa_printf(MSG_ERROR, "error: mbedtls_pk_load_file %s", path);
++ return -1;
++ }
++ #else
++ /*(use os_readfile() so that we can use os_free()
++ *(if we use mbedtls_pk_load_file() above, macros prevent calling free()
++ * directly #if defined(OS_REJECT_C_LIB_FUNCTIONS) and calling os_free()
++ * on buf aborts in tests if buf not allocated via os_malloc())*/
++ *buf = (u8 *)os_readfile(path, n);
++ if (!*buf) {
++ wpa_printf(MSG_ERROR, "error: os_readfile %s", path);
++ return -1;
++ }
++ u8 *buf0 = os_realloc(*buf, *n+1);
++ if (!buf0) {
++ bin_clear_free(*buf, *n);
++ *buf = NULL;
++ return -1;
++ }
++ buf0[(*n)++] = '\0';
++ *buf = buf0;
++ #endif
++ return 0;
++}
++
++
++static int tls_mbedtls_set_crl(struct tls_conf *tls_conf, const u8 *data, size_t len)
++{
++ /* do not use mbedtls_x509_crl_parse() on PEM unless it contains CRL */
++ if (len && data[len-1] == '\0'
++ && NULL == os_strstr((const char *)data,"-----BEGIN X509 CRL-----")
++ && tls_mbedtls_data_is_pem(data))
++ return 0;
++
++ mbedtls_x509_crl crl;
++ mbedtls_x509_crl_init(&crl);
++ int rc = mbedtls_x509_crl_parse(&crl, data, len);
++ if (rc < 0) {
++ mbedtls_x509_crl_free(&crl);
++ return rc == MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT ? 0 : rc;
++ }
++
++ mbedtls_x509_crl *crl_new = os_malloc(sizeof(crl));
++ if (crl_new == NULL) {
++ mbedtls_x509_crl_free(&crl);
++ return MBEDTLS_ERR_X509_ALLOC_FAILED;
++ }
++ os_memcpy(crl_new, &crl, sizeof(crl));
++
++ mbedtls_x509_crl *crl_old = tls_conf->crl;
++ tls_conf->crl = crl_new;
++ if (crl_old) {
++ mbedtls_x509_crl_free(crl_old);
++ os_free(crl_old);
++ }
++ return 0;
++}
++
++
++static int tls_mbedtls_set_ca(struct tls_conf *tls_conf, u8 *data, size_t len)
++{
++ /* load crt struct onto stack and then copy into tls_conf in
++ * order to preserve existing tls_conf value if error occurs
++ *
++ * hostapd is not threaded, or else should allocate memory and swap in
++ * pointer reduce race condition. (If threaded, would also need to
++ * keep reference count of use to avoid freeing while still in use.) */
++
++ mbedtls_x509_crt crt;
++ mbedtls_x509_crt_init(&crt);
++ int rc = mbedtls_x509_crt_parse(&crt, data, len);
++ if (rc < 0) {
++ mbedtls_x509_crt_free(&crt);
++ return rc;
++ }
++
++ mbedtls_x509_crt_free(&tls_conf->ca_cert);
++ os_memcpy(&tls_conf->ca_cert, &crt, sizeof(crt));
++ return 0;
++}
++
++
++static int tls_mbedtls_set_ca_and_crl(struct tls_conf *tls_conf, const char *ca_cert_file)
++{
++ size_t len;
++ u8 *data;
++ if (tls_mbedtls_readfile(ca_cert_file, &data, &len))
++ return -1;
++
++ int rc;
++ if (0 == (rc = tls_mbedtls_set_ca(tls_conf, data, len))
++ && (!tls_mbedtls_data_is_pem(data) /*skip parse for CRL if not PEM*/
++ || 0 == (rc = tls_mbedtls_set_crl(tls_conf, data, len)))) {
++ mbedtls_ssl_conf_ca_chain(&tls_conf->conf,
++ &tls_conf->ca_cert,
++ tls_conf->crl);
++ }
++ else {
++ elog(rc, __func__);
++ emsg(MSG_ERROR, ca_cert_file);
++ }
++
++ forced_memzero(data, len);
++ os_free(data);
++ return rc;
++}
++
++
++static void tls_mbedtls_refresh_crl(void)
++{
++ /* check for CRL refresh
++ * continue even if error occurs; continue with previous cert, CRL */
++ unsigned int crl_reload_interval = tls_ctx_global.crl_reload_interval;
++ const char *ca_cert_file = tls_ctx_global.ca_cert_file;
++ if (!crl_reload_interval || !ca_cert_file)
++ return;
++
++ struct os_reltime *previous = &tls_ctx_global.crl_reload_previous;
++ struct os_reltime now;
++ if (os_get_reltime(&now) != 0
++ || !os_reltime_expired(&now, previous, crl_reload_interval))
++ return;
++
++ /* Note: modifying global state is not thread-safe
++ * if in use by existing connections
++ *
++ * src/utils/os.h does not provide a portable stat()
++ * or else it would be a good idea to check mtime and size,
++ * and avoid reloading if file has not changed */
++
++ if (tls_mbedtls_set_ca_and_crl(tls_ctx_global.tls_conf, ca_cert_file) == 0)
++ *previous = now;
++}
++
++
++static int tls_mbedtls_set_ca_cert(struct tls_conf *tls_conf,
++ const struct tls_connection_params *params)
++{
++ if (params->ca_cert) {
++ if (os_strncmp(params->ca_cert, "probe://", 8) == 0) {
++ tls_conf->ca_cert_probe = 1;
++ tls_conf->has_ca_cert = 1;
++ return 0;
++ }
++
++ if (os_strncmp(params->ca_cert, "hash://", 7) == 0) {
++ const char *pos = params->ca_cert + 7;
++ if (os_strncmp(pos, "server/sha256/", 14) != 0) {
++ emsg(MSG_ERROR, "unsupported ca_cert hash value");
++ return -1;
++ }
++ pos += 14;
++ if (os_strlen(pos) != SHA256_DIGEST_LENGTH*2) {
++ emsg(MSG_ERROR, "unexpected ca_cert hash length");
++ return -1;
++ }
++ if (hexstr2bin(pos, tls_conf->ca_cert_hash,
++ SHA256_DIGEST_LENGTH) < 0) {
++ emsg(MSG_ERROR, "invalid ca_cert hash value");
++ return -1;
++ }
++ emsg(MSG_DEBUG, "checking only server certificate match");
++ tls_conf->verify_depth0_only = 1;
++ tls_conf->has_ca_cert = 1;
++ return 0;
++ }
++
++ if (tls_mbedtls_set_ca_and_crl(tls_conf, params->ca_cert) != 0)
++ return -1;
++ }
++ if (params->ca_cert_blob) {
++ size_t len = params->ca_cert_blob_len;
++ int is_pem = tls_mbedtls_data_is_pem(params->ca_cert_blob);
++ if (len && params->ca_cert_blob[len-1] != '\0' && is_pem)
++ ++len; /*(include '\0' in len for PEM)*/
++ int ret = mbedtls_x509_crt_parse(&tls_conf->ca_cert,
++ params->ca_cert_blob, len);
++ if (ret != 0) {
++ elog(ret, "mbedtls_x509_crt_parse");
++ return -1;
++ }
++ if (is_pem) { /*(ca_cert_blob in DER format contains ca cert only)*/
++ ret = tls_mbedtls_set_crl(tls_conf, params->ca_cert_blob, len);
++ if (ret != 0) {
++ elog(ret, "mbedtls_x509_crl_parse");
++ return -1;
++ }
++ }
++ }
++
++ if (mbedtls_x509_time_is_future(&tls_conf->ca_cert.valid_from)
++ || mbedtls_x509_time_is_past(&tls_conf->ca_cert.valid_to)) {
++ emsg(MSG_WARNING, "ca_cert expired or not yet valid");
++ if (params->ca_cert)
++ emsg(MSG_WARNING, params->ca_cert);
++ }
++
++ tls_conf->has_ca_cert = 1;
++ return 0;
++}
++
++
++static int tls_mbedtls_set_certs(struct tls_conf *tls_conf,
++ const struct tls_connection_params *params)
++{
++ int ret;
++
++ if (params->ca_cert || params->ca_cert_blob) {
++ if (tls_mbedtls_set_ca_cert(tls_conf, params) != 0)
++ return -1;
++ }
++ else if (params->ca_path) {
++ emsg(MSG_INFO, "ca_path support not implemented");
++ return -1;
++ }
++
++ if (!tls_conf->has_ca_cert)
++ mbedtls_ssl_conf_authmode(&tls_conf->conf, MBEDTLS_SSL_VERIFY_NONE);
++ else {
++ /* Initial setting: REQUIRED for client, OPTIONAL for server
++ * (see also tls_connection_set_verify()) */
++ tls_conf->verify_peer = (tls_ctx_global.tls_conf == NULL);
++ int authmode = tls_conf->verify_peer
++ ? MBEDTLS_SSL_VERIFY_REQUIRED
++ : MBEDTLS_SSL_VERIFY_OPTIONAL;
++ mbedtls_ssl_conf_authmode(&tls_conf->conf, authmode);
++ mbedtls_ssl_conf_ca_chain(&tls_conf->conf,
++ &tls_conf->ca_cert,
++ tls_conf->crl);
++
++ if (!tls_connection_set_subject_match(tls_conf, params))
++ return -1;
++ }
++
++ if (params->client_cert2) /*(yes, server_cert2 in msg below)*/
++ emsg(MSG_INFO, "server_cert2 support not implemented");
++
++ if (params->client_cert) {
++ size_t len;
++ u8 *data;
++ if (tls_mbedtls_readfile(params->client_cert, &data, &len))
++ return -1;
++ ret = mbedtls_x509_crt_parse(&tls_conf->client_cert, data, len);
++ forced_memzero(data, len);
++ os_free(data);
++ }
++ if (params->client_cert_blob) {
++ size_t len = params->client_cert_blob_len;
++ if (len && params->client_cert_blob[len-1] != '\0'
++ && tls_mbedtls_data_is_pem(params->client_cert_blob))
++ ++len; /*(include '\0' in len for PEM)*/
++ ret = mbedtls_x509_crt_parse(&tls_conf->client_cert,
++ params->client_cert_blob, len);
++ }
++ if (params->client_cert || params->client_cert_blob) {
++ if (ret < 0) {
++ elog(ret, "mbedtls_x509_crt_parse");
++ if (params->client_cert)
++ emsg(MSG_ERROR, params->client_cert);
++ return -1;
++ }
++ if (mbedtls_x509_time_is_future(&tls_conf->client_cert.valid_from)
++ || mbedtls_x509_time_is_past(&tls_conf->client_cert.valid_to)) {
++ emsg(MSG_WARNING, "cert expired or not yet valid");
++ if (params->client_cert)
++ emsg(MSG_WARNING, params->client_cert);
++ }
++ tls_conf->has_client_cert = 1;
++ }
++
++ if (params->private_key || params->private_key_blob) {
++ size_t len = params->private_key_blob_len;
++ u8 *data;
++ *(const u8 **)&data = params->private_key_blob;
++ if (len && data[len-1] != '\0' && tls_mbedtls_data_is_pem(data))
++ ++len; /*(include '\0' in len for PEM)*/
++ if (params->private_key
++ && tls_mbedtls_readfile(params->private_key, &data, &len)) {
++ return -1;
++ }
++ const char *pwd = params->private_key_passwd;
++ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
++ ret = mbedtls_pk_parse_key(&tls_conf->private_key,
++ data, len,
++ (const unsigned char *)pwd,
++ pwd ? os_strlen(pwd) : 0,
++ mbedtls_ctr_drbg_random,
++ tls_ctx_global.ctr_drbg);
++ #else
++ ret = mbedtls_pk_parse_key(&tls_conf->private_key,
++ data, len,
++ (const unsigned char *)pwd,
++ pwd ? os_strlen(pwd) : 0);
++ #endif
++ if (params->private_key) {
++ forced_memzero(data, len);
++ os_free(data);
++ }
++ if (ret < 0) {
++ elog(ret, "mbedtls_pk_parse_key");
++ return -1;
++ }
++ tls_conf->has_private_key = 1;
++ }
++
++ if (tls_conf->has_client_cert && tls_conf->has_private_key) {
++ ret = mbedtls_ssl_conf_own_cert(
++ &tls_conf->conf, &tls_conf->client_cert, &tls_conf->private_key);
++ if (ret < 0) {
++ elog(ret, "mbedtls_ssl_conf_own_cert");
++ return -1;
++ }
++ }
++
++ return 0;
++}
++
++
++/* mbedtls_x509_crt_profile_suiteb plus rsa_min_bitlen 2048 */
++/* (reference: see also mbedtls_x509_crt_profile_next) */
++/* ??? should permit SHA-512, too, and additional curves ??? */
++static const mbedtls_x509_crt_profile tls_mbedtls_crt_profile_suiteb128 =
++{
++ /* Only SHA-256 and 384 */
++ MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA256 ) |
++ MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA384 ),
++ /* Only ECDSA */
++ MBEDTLS_X509_ID_FLAG( MBEDTLS_PK_ECDSA ) |
++ MBEDTLS_X509_ID_FLAG( MBEDTLS_PK_ECKEY ),
++#if defined(MBEDTLS_ECP_C)
++ /* Only NIST P-256 and P-384 */
++ MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP256R1 ) |
++ MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP384R1 ),
++#else
++ 0,
++#endif
++ 2048,
++};
++
++
++/* stricter than mbedtls_x509_crt_profile_suiteb */
++/* (reference: see also mbedtls_x509_crt_profile_next) */
++/* ??? should permit SHA-512, too, and additional curves ??? */
++static const mbedtls_x509_crt_profile tls_mbedtls_crt_profile_suiteb192 =
++{
++ /* Only SHA-384 */
++ MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA384 ),
++ /* Only ECDSA */
++ MBEDTLS_X509_ID_FLAG( MBEDTLS_PK_ECDSA ) |
++ MBEDTLS_X509_ID_FLAG( MBEDTLS_PK_ECKEY ),
++#if defined(MBEDTLS_ECP_C)
++ /* Only NIST P-384 */
++ MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP384R1 ),
++#else
++ 0,
++#endif
++ 3072,
++};
++
++
++/* stricter than mbedtls_x509_crt_profile_suiteb except allow any PK alg */
++/* (reference: see also mbedtls_x509_crt_profile_next) */
++/* ??? should permit SHA-512, too, and additional curves ??? */
++static const mbedtls_x509_crt_profile tls_mbedtls_crt_profile_suiteb192_anypk =
++{
++ /* Only SHA-384 */
++ MBEDTLS_X509_ID_FLAG( MBEDTLS_MD_SHA384 ),
++ 0xFFFFFFF, /* Any PK alg */
++#if defined(MBEDTLS_ECP_C)
++ /* Only NIST P-384 */
++ MBEDTLS_X509_ID_FLAG( MBEDTLS_ECP_DP_SECP384R1 ),
++#else
++ 0,
++#endif
++ 3072,
++};
++
++
++static int tls_mbedtls_set_params(struct tls_conf *tls_conf,
++ const struct tls_connection_params *params)
++{
++ tls_conf->flags = params->flags;
++
++ if (tls_conf->flags & TLS_CONN_REQUIRE_OCSP_ALL) {
++ emsg(MSG_INFO, "ocsp=3 not supported");
++ return -1;
++ }
++
++ if (tls_conf->flags & TLS_CONN_REQUIRE_OCSP) {
++ emsg(MSG_INFO, "ocsp not supported");
++ return -1;
++ }
++
++ int suiteb128 = 0;
++ int suiteb192 = 0;
++ if (params->openssl_ciphers) {
++ if (os_strcmp(params->openssl_ciphers, "SUITEB192") == 0) {
++ suiteb192 = 1;
++ tls_conf->flags |= TLS_CONN_SUITEB;
++ }
++ if (os_strcmp(params->openssl_ciphers, "SUITEB128") == 0) {
++ suiteb128 = 1;
++ tls_conf->flags |= TLS_CONN_SUITEB;
++ }
++ }
++
++ int ret = mbedtls_ssl_config_defaults(
++ &tls_conf->conf, tls_ctx_global.tls_conf ? MBEDTLS_SSL_IS_SERVER
++ : MBEDTLS_SSL_IS_CLIENT,
++ MBEDTLS_SSL_TRANSPORT_STREAM,
++ (tls_conf->flags & TLS_CONN_SUITEB) ? MBEDTLS_SSL_PRESET_SUITEB
++ : MBEDTLS_SSL_PRESET_DEFAULT);
++ if (ret != 0) {
++ elog(ret, "mbedtls_ssl_config_defaults");
++ return -1;
++ }
++
++ if (suiteb128) {
++ mbedtls_ssl_conf_cert_profile(&tls_conf->conf,
++ &tls_mbedtls_crt_profile_suiteb128);
++ mbedtls_ssl_conf_dhm_min_bitlen(&tls_conf->conf, 2048);
++ }
++ else if (suiteb192) {
++ mbedtls_ssl_conf_cert_profile(&tls_conf->conf,
++ &tls_mbedtls_crt_profile_suiteb192);
++ mbedtls_ssl_conf_dhm_min_bitlen(&tls_conf->conf, 3072);
++ }
++ else if (tls_conf->flags & TLS_CONN_SUITEB) {
++ /* treat as suiteb192 while allowing any PK algorithm */
++ mbedtls_ssl_conf_cert_profile(&tls_conf->conf,
++ &tls_mbedtls_crt_profile_suiteb192_anypk);
++ mbedtls_ssl_conf_dhm_min_bitlen(&tls_conf->conf, 3072);
++ }
++
++ tls_mbedtls_set_allowed_tls_vers(tls_conf, &tls_conf->conf);
++ ret = tls_mbedtls_set_certs(tls_conf, params);
++ if (ret != 0)
++ return -1;
++
++ if (params->dh_file
++ && !tls_mbedtls_set_dhparams(tls_conf, params->dh_file)) {
++ return -1;
++ }
++
++ if (params->openssl_ecdh_curves
++ && !tls_mbedtls_set_curves(tls_conf, params->openssl_ecdh_curves)) {
++ return -1;
++ }
++
++ if (params->openssl_ciphers) {
++ if (!tls_mbedtls_set_ciphers(tls_conf, params->openssl_ciphers))
++ return -1;
++ }
++ else if (tls_conf->flags & TLS_CONN_SUITEB) {
++ /* special-case a select set of ciphers for hwsim tests */
++ if (!tls_mbedtls_set_ciphers(tls_conf,
++ (tls_conf->flags & TLS_CONN_SUITEB_NO_ECDH)
++ ? "DHE-RSA-AES256-GCM-SHA384"
++ : "ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384"))
++ return -1;
++ }
++
++ return 0;
++}
++
++
++int tls_connection_set_params(void *tls_ctx, struct tls_connection *conn,
++ const struct tls_connection_params *params)
++{
++ if (conn == NULL || params == NULL)
++ return -1;
++
++ tls_conf_deinit(conn->tls_conf);
++ struct tls_conf *tls_conf = conn->tls_conf = tls_conf_init(tls_ctx);
++ if (tls_conf == NULL)
++ return -1;
++
++ if (tls_ctx_global.tls_conf) {
++ tls_conf->check_crl = tls_ctx_global.tls_conf->check_crl;
++ tls_conf->check_crl_strict = tls_ctx_global.tls_conf->check_crl_strict;
++ /*(tls_openssl.c inherits check_cert_subject from global conf)*/
++ if (tls_ctx_global.tls_conf->check_cert_subject) {
++ tls_conf->check_cert_subject =
++ os_strdup(tls_ctx_global.tls_conf->check_cert_subject);
++ if (tls_conf->check_cert_subject == NULL)
++ return -1;
++ }
++ }
++
++ if (tls_mbedtls_set_params(tls_conf, params) != 0)
++ return -1;
++ conn->verify_peer = tls_conf->verify_peer;
++
++ return tls_mbedtls_ssl_setup(conn);
++}
++
++
++#ifdef TLS_MBEDTLS_SESSION_TICKETS
++
++static int tls_mbedtls_clienthello_session_ticket_prep (struct tls_connection *conn,
++ const u8 *data, size_t len)
++{
++ if (conn->tls_conf->flags & TLS_CONN_DISABLE_SESSION_TICKET)
++ return -1;
++ if (conn->clienthello_session_ticket)
++ tls_connection_deinit_clienthello_session_ticket(conn);
++ if (len) {
++ conn->clienthello_session_ticket = mbedtls_calloc(1, len);
++ if (conn->clienthello_session_ticket == NULL)
++ return -1;
++ conn->clienthello_session_ticket_len = len;
++ os_memcpy(conn->clienthello_session_ticket, data, len);
++ }
++ return 0;
++}
++
++
++static void tls_mbedtls_clienthello_session_ticket_set (struct tls_connection *conn)
++{
++ mbedtls_ssl_session *sess = conn->ssl.MBEDTLS_PRIVATE(session_negotiate);
++ if (sess->MBEDTLS_PRIVATE(ticket)) {
++ mbedtls_platform_zeroize(sess->MBEDTLS_PRIVATE(ticket),
++ sess->MBEDTLS_PRIVATE(ticket_len));
++ mbedtls_free(sess->MBEDTLS_PRIVATE(ticket));
++ }
++ sess->MBEDTLS_PRIVATE(ticket) = conn->clienthello_session_ticket;
++ sess->MBEDTLS_PRIVATE(ticket_len) = conn->clienthello_session_ticket_len;
++ sess->MBEDTLS_PRIVATE(ticket_lifetime) = 86400;/* XXX: can hint be 0? */
++
++ conn->clienthello_session_ticket = NULL;
++ conn->clienthello_session_ticket_len = 0;
++}
++
++
++static int tls_mbedtls_ssl_ticket_write(void *p_ticket,
++ const mbedtls_ssl_session *session,
++ unsigned char *start,
++ const unsigned char *end,
++ size_t *tlen,
++ uint32_t *lifetime)
++{
++ struct tls_connection *conn = p_ticket;
++ if (conn && conn->session_ticket_cb) {
++ /* see tls_mbedtls_clienthello_session_ticket_prep() */
++ /* see tls_mbedtls_clienthello_session_ticket_set() */
++ return 0;
++ }
++
++ return mbedtls_ssl_ticket_write(&tls_ctx_global.ticket_ctx,
++ session, start, end, tlen, lifetime);
++}
++
++
++static int tls_mbedtls_ssl_ticket_parse(void *p_ticket,
++ mbedtls_ssl_session *session,
++ unsigned char *buf,
++ size_t len)
++{
++ /* XXX: TODO: not implemented in client;
++ * mbedtls_ssl_conf_session_tickets_cb() callbacks only for TLS server*/
++
++ if (len == 0)
++ return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
++
++ struct tls_connection *conn = p_ticket;
++ if (conn && conn->session_ticket_cb) {
++ /* XXX: have random and secret been initialized yet?
++ * or must keys first be exported?
++ * EAP-FAST uses all args, EAP-TEAP only uses secret */
++ struct tls_random data;
++ if (tls_connection_get_random(NULL, conn, &data) != 0)
++ return MBEDTLS_ERR_SSL_INTERNAL_ERROR;
++ int ret =
++ conn->session_ticket_cb(conn->session_ticket_cb_ctx,
++ buf, len,
++ data.client_random,
++ data.server_random,
++ conn->expkey_secret);
++ if (ret == 1) {
++ conn->resumed = 1;
++ return 0;
++ }
++ emsg(MSG_ERROR, "EAP session ticket ext not implemented");
++ return MBEDTLS_ERR_SSL_INVALID_MAC;
++ /*(non-zero return used for mbedtls debug logging)*/
++ }
++
++ /* XXX: TODO always use tls_mbedtls_ssl_ticket_parse() for callback? */
++ int rc = mbedtls_ssl_ticket_parse(&tls_ctx_global.ticket_ctx,
++ session, buf, len);
++ if (conn)
++ conn->resumed = (rc == 0);
++ return rc;
++}
++
++#endif /* TLS_MBEDTLS_SESSION_TICKETS */
++
++
++__attribute_cold__
++int tls_global_set_params(void *tls_ctx,
++ const struct tls_connection_params *params)
++{
++ /* XXX: why might global_set_params be called more than once? */
++ if (tls_ctx_global.tls_conf)
++ tls_conf_deinit(tls_ctx_global.tls_conf);
++ tls_ctx_global.tls_conf = tls_conf_init(tls_ctx);
++ if (tls_ctx_global.tls_conf == NULL)
++ return -1;
++
++ #ifdef MBEDTLS_SSL_SESSION_TICKETS
++ #ifdef MBEDTLS_SSL_TICKET_C
++ if (!(params->flags & TLS_CONN_DISABLE_SESSION_TICKET))
++ #ifdef TLS_MBEDTLS_SESSION_TICKETS
++ mbedtls_ssl_conf_session_tickets_cb(&tls_ctx_global.tls_conf->conf,
++ tls_mbedtls_ssl_ticket_write,
++ tls_mbedtls_ssl_ticket_parse,
++ NULL);
++ #else
++ mbedtls_ssl_conf_session_tickets_cb(&tls_ctx_global.tls_conf->conf,
++ mbedtls_ssl_ticket_write,
++ mbedtls_ssl_ticket_parse,
++ &tls_ctx_global.ticket_ctx);
++ #endif
++ #endif
++ #endif
++
++ os_free(tls_ctx_global.ocsp_stapling_response);
++ tls_ctx_global.ocsp_stapling_response = NULL;
++ if (params->ocsp_stapling_response)
++ tls_ctx_global.ocsp_stapling_response =
++ os_strdup(params->ocsp_stapling_response);
++
++ os_free(tls_ctx_global.ca_cert_file);
++ tls_ctx_global.ca_cert_file = NULL;
++ if (params->ca_cert)
++ tls_ctx_global.ca_cert_file = os_strdup(params->ca_cert);
++ return tls_mbedtls_set_params(tls_ctx_global.tls_conf, params);
++}
++
++
++int tls_global_set_verify(void *tls_ctx, int check_crl, int strict)
++{
++ tls_ctx_global.tls_conf->check_crl = check_crl;
++ tls_ctx_global.tls_conf->check_crl_strict = strict; /*(time checks)*/
++ return 0;
++}
++
++
++int tls_connection_set_verify(void *tls_ctx, struct tls_connection *conn,
++ int verify_peer, unsigned int flags,
++ const u8 *session_ctx, size_t session_ctx_len)
++{
++ /*(EAP server-side calls this from eap_server_tls_ssl_init())*/
++ if (conn == NULL)
++ return -1;
++
++ conn->tls_conf->flags |= flags;/* TODO: reprocess flags, if necessary */
++
++ int authmode;
++ switch (verify_peer) {
++ case 2: authmode = MBEDTLS_SSL_VERIFY_OPTIONAL; break;/*(eap_teap_init())*/
++ case 1: authmode = MBEDTLS_SSL_VERIFY_REQUIRED; break;
++ default: authmode = MBEDTLS_SSL_VERIFY_NONE; break;
++ }
++ mbedtls_ssl_set_hs_authmode(&conn->ssl, authmode);
++
++ if ((conn->verify_peer = (authmode != MBEDTLS_SSL_VERIFY_NONE)))
++ mbedtls_ssl_set_verify(&conn->ssl, tls_mbedtls_verify_cb, conn);
++ else
++ mbedtls_ssl_set_verify(&conn->ssl, NULL, NULL);
++
++ return 0;
++}
++
++
++#if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
++static void tls_connection_export_keys_cb(
++ void *p_expkey, mbedtls_ssl_key_export_type secret_type,
++ const unsigned char *secret, size_t secret_len,
++ const unsigned char client_random[MBEDTLS_EXPKEY_RAND_LEN],
++ const unsigned char server_random[MBEDTLS_EXPKEY_RAND_LEN],
++ mbedtls_tls_prf_types tls_prf_type)
++{
++ struct tls_connection *conn = p_expkey;
++ conn->tls_prf_type = tls_prf_type;
++ if (!tls_prf_type)
++ return;
++ if (secret_len > sizeof(conn->expkey_secret)) {
++ emsg(MSG_ERROR, "tls_connection_export_keys_cb secret too long");
++ conn->tls_prf_type = MBEDTLS_SSL_TLS_PRF_NONE; /* 0 */
++ return;
++ }
++ conn->expkey_secret_len = secret_len;
++ os_memcpy(conn->expkey_secret, secret, secret_len);
++ os_memcpy(conn->expkey_randbytes,
++ client_random, MBEDTLS_EXPKEY_RAND_LEN);
++ os_memcpy(conn->expkey_randbytes + MBEDTLS_EXPKEY_RAND_LEN,
++ server_random, MBEDTLS_EXPKEY_RAND_LEN);
++}
++#elif MBEDTLS_VERSION_NUMBER >= 0x02120000 /* mbedtls 2.18.0 */
++static int tls_connection_export_keys_cb(
++ void *p_expkey,
++ const unsigned char *ms,
++ const unsigned char *kb,
++ size_t maclen,
++ size_t keylen,
++ size_t ivlen,
++ const unsigned char client_random[MBEDTLS_EXPKEY_RAND_LEN],
++ const unsigned char server_random[MBEDTLS_EXPKEY_RAND_LEN],
++ mbedtls_tls_prf_types tls_prf_type )
++{
++ struct tls_connection *conn = p_expkey;
++ conn->tls_prf_type = tls_prf_type;
++ if (!tls_prf_type)
++ return -1; /*(return value ignored by mbedtls)*/
++ conn->expkey_keyblock_size = maclen + keylen + ivlen;
++ conn->expkey_secret_len = MBEDTLS_EXPKEY_FIXED_SECRET_LEN;
++ os_memcpy(conn->expkey_secret, ms, MBEDTLS_EXPKEY_FIXED_SECRET_LEN);
++ os_memcpy(conn->expkey_randbytes,
++ client_random, MBEDTLS_EXPKEY_RAND_LEN);
++ os_memcpy(conn->expkey_randbytes + MBEDTLS_EXPKEY_RAND_LEN,
++ server_random, MBEDTLS_EXPKEY_RAND_LEN);
++ return 0;
++}
++#endif
++
++
++int tls_connection_get_random(void *tls_ctx, struct tls_connection *conn,
++ struct tls_random *data)
++{
++ if (!conn || !conn->tls_prf_type)
++ return -1;
++ data->client_random = conn->expkey_randbytes;
++ data->client_random_len = MBEDTLS_EXPKEY_RAND_LEN;
++ data->server_random = conn->expkey_randbytes + MBEDTLS_EXPKEY_RAND_LEN;
++ data->server_random_len = MBEDTLS_EXPKEY_RAND_LEN;
++ return 0;
++}
++
++
++int tls_connection_export_key(void *tls_ctx, struct tls_connection *conn,
++ const char *label, const u8 *context,
++ size_t context_len, u8 *out, size_t out_len)
++{
++ /* (EAP-PEAP EAP-TLS EAP-TTLS) */
++ #if MBEDTLS_VERSION_NUMBER >= 0x02120000 /* mbedtls 2.18.0 */
++ return (conn && conn->established && conn->tls_prf_type)
++ ? mbedtls_ssl_tls_prf(conn->tls_prf_type,
++ conn->expkey_secret, conn->expkey_secret_len, label,
++ conn->expkey_randbytes,
++ sizeof(conn->expkey_randbytes), out, out_len)
++ : -1;
++ #else
++ /* not implemented here for mbedtls < 2.18.0 */
++ return -1;
++ #endif
++}
++
++
++#ifdef TLS_MBEDTLS_EAP_FAST
++
++#if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
++/* keyblock size info is not exposed in mbed TLS 3.0.0 */
++/* extracted from mbedtls library/ssl_tls.c:ssl_tls12_populate_transform() */
++#include <mbedtls/ssl_ciphersuites.h>
++#include <mbedtls/cipher.h>
++static size_t tls_mbedtls_ssl_keyblock_size (mbedtls_ssl_context *ssl)
++{
++ #if !defined(MBEDTLS_USE_PSA_CRYPTO) /* XXX: (not extracted for PSA crypto) */
++ #if defined(MBEDTLS_SSL_PROTO_TLS1_3)
++ if (tls_version == MBEDTLS_SSL_VERSION_TLS1_3)
++ return 0; /* (calculation not extracted) */
++ #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */
++
++ int ciphersuite = mbedtls_ssl_get_ciphersuite_id_from_ssl(ssl);
++ const mbedtls_ssl_ciphersuite_t *ciphersuite_info =
++ mbedtls_ssl_ciphersuite_from_id(ciphersuite);
++ if (ciphersuite_info == NULL)
++ return 0;
++
++ const mbedtls_cipher_info_t *cipher_info =
++ mbedtls_cipher_info_from_type(ciphersuite_info->MBEDTLS_PRIVATE(cipher));
++ if (cipher_info == NULL)
++ return 0;
++
++ #if MBEDTLS_VERSION_NUMBER >= 0x03010000 /* mbedtls 3.1.0 */
++ size_t keylen = mbedtls_cipher_info_get_key_bitlen(cipher_info) / 8;
++ mbedtls_cipher_mode_t mode = mbedtls_cipher_info_get_mode(cipher_info);
++ #else
++ size_t keylen = cipher_info->MBEDTLS_PRIVATE(key_bitlen) / 8;
++ mbedtls_cipher_mode_t mode = cipher_info->MBEDTLS_PRIVATE(mode);
++ #endif
++ #if defined(MBEDTLS_GCM_C) || \
++ defined(MBEDTLS_CCM_C) || \
++ defined(MBEDTLS_CHACHAPOLY_C)
++ if (mode == MBEDTLS_MODE_GCM || mode == MBEDTLS_MODE_CCM)
++ return keylen + 4;
++ else if (mode == MBEDTLS_MODE_CHACHAPOLY)
++ return keylen + 12;
++ else
++ #endif /* MBEDTLS_GCM_C || MBEDTLS_CCM_C || MBEDTLS_CHACHAPOLY_C */
++ #if defined(MBEDTLS_SSL_SOME_SUITES_USE_MAC)
++ {
++ const mbedtls_md_info_t *md_info =
++ mbedtls_md_info_from_type(ciphersuite_info->MBEDTLS_PRIVATE(mac));
++ if (md_info == NULL)
++ return 0;
++ size_t mac_key_len = mbedtls_md_get_size(md_info);
++ size_t ivlen = mbedtls_cipher_info_get_iv_size(cipher_info);
++ return keylen + mac_key_len + ivlen;
++ }
++ #endif /* MBEDTLS_SSL_SOME_SUITES_USE_MAC */
++ #endif /* !MBEDTLS_USE_PSA_CRYPTO *//* (not extracted for PSA crypto) */
++ return 0;
++}
++#endif /* MBEDTLS_VERSION_NUMBER >= 0x03000000 *//* mbedtls 3.0.0 */
++
++
++int tls_connection_get_eap_fast_key(void *tls_ctx, struct tls_connection *conn,
++ u8 *out, size_t out_len)
++{
++ /* XXX: has export keys callback been run? */
++ if (!conn || !conn->tls_prf_type)
++ return -1;
++
++ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
++ conn->expkey_keyblock_size = tls_mbedtls_ssl_keyblock_size(&conn->ssl);
++ if (conn->expkey_keyblock_size == 0)
++ return -1;
++ #endif
++ size_t skip = conn->expkey_keyblock_size * 2;
++ unsigned char *tmp_out = os_malloc(skip + out_len);
++ if (!tmp_out)
++ return -1;
++
++ /* server_random and then client_random */
++ unsigned char seed[MBEDTLS_EXPKEY_RAND_LEN*2];
++ os_memcpy(seed, conn->expkey_randbytes + MBEDTLS_EXPKEY_RAND_LEN,
++ MBEDTLS_EXPKEY_RAND_LEN);
++ os_memcpy(seed + MBEDTLS_EXPKEY_RAND_LEN, conn->expkey_randbytes,
++ MBEDTLS_EXPKEY_RAND_LEN);
++
++ #if MBEDTLS_VERSION_NUMBER >= 0x02120000 /* mbedtls 2.18.0 */
++ int ret = mbedtls_ssl_tls_prf(conn->tls_prf_type,
++ conn->expkey_secret, conn->expkey_secret_len,
++ "key expansion", seed, sizeof(seed),
++ tmp_out, skip + out_len);
++ if (ret == 0)
++ os_memcpy(out, tmp_out + skip, out_len);
++ #else
++ int ret = -1; /*(not reached if not impl; return -1 at top of func)*/
++ #endif
++
++ bin_clear_free(tmp_out, skip + out_len);
++ forced_memzero(seed, sizeof(seed));
++ return ret;
++}
++
++#endif /* TLS_MBEDTLS_EAP_FAST */
++
++
++__attribute_cold__
++static void tls_mbedtls_suiteb_handshake_alert (struct tls_connection *conn)
++{
++ /* tests/hwsim/test_suite_b.py test_suite_b_192_rsa_insufficient_dh */
++ if (!(conn->tls_conf->flags & TLS_CONN_SUITEB))
++ return;
++ if (tls_ctx_global.tls_conf) /*(is server; want issue event on client)*/
++ return;
++ #if 0
++ /*(info not available on client;
++ * mbed TLS library enforces dhm min bitlen in ServerKeyExchange)*/
++ if (MBEDTLS_TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 ==
++ #if MBEDTLS_VERSION_NUMBER < 0x03020000 /* mbedtls 3.2.0 */
++ mbedtls_ssl_get_ciphersuite_id_from_ssl(&conn->ssl)
++ #else
++ mbedtls_ssl_get_ciphersuite_id(
++ mbedtls_ssl_get_ciphersuite(&conn->ssl))
++ #endif
++ && mbedtls_mpi_size(&conn->tls_conf->conf.MBEDTLS_PRIVATE(dhm_P))
++ < 384 /*(3072/8)*/)
++ #endif
++ {
++ struct tls_config *init_conf = &tls_ctx_global.init_conf;
++ if (init_conf->event_cb) {
++ union tls_event_data ev;
++ os_memset(&ev, 0, sizeof(ev));
++ ev.alert.is_local = 1;
++ ev.alert.type = "fatal";
++ /*"internal error" string for tests/hwsim/test_suiteb.py */
++ ev.alert.description = "internal error: handshake failure";
++ /*ev.alert.description = "insufficient security";*/
++ init_conf->event_cb(init_conf->cb_ctx, TLS_ALERT, &ev);
++ }
++ }
++}
++
++
++struct wpabuf * tls_connection_handshake(void *tls_ctx,
++ struct tls_connection *conn,
++ const struct wpabuf *in_data,
++ struct wpabuf **appl_data)
++{
++ if (appl_data)
++ *appl_data = NULL;
++
++ if (in_data && wpabuf_len(in_data)) {
++ /*(unsure why tls_gnutls.c discards buffer contents; skip here)*/
++ if (conn->pull_buf && 0) /* disable; appears unwise */
++ tls_pull_buf_discard(conn, __func__);
++ if (!tls_pull_buf_append(conn, in_data))
++ return NULL;
++ }
++
++ if (conn->tls_conf == NULL) {
++ struct tls_connection_params params;
++ os_memset(¶ms, 0, sizeof(params));
++ params.openssl_ciphers =
++ tls_ctx_global.init_conf.openssl_ciphers;
++ params.flags = tls_ctx_global.tls_conf->flags;
++ if (tls_connection_set_params(tls_ctx, conn, ¶ms) != 0)
++ return NULL;
++ }
++
++ if (conn->verify_peer) /*(call here might be redundant; nbd)*/
++ mbedtls_ssl_set_verify(&conn->ssl, tls_mbedtls_verify_cb, conn);
++
++ #ifdef TLS_MBEDTLS_SESSION_TICKETS
++ if (conn->clienthello_session_ticket)
++ /*(starting handshake for EAP-FAST and EAP-TEAP)*/
++ tls_mbedtls_clienthello_session_ticket_set(conn);
++
++ /* (not thread-safe due to need to set userdata 'conn' for callback) */
++ /* (unable to use mbedtls_ssl_set_user_data_p() with mbedtls 3.2.0+
++ * since ticket write and parse callbacks take (mbedtls_ssl_session *)
++ * param instead of (mbedtls_ssl_context *) param) */
++ if (conn->tls_conf->flags & TLS_CONN_DISABLE_SESSION_TICKET)
++ mbedtls_ssl_conf_session_tickets_cb(&conn->tls_conf->conf,
++ NULL, NULL, NULL);
++ else
++ mbedtls_ssl_conf_session_tickets_cb(&conn->tls_conf->conf,
++ tls_mbedtls_ssl_ticket_write,
++ tls_mbedtls_ssl_ticket_parse,
++ conn);
++ #endif
++
++ #if MBEDTLS_VERSION_NUMBER >= 0x03020000 /* mbedtls 3.2.0 */
++ int ret = mbedtls_ssl_handshake(&conn->ssl);
++ #else
++ int ret = 0;
++ while (conn->ssl.MBEDTLS_PRIVATE(state) != MBEDTLS_SSL_HANDSHAKE_OVER) {
++ ret = mbedtls_ssl_handshake_step(&conn->ssl);
++ if (ret != 0)
++ break;
++ }
++ #endif
++
++ #ifdef TLS_MBEDTLS_SESSION_TICKETS
++ mbedtls_ssl_conf_session_tickets_cb(&conn->tls_conf->conf,
++ tls_mbedtls_ssl_ticket_write,
++ tls_mbedtls_ssl_ticket_parse,
++ NULL);
++ #endif
++
++ switch (ret) {
++ case 0:
++ conn->established = 1;
++ if (conn->push_buf == NULL)
++ /* Need to return something to get final TLS ACK. */
++ conn->push_buf = wpabuf_alloc(0);
++
++ if (appl_data /*&& conn->pull_buf && wpabuf_len(conn->pull_buf)*/)
++ *appl_data = NULL; /* RFE: check for application data */
++ break;
++ case MBEDTLS_ERR_SSL_WANT_WRITE:
++ case MBEDTLS_ERR_SSL_WANT_READ:
++ case MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS:
++ case MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS:
++ if (tls_ctx_global.tls_conf /*(is server)*/
++ && conn->established && conn->push_buf == NULL)
++ /* Need to return something to trigger completion of EAP-TLS. */
++ conn->push_buf = wpabuf_alloc(0);
++ break;
++ default:
++ ++conn->failed;
++ switch (ret) {
++ case MBEDTLS_ERR_SSL_CLIENT_RECONNECT:
++ case MBEDTLS_ERR_NET_CONN_RESET:
++ case MBEDTLS_ERR_NET_SEND_FAILED:
++ ++conn->write_alerts;
++ break;
++ #if MBEDTLS_VERSION_NUMBER >= 0x03000000 /* mbedtls 3.0.0 */
++ case MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE:
++ #else
++ case MBEDTLS_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE:
++ #endif
++ tls_mbedtls_suiteb_handshake_alert(conn);
++ /* fall through */
++ case MBEDTLS_ERR_NET_RECV_FAILED:
++ case MBEDTLS_ERR_SSL_CONN_EOF:
++ case MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY:
++ case MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE:
++ ++conn->read_alerts;
++ break;
++ default:
++ break;
++ }
++
++ ilog(ret, "mbedtls_ssl_handshake");
++ break;
++ }
++
++ struct wpabuf *out_data = conn->push_buf;
++ conn->push_buf = NULL;
++ return out_data;
++}
++
++
++struct wpabuf * tls_connection_server_handshake(void *tls_ctx,
++ struct tls_connection *conn,
++ const struct wpabuf *in_data,
++ struct wpabuf **appl_data)
++{
++ conn->is_server = 1;
++ return tls_connection_handshake(tls_ctx, conn, in_data, appl_data);
++}
++
++
++struct wpabuf * tls_connection_encrypt(void *tls_ctx,
++ struct tls_connection *conn,
++ const struct wpabuf *in_data)
++{
++ int res = mbedtls_ssl_write(&conn->ssl,
++ wpabuf_head_u8(in_data), wpabuf_len(in_data));
++ if (res < 0) {
++ elog(res, "mbedtls_ssl_write");
++ return NULL;
++ }
++
++ struct wpabuf *buf = conn->push_buf;
++ conn->push_buf = NULL;
++ return buf;
++}
++
++
++struct wpabuf * tls_connection_decrypt(void *tls_ctx,
++ struct tls_connection *conn,
++ const struct wpabuf *in_data)
++{
++ int res;
++ struct wpabuf *out;
++
++ /*assert(in_data != NULL);*/
++ if (!tls_pull_buf_append(conn, in_data))
++ return NULL;
++
++ #if defined(MBEDTLS_ZLIB_SUPPORT) /* removed in mbedtls 3.x */
++ /* Add extra buffer space to handle the possibility of decrypted
++ * data being longer than input data due to TLS compression. */
++ out = wpabuf_alloc((wpabuf_len(in_data) + 500) * 3);
++ #else /* TLS compression is disabled in mbedtls 3.x */
++ out = wpabuf_alloc(wpabuf_len(in_data));
++ #endif
++ if (out == NULL)
++ return NULL;
++
++ res = mbedtls_ssl_read(&conn->ssl, wpabuf_mhead(out), wpabuf_size(out));
++ if (res < 0) {
++ #if 1 /*(seems like a different error if wpabuf_len(in_data) == 0)*/
++ if (res == MBEDTLS_ERR_SSL_WANT_READ)
++ return out;
++ #endif
++ elog(res, "mbedtls_ssl_read");
++ wpabuf_free(out);
++ return NULL;
++ }
++ wpabuf_put(out, res);
++
++ return out;
++}
++
++
++int tls_connection_resumed(void *tls_ctx, struct tls_connection *conn)
++{
++ /* XXX: might need to detect if session resumed from TLS session ticket
++ * even if not special session ticket handling for EAP-FAST, EAP-TEAP */
++ /* (?ssl->handshake->resume during session ticket validation?) */
++ return conn && conn->resumed;
++}
++
++
++#ifdef TLS_MBEDTLS_EAP_FAST
++int tls_connection_set_cipher_list(void *tls_ctx, struct tls_connection *conn,
++ u8 *ciphers)
++{
++ /* ciphers is list of TLS_CIPHER_* from hostap/src/crypto/tls.h */
++ int ids[7];
++ const int idsz = (int)sizeof(ids);
++ int nids = -1, id;
++ for ( ; *ciphers != TLS_CIPHER_NONE; ++ciphers) {
++ switch (*ciphers) {
++ case TLS_CIPHER_RC4_SHA:
++ #ifdef MBEDTLS_TLS_RSA_WITH_RC4_128_SHA
++ id = MBEDTLS_TLS_RSA_WITH_RC4_128_SHA;
++ break;
++ #else
++ continue; /*(not supported in mbedtls 3.x; ignore)*/
++ #endif
++ case TLS_CIPHER_AES128_SHA:
++ id = MBEDTLS_TLS_RSA_WITH_AES_128_CBC_SHA;
++ break;
++ case TLS_CIPHER_RSA_DHE_AES128_SHA:
++ id = MBEDTLS_TLS_DHE_RSA_WITH_AES_128_CBC_SHA;
++ break;
++ case TLS_CIPHER_ANON_DH_AES128_SHA:
++ continue; /*(not supported in mbedtls; ignore)*/
++ case TLS_CIPHER_RSA_DHE_AES256_SHA:
++ id = MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA;
++ break;
++ case TLS_CIPHER_AES256_SHA:
++ id = MBEDTLS_TLS_RSA_WITH_AES_256_CBC_SHA;
++ break;
++ default:
++ return -1; /* should not happen */
++ }
++ if (++nids == idsz)
++ return -1; /* should not happen */
++ ids[nids] = id;
++ }
++ if (nids < 0)
++ return 0; /* nothing to do */
++ if (++nids == idsz)
++ return -1; /* should not happen */
++ ids[nids] = 0; /* terminate list */
++ ++nids;
++
++ return tls_mbedtls_set_ciphersuites(conn->tls_conf, ids, nids) ? 0 : -1;
++}
++#endif
++
++
++int tls_get_version(void *ssl_ctx, struct tls_connection *conn,
++ char *buf, size_t buflen)
++{
++ if (conn == NULL)
++ return -1;
++ os_strlcpy(buf, mbedtls_ssl_get_version(&conn->ssl), buflen);
++ return buf[0] != 'u' ? 0 : -1; /*(-1 if "unknown")*/
++}
++
++
++#ifdef TLS_MBEDTLS_EAP_TEAP
++u16 tls_connection_get_cipher_suite(struct tls_connection *conn)
++{
++ if (conn == NULL)
++ return 0;
++ return (u16)mbedtls_ssl_get_ciphersuite_id_from_ssl(&conn->ssl);
++}
++#endif
++
++
++int tls_get_cipher(void *tls_ctx, struct tls_connection *conn,
++ char *buf, size_t buflen)
++{
++ if (conn == NULL)
++ return -1;
++ const int id = mbedtls_ssl_get_ciphersuite_id_from_ssl(&conn->ssl);
++ return tls_mbedtls_translate_ciphername(id, buf, buflen) ? 0 : -1;
++}
++
++
++#ifdef TLS_MBEDTLS_SESSION_TICKETS
++
++int tls_connection_enable_workaround(void *tls_ctx,
++ struct tls_connection *conn)
++{
++ /* (see comment in src/eap_peer/eap_fast.c:eap_fast_init()) */
++ /* XXX: is there a relevant setting for this in mbed TLS? */
++ /* (do we even care that much about older CBC ciphers?) */
++ return 0;
++}
++
++
++int tls_connection_client_hello_ext(void *tls_ctx, struct tls_connection *conn,
++ int ext_type, const u8 *data,
++ size_t data_len)
++{
++ /* (EAP-FAST and EAP-TEAP) */
++ if (ext_type == MBEDTLS_TLS_EXT_SESSION_TICKET) /*(ext_type == 35)*/
++ return tls_mbedtls_clienthello_session_ticket_prep(conn, data,
++ data_len);
++
++ return -1;
++}
++
++#endif /* TLS_MBEDTLS_SESSION_TICKETS */
++
++
++int tls_connection_get_failed(void *tls_ctx, struct tls_connection *conn)
++{
++ return conn ? conn->failed : -1;
++}
++
++
++int tls_connection_get_read_alerts(void *tls_ctx, struct tls_connection *conn)
++{
++ return conn ? conn->read_alerts : -1;
++}
++
++
++int tls_connection_get_write_alerts(void *tls_ctx,
++ struct tls_connection *conn)
++{
++ return conn ? conn->write_alerts : -1;
++}
++
++
++#ifdef TLS_MBEDTLS_SESSION_TICKETS
++int tls_connection_set_session_ticket_cb(
++ void *tls_ctx, struct tls_connection *conn,
++ tls_session_ticket_cb cb, void *ctx)
++{
++ if (!(conn->tls_conf->flags & TLS_CONN_DISABLE_SESSION_TICKET)) {
++ /* (EAP-FAST and EAP-TEAP) */
++ conn->session_ticket_cb = cb;
++ conn->session_ticket_cb_ctx = ctx;
++ return 0;
++ }
++ return -1;
++}
++#endif
++
++
++int tls_get_library_version(char *buf, size_t buf_len)
++{
++ #ifndef MBEDTLS_VERSION_C
++ const char * const ver = "n/a";
++ #else
++ char ver[9];
++ mbedtls_version_get_string(ver);
++ #endif
++ return os_snprintf(buf, buf_len,
++ "mbed TLS build=" MBEDTLS_VERSION_STRING " run=%s", ver);
++}
++
++
++void tls_connection_set_success_data(struct tls_connection *conn,
++ struct wpabuf *data)
++{
++ wpabuf_free(conn->success_data);
++ conn->success_data = data;
++}
++
++
++void tls_connection_set_success_data_resumed(struct tls_connection *conn)
++{
++}
++
++
++const struct wpabuf *
++tls_connection_get_success_data(struct tls_connection *conn)
++{
++ return conn->success_data;
++}
++
++
++void tls_connection_remove_session(struct tls_connection *conn)
++{
++}
++
++
++#ifdef TLS_MBEDTLS_EAP_TEAP
++int tls_get_tls_unique(struct tls_connection *conn, u8 *buf, size_t max_len)
++{
++ #if defined(MBEDTLS_SSL_RENEGOTIATION) /* XXX: renegotiation or resumption? */
++ /* data from TLS handshake Finished message */
++ size_t verify_len = conn->ssl.MBEDTLS_PRIVATE(verify_data_len);
++ char *verify_data = (conn->is_server ^ conn->resumed)
++ ? conn->ssl.MBEDTLS_PRIVATE(peer_verify_data)
++ : conn->ssl.MBEDTLS_PRIVATE(own_verify_data);
++ if (verify_len && verify_len <= max_len) {
++ os_memcpy(buf, verify_data, verify_len);
++ return (int)verify_len;
++ }
++ #endif
++ return -1;
++}
++#endif
++
++
++__attribute_noinline__
++static void tls_mbedtls_set_peer_subject(struct tls_connection *conn, const mbedtls_x509_crt *crt)
++{
++ if (conn->peer_subject)
++ return;
++ char buf[MBEDTLS_X509_MAX_DN_NAME_SIZE*2];
++ int buflen = mbedtls_x509_dn_gets(buf, sizeof(buf), &crt->subject);
++ if (buflen >= 0 && (conn->peer_subject = os_malloc((size_t)buflen+1)))
++ os_memcpy(conn->peer_subject, buf, (size_t)buflen+1);
++}
++
++
++#ifdef TLS_MBEDTLS_EAP_TEAP
++const char * tls_connection_get_peer_subject(struct tls_connection *conn)
++{
++ if (!conn)
++ return NULL;
++ if (!conn->peer_subject) { /*(if not set during cert verify)*/
++ const mbedtls_x509_crt *peer_cert =
++ mbedtls_ssl_get_peer_cert(&conn->ssl);
++ if (peer_cert)
++ tls_mbedtls_set_peer_subject(conn, peer_cert);
++ }
++ return conn->peer_subject;
++}
++#endif
++
++
++#ifdef TLS_MBEDTLS_EAP_TEAP
++bool tls_connection_get_own_cert_used(struct tls_connection *conn)
++{
++ /* XXX: availability of cert does not necessary mean that client
++ * received certificate request from server and then sent cert.
++ * ? step handshake in tls_connection_handshake() looking for
++ * MBEDTLS_SSL_CERTIFICATE_REQUEST ? */
++ const struct tls_conf * const tls_conf = conn->tls_conf;
++ return (tls_conf->has_client_cert && tls_conf->has_private_key);
++}
++#endif
++
++
++#if defined(CONFIG_FIPS)
++#define TLS_MBEDTLS_CONFIG_FIPS
++#endif
++
++#if defined(CONFIG_SHA256)
++#define TLS_MBEDTLS_TLS_PRF_SHA256
++#endif
++
++#if defined(CONFIG_SHA384)
++#define TLS_MBEDTLS_TLS_PRF_SHA384
++#endif
++
++
++#ifndef TLS_MBEDTLS_CONFIG_FIPS
++#if defined(CONFIG_MODULE_TESTS)
++/* unused with CONFIG_TLS=mbedtls except in crypto_module_tests.c */
++#if MBEDTLS_VERSION_NUMBER >= 0x02120000 /* mbedtls 2.18.0 */ \
++ && MBEDTLS_VERSION_NUMBER < 0x03000000 /* mbedtls 3.0.0 */
++/* sha1-tlsprf.c */
++#include "sha1.h"
++int tls_prf_sha1_md5(const u8 *secret, size_t secret_len, const char *label,
++ const u8 *seed, size_t seed_len, u8 *out, size_t outlen)
++{
++ return mbedtls_ssl_tls_prf(MBEDTLS_SSL_TLS_PRF_TLS1,
++ secret, secret_len, label,
++ seed, seed_len, out, outlen) ? -1 : 0;
++}
++#else
++#include "sha1-tlsprf.c" /* pull in hostap local implementation */
++#endif
++#endif
++#endif
++
++#ifdef TLS_MBEDTLS_TLS_PRF_SHA256
++/* sha256-tlsprf.c */
++#if MBEDTLS_VERSION_NUMBER >= 0x02120000 /* mbedtls 2.18.0 */
++#include "sha256.h"
++int tls_prf_sha256(const u8 *secret, size_t secret_len, const char *label,
++ const u8 *seed, size_t seed_len, u8 *out, size_t outlen)
++{
++ return mbedtls_ssl_tls_prf(MBEDTLS_SSL_TLS_PRF_SHA256,
++ secret, secret_len, label,
++ seed, seed_len, out, outlen) ? -1 : 0;
++}
++#else
++#include "sha256-tlsprf.c" /* pull in hostap local implementation */
++#endif
++#endif
++
++#ifdef TLS_MBEDTLS_TLS_PRF_SHA384
++/* sha384-tlsprf.c */
++#if MBEDTLS_VERSION_NUMBER >= 0x02120000 /* mbedtls 2.18.0 */
++#include "sha384.h"
++int tls_prf_sha384(const u8 *secret, size_t secret_len, const char *label,
++ const u8 *seed, size_t seed_len, u8 *out, size_t outlen)
++{
++ return mbedtls_ssl_tls_prf(MBEDTLS_SSL_TLS_PRF_SHA384,
++ secret, secret_len, label,
++ seed, seed_len, out, outlen) ? -1 : 0;
++}
++#else
++#include "sha384-tlsprf.c" /* pull in hostap local implementation */
++#endif
++#endif
++
++
++#if MBEDTLS_VERSION_NUMBER < 0x03020000 /* mbedtls 3.2.0 */
++#define mbedtls_x509_crt_has_ext_type(crt, ext_type) \
++ ((crt)->MBEDTLS_PRIVATE(ext_types) & (ext_type))
++#endif
++
++struct mlist { const char *p; size_t n; };
++
++
++static int
++tls_mbedtls_match_altsubject(mbedtls_x509_crt *crt, const char *match)
++{
++ /* RFE: this could be pre-parsed into structured data at config time */
++ struct mlist list[256]; /*(much larger than expected)*/
++ int nlist = 0;
++ if ( os_strncmp(match, "EMAIL:", 6) != 0
++ && os_strncmp(match, "DNS:", 4) != 0
++ && os_strncmp(match, "URI:", 4) != 0 ) {
++ wpa_printf(MSG_INFO, "MTLS: Invalid altSubjectName match '%s'", match);
++ return 0;
++ }
++ for (const char *s = match, *tok; *s; s = tok ? tok+1 : "") {
++ do { } while ((tok = os_strchr(s, ';'))
++ && os_strncmp(tok+1, "EMAIL:", 6) != 0
++ && os_strncmp(tok+1, "DNS:", 4) != 0
++ && os_strncmp(tok+1, "URI:", 4) != 0);
++ list[nlist].p = s;
++ list[nlist].n = tok ? (size_t)(tok - s) : os_strlen(s);
++ if (list[nlist].n && ++nlist == sizeof(list)/sizeof(*list)) {
++ wpa_printf(MSG_INFO, "MTLS: excessive altSubjectName match '%s'",
++ match);
++ break; /* truncate huge list and continue */
++ }
++ }
++
++ if (!mbedtls_x509_crt_has_ext_type(crt, MBEDTLS_X509_EXT_SUBJECT_ALT_NAME))
++ return 0;
++
++ const mbedtls_x509_sequence *cur = &crt->subject_alt_names;
++ for (; cur != NULL; cur = cur->next) {
++ const unsigned char san_type = (unsigned char)cur->buf.tag
++ & MBEDTLS_ASN1_TAG_VALUE_MASK;
++ char t;
++ size_t step = 4;
++ switch (san_type) { /* "EMAIL:" or "DNS:" or "URI:" */
++ case MBEDTLS_X509_SAN_RFC822_NAME: step = 6; t = 'E'; break;
++ case MBEDTLS_X509_SAN_DNS_NAME: t = 'D'; break;
++ case MBEDTLS_X509_SAN_UNIFORM_RESOURCE_IDENTIFIER: t = 'U'; break;
++ default: continue;
++ }
++
++ for (int i = 0; i < nlist; ++i) {
++ /* step over "EMAIL:" or "DNS:" or "URI:" in list[i].p */
++ /* Note: v is not '\0'-terminated, but is a known length vlen,
++ * so okay to pass to os_strncasecmp() even though not z-string */
++ if (cur->buf.len == list[i].n - step && t == *list[i].p
++ && 0 == os_strncasecmp((char *)cur->buf.p,
++ list[i].p+step, cur->buf.len)) {
++ return 1; /* match */
++ }
++ }
++ }
++ return 0; /* no match */
++}
++
++
++static int
++tls_mbedtls_match_suffix(const char *v, size_t vlen,
++ const struct mlist *list, int nlist, int full)
++{
++ /* Note: v is not '\0'-terminated, but is a known length vlen,
++ * so okay to pass to os_strncasecmp() even though not z-string */
++ for (int i = 0; i < nlist; ++i) {
++ size_t n = list[i].n;
++ if ((n == vlen || (n < vlen && v[vlen-n-1] == '.' && !full))
++ && 0 == os_strncasecmp(v+vlen-n, list[i].p, n))
++ return 1; /* match */
++ }
++ return 0; /* no match */
++}
++
++
++static int
++tls_mbedtls_match_suffixes(mbedtls_x509_crt *crt, const char *match, int full)
++{
++ /* RFE: this could be pre-parsed into structured data at config time */
++ struct mlist list[256]; /*(much larger than expected)*/
++ int nlist = 0;
++ for (const char *s = match, *tok; *s; s = tok ? tok+1 : "") {
++ tok = os_strchr(s, ';');
++ list[nlist].p = s;
++ list[nlist].n = tok ? (size_t)(tok - s) : os_strlen(s);
++ if (list[nlist].n && ++nlist == sizeof(list)/sizeof(*list)) {
++ wpa_printf(MSG_INFO, "MTLS: excessive suffix match '%s'", match);
++ break; /* truncate huge list and continue */
++ }
++ }
++
++ /* check subjectAltNames */
++ if (mbedtls_x509_crt_has_ext_type(crt, MBEDTLS_X509_EXT_SUBJECT_ALT_NAME)) {
++ const mbedtls_x509_sequence *cur = &crt->subject_alt_names;
++ for (; cur != NULL; cur = cur->next) {
++ const unsigned char san_type = (unsigned char)cur->buf.tag
++ & MBEDTLS_ASN1_TAG_VALUE_MASK;
++ if (san_type == MBEDTLS_X509_SAN_DNS_NAME
++ && tls_mbedtls_match_suffix((char *)cur->buf.p,
++ cur->buf.len,
++ list, nlist, full)) {
++ return 1; /* match */
++ }
++ }
++ }
++
++ /* check subject CN */
++ const mbedtls_x509_name *name = &crt->subject;
++ for (; name != NULL; name = name->next) {
++ if (name->oid.p && MBEDTLS_OID_CMP(MBEDTLS_OID_AT_CN, &name->oid) == 0)
++ break;
++ }
++ if (name && tls_mbedtls_match_suffix((char *)name->val.p, name->val.len,
++ list, nlist, full)) {
++ return 1; /* match */
++ }
++
++ return 0; /* no match */
++}
++
++
++static int
++tls_mbedtls_match_dn_field(mbedtls_x509_crt *crt, const char *match)
++{
++ /* RFE: this could be pre-parsed into structured data at config time */
++ struct mlistoid { const char *p; size_t n;
++ const char *oid; size_t olen;
++ int prefix; };
++ struct mlistoid list[32]; /*(much larger than expected)*/
++ int nlist = 0;
++ for (const char *s = match, *tok, *e; *s; s = tok ? tok+1 : "") {
++ tok = os_strchr(s, '/');
++ list[nlist].oid = NULL;
++ list[nlist].olen = 0;
++ list[nlist].n = tok ? (size_t)(tok - s) : os_strlen(s);
++ e = memchr(s, '=', list[nlist].n);
++ if (e == NULL) {
++ if (list[nlist].n == 0)
++ continue; /* skip consecutive, repeated '/' */
++ if (list[nlist].n == 1 && *s == '*') {
++ /* special-case "*" to match any OID and value */
++ s = e = "=*";
++ list[nlist].n = 2;
++ list[nlist].oid = "";
++ }
++ else {
++ wpa_printf(MSG_INFO,
++ "MTLS: invalid check_cert_subject '%s' missing '='",
++ match);
++ return 0;
++ }
++ }
++ switch (e - s) {
++ case 1:
++ if (*s == 'C') {
++ list[nlist].oid = MBEDTLS_OID_AT_COUNTRY;
++ list[nlist].olen = sizeof(MBEDTLS_OID_AT_COUNTRY)-1;
++ }
++ else if (*s == 'L') {
++ list[nlist].oid = MBEDTLS_OID_AT_LOCALITY;
++ list[nlist].olen = sizeof(MBEDTLS_OID_AT_LOCALITY)-1;
++ }
++ else if (*s == 'O') {
++ list[nlist].oid = MBEDTLS_OID_AT_ORGANIZATION;
++ list[nlist].olen = sizeof(MBEDTLS_OID_AT_ORGANIZATION)-1;
++ }
++ break;
++ case 2:
++ if (s[0] == 'C' && s[1] == 'N') {
++ list[nlist].oid = MBEDTLS_OID_AT_CN;
++ list[nlist].olen = sizeof(MBEDTLS_OID_AT_CN)-1;
++ }
++ else if (s[0] == 'S' && s[1] == 'T') {
++ list[nlist].oid = MBEDTLS_OID_AT_STATE;
++ list[nlist].olen = sizeof(MBEDTLS_OID_AT_STATE)-1;
++ }
++ else if (s[0] == 'O' && s[1] == 'U') {
++ list[nlist].oid = MBEDTLS_OID_AT_ORG_UNIT;
++ list[nlist].olen = sizeof(MBEDTLS_OID_AT_ORG_UNIT)-1;
++ }
++ break;
++ case 12:
++ if (os_memcmp(s, "emailAddress", 12) == 0) {
++ list[nlist].oid = MBEDTLS_OID_PKCS9_EMAIL;
++ list[nlist].olen = sizeof(MBEDTLS_OID_PKCS9_EMAIL)-1;
++ }
++ break;
++ default:
++ break;
++ }
++ if (list[nlist].oid == NULL) {
++ wpa_printf(MSG_INFO,
++ "MTLS: Unknown field in check_cert_subject '%s'",
++ match);
++ return 0;
++ }
++ list[nlist].n -= (size_t)(++e - s);
++ list[nlist].p = e;
++ if (list[nlist].n && e[list[nlist].n-1] == '*') {
++ --list[nlist].n;
++ list[nlist].prefix = 1;
++ }
++ /*(could easily add support for suffix matches if value begins with '*',
++ * but suffix match is not currently supported by other TLS modules)*/
++
++ if (list[nlist].n && ++nlist == sizeof(list)/sizeof(*list)) {
++ wpa_printf(MSG_INFO,
++ "MTLS: excessive check_cert_subject match '%s'",
++ match);
++ break; /* truncate huge list and continue */
++ }
++ }
++
++ /* each component in match string must match cert Subject in order listed
++ * The behavior below preserves ordering but is slightly different than
++ * the grossly inefficient contortions implemented in tls_openssl.c */
++ const mbedtls_x509_name *name = &crt->subject;
++ for (int i = 0; i < nlist; ++i) {
++ int found = 0;
++ for (; name != NULL && !found; name = name->next) {
++ if (!name->oid.p)
++ continue;
++ /* special-case "*" to match any OID and value */
++ if (list[i].olen == 0) {
++ found = 1;
++ continue;
++ }
++ /* perform equalent of !MBEDTLS_OID_CMP() with oid ptr and len */
++ if (list[i].olen != name->oid.len
++ || os_memcmp(list[i].oid, name->oid.p, name->oid.len) != 0)
++ continue;
++ /* Note: v is not '\0'-terminated, but is a known length vlen,
++ * so okay to pass to os_strncasecmp() even though not z-string */
++ if ((list[i].prefix
++ ? list[i].n <= name->val.len /* prefix match */
++ : list[i].n == name->val.len) /* full match */
++ && 0 == os_strncasecmp((char *)name->val.p,
++ list[i].p, list[i].n)) {
++ found = 1;
++ continue;
++ }
++ }
++ if (!found)
++ return 0; /* no match */
++ }
++ return 1; /* match */
++}
++
++
++__attribute_cold__
++static void
++tls_mbedtls_verify_fail_event (mbedtls_x509_crt *crt, int depth,
++ const char *errmsg, enum tls_fail_reason reason)
++{
++ struct tls_config *init_conf = &tls_ctx_global.init_conf;
++ if (init_conf->event_cb == NULL)
++ return;
++
++ struct wpabuf *certbuf = wpabuf_alloc_copy(crt->raw.p, crt->raw.len);
++ char subject[MBEDTLS_X509_MAX_DN_NAME_SIZE*2];
++ if (mbedtls_x509_dn_gets(subject, sizeof(subject), &crt->subject) < 0)
++ subject[0] = '\0';
++ union tls_event_data ev;
++ os_memset(&ev, 0, sizeof(ev));
++ ev.cert_fail.reason = reason;
++ ev.cert_fail.depth = depth;
++ ev.cert_fail.subject = subject;
++ ev.cert_fail.reason_txt = errmsg;
++ ev.cert_fail.cert = certbuf;
++
++ init_conf->event_cb(init_conf->cb_ctx, TLS_CERT_CHAIN_FAILURE, &ev);
++
++ wpabuf_free(certbuf);
++}
++
++
++__attribute_noinline__
++static void
++tls_mbedtls_verify_cert_event (struct tls_connection *conn,
++ mbedtls_x509_crt *crt, int depth)
++{
++ struct tls_config *init_conf = &tls_ctx_global.init_conf;
++ if (init_conf->event_cb == NULL)
++ return;
++
++ struct wpabuf *certbuf = NULL;
++ union tls_event_data ev;
++ os_memset(&ev, 0, sizeof(ev));
++
++ #ifdef MBEDTLS_SHA256_C
++ u8 hash[SHA256_DIGEST_LENGTH];
++ const u8 *addr[] = { (u8 *)crt->raw.p };
++ if (sha256_vector(1, addr, &crt->raw.len, hash) == 0) {
++ ev.peer_cert.hash = hash;
++ ev.peer_cert.hash_len = sizeof(hash);
++ }
++ #endif
++ ev.peer_cert.depth = depth;
++ char subject[MBEDTLS_X509_MAX_DN_NAME_SIZE*2];
++ if (depth == 0)
++ ev.peer_cert.subject = conn->peer_subject;
++ if (ev.peer_cert.subject == NULL) {
++ ev.peer_cert.subject = subject;
++ if (mbedtls_x509_dn_gets(subject, sizeof(subject), &crt->subject) < 0)
++ subject[0] = '\0';
++ }
++
++ char serial_num[128+1];
++ ev.peer_cert.serial_num =
++ tls_mbedtls_peer_serial_num(crt, serial_num, sizeof(serial_num));
++
++ const mbedtls_x509_sequence *cur;
++
++ cur = NULL;
++ if (mbedtls_x509_crt_has_ext_type(crt, MBEDTLS_X509_EXT_SUBJECT_ALT_NAME))
++ cur = &crt->subject_alt_names;
++ for (; cur != NULL; cur = cur->next) {
++ const unsigned char san_type = (unsigned char)cur->buf.tag
++ & MBEDTLS_ASN1_TAG_VALUE_MASK;
++ size_t prelen = 4;
++ const char *pre;
++ switch (san_type) {
++ case MBEDTLS_X509_SAN_RFC822_NAME: prelen = 6; pre = "EMAIL:";break;
++ case MBEDTLS_X509_SAN_DNS_NAME: pre = "DNS:"; break;
++ case MBEDTLS_X509_SAN_UNIFORM_RESOURCE_IDENTIFIER: pre = "URI:"; break;
++ default: continue;
++ }
++
++ char *pos = os_malloc(prelen + cur->buf.len + 1);
++ if (pos == NULL)
++ break;
++ ev.peer_cert.altsubject[ev.peer_cert.num_altsubject] = pos;
++ os_memcpy(pos, pre, prelen);
++ /* data should be properly backslash-escaped if needed,
++ * so code below does not re-escape, but does replace CTLs */
++ /*os_memcpy(pos+prelen, cur->buf.p, cur->buf.len);*/
++ /*pos[prelen+cur->buf.len] = '\0';*/
++ pos += prelen;
++ for (size_t i = 0; i < cur->buf.len; ++i) {
++ unsigned char c = cur->buf.p[i];
++ *pos++ = (c >= 32 && c != 127) ? c : '?';
++ }
++ *pos = '\0';
++
++ if (++ev.peer_cert.num_altsubject == TLS_MAX_ALT_SUBJECT)
++ break;
++ }
++
++ cur = NULL;
++ if (mbedtls_x509_crt_has_ext_type(crt, MBEDTLS_X509_EXT_CERTIFICATE_POLICIES))
++ cur = &crt->certificate_policies;
++ for (; cur != NULL; cur = cur->next) {
++ if (cur->buf.len != 11) /* len of OID_TOD_STRICT or OID_TOD_TOFU */
++ continue;
++ /* TOD-STRICT "1.3.6.1.4.1.40808.1.3.1" */
++ /* TOD-TOFU "1.3.6.1.4.1.40808.1.3.2" */
++ #define OID_TOD_STRICT "\x2b\x06\x01\x04\x01\x82\xbe\x68\x01\x03\x01"
++ #define OID_TOD_TOFU "\x2b\x06\x01\x04\x01\x82\xbe\x68\x01\x03\x02"
++ if (os_memcmp(cur->buf.p,
++ OID_TOD_STRICT, sizeof(OID_TOD_STRICT)-1) == 0) {
++ ev.peer_cert.tod = 1; /* TOD-STRICT */
++ break;
++ }
++ if (os_memcmp(cur->buf.p,
++ OID_TOD_TOFU, sizeof(OID_TOD_TOFU)-1) == 0) {
++ ev.peer_cert.tod = 2; /* TOD-TOFU */
++ break;
++ }
++ }
++
++ struct tls_conf *tls_conf = conn->tls_conf;
++ if (tls_conf->ca_cert_probe || (tls_conf->flags & TLS_CONN_EXT_CERT_CHECK)
++ || init_conf->cert_in_cb) {
++ certbuf = wpabuf_alloc_copy(crt->raw.p, crt->raw.len);
++ ev.peer_cert.cert = certbuf;
++ }
++
++ init_conf->event_cb(init_conf->cb_ctx, TLS_PEER_CERTIFICATE, &ev);
++
++ wpabuf_free(certbuf);
++ char **altsubject;
++ *(const char ***)&altsubject = ev.peer_cert.altsubject;
++ for (size_t i = 0; i < ev.peer_cert.num_altsubject; ++i)
++ os_free(altsubject[i]);
++}
++
++
++static int
++tls_mbedtls_verify_cb (void *arg, mbedtls_x509_crt *crt, int depth, uint32_t *flags)
++{
++ /* XXX: N.B. verify code not carefully tested besides hwsim tests
++ *
++ * RFE: mbedtls_x509_crt_verify_info() and enhance log trace messages
++ * RFE: review and add support for additional TLS_CONN_* flags
++ * not handling OCSP (not available in mbedtls)
++ * ... */
++
++ struct tls_connection *conn = (struct tls_connection *)arg;
++ struct tls_conf *tls_conf = conn->tls_conf;
++ uint32_t flags_in = *flags;
++
++ if (depth > 8) { /*(depth 8 picked as arbitrary limit)*/
++ emsg(MSG_WARNING, "client cert chain too long");
++ *flags |= MBEDTLS_X509_BADCERT_OTHER; /* cert chain too long */
++ tls_mbedtls_verify_fail_event(crt, depth,
++ "client cert chain too long",
++ TLS_FAIL_BAD_CERTIFICATE);
++ }
++ else if (tls_conf->verify_depth0_only) {
++ if (depth > 0)
++ *flags = 0;
++ else {
++ #ifdef MBEDTLS_SHA256_C
++ u8 hash[SHA256_DIGEST_LENGTH];
++ const u8 *addr[] = { (u8 *)crt->raw.p };
++ if (sha256_vector(1, addr, &crt->raw.len, hash) < 0
++ || os_memcmp(tls_conf->ca_cert_hash, hash, sizeof(hash)) != 0) {
++ *flags |= MBEDTLS_X509_BADCERT_NOT_TRUSTED;
++ tls_mbedtls_verify_fail_event(crt, depth,
++ "cert hash mismatch",
++ TLS_FAIL_UNTRUSTED);
++ }
++ else /* hash matches; ignore other issues *except* if revoked)*/
++ *flags &= MBEDTLS_X509_BADCERT_REVOKED;
++ #endif
++ }
++ }
++ else if (depth == 0) {
++ if (!conn->peer_subject)
++ tls_mbedtls_set_peer_subject(conn, crt);
++ /*(use same labels to tls_mbedtls_verify_fail_event() as used in
++ * other TLS modules so that hwsim tests find exact string match)*/
++ if (!conn->peer_subject) { /* error copying subject string */
++ *flags |= MBEDTLS_X509_BADCERT_OTHER;
++ tls_mbedtls_verify_fail_event(crt, depth,
++ "internal error",
++ TLS_FAIL_UNSPECIFIED);
++ }
++ /*(use os_strstr() for subject match as is done in tls_mbedtls.c
++ * to follow the same behavior, even though a suffix match would
++ * make more sense. Also, note that strstr match does not
++ * normalize whitespace (between components) for comparison)*/
++ else if (tls_conf->subject_match
++ && os_strstr(conn->peer_subject,
++ tls_conf->subject_match) == NULL) {
++ wpa_printf(MSG_WARNING,
++ "MTLS: Subject '%s' did not match with '%s'",
++ conn->peer_subject, tls_conf->subject_match);
++ *flags |= MBEDTLS_X509_BADCERT_CN_MISMATCH;
++ tls_mbedtls_verify_fail_event(crt, depth,
++ "Subject mismatch",
++ TLS_FAIL_SUBJECT_MISMATCH);
++ }
++ if (tls_conf->altsubject_match
++ && !tls_mbedtls_match_altsubject(crt, tls_conf->altsubject_match)) {
++ wpa_printf(MSG_WARNING,
++ "MTLS: altSubjectName match '%s' not found",
++ tls_conf->altsubject_match);
++ *flags |= MBEDTLS_X509_BADCERT_CN_MISMATCH;
++ tls_mbedtls_verify_fail_event(crt, depth,
++ "AltSubject mismatch",
++ TLS_FAIL_ALTSUBJECT_MISMATCH);
++ }
++ if (tls_conf->suffix_match
++ && !tls_mbedtls_match_suffixes(crt, tls_conf->suffix_match, 0)) {
++ wpa_printf(MSG_WARNING,
++ "MTLS: Domain suffix match '%s' not found",
++ tls_conf->suffix_match);
++ *flags |= MBEDTLS_X509_BADCERT_CN_MISMATCH;
++ tls_mbedtls_verify_fail_event(crt, depth,
++ "Domain suffix mismatch",
++ TLS_FAIL_DOMAIN_SUFFIX_MISMATCH);
++ }
++ if (tls_conf->domain_match
++ && !tls_mbedtls_match_suffixes(crt, tls_conf->domain_match, 1)) {
++ wpa_printf(MSG_WARNING,
++ "MTLS: Domain match '%s' not found",
++ tls_conf->domain_match);
++ *flags |= MBEDTLS_X509_BADCERT_CN_MISMATCH;
++ tls_mbedtls_verify_fail_event(crt, depth,
++ "Domain mismatch",
++ TLS_FAIL_DOMAIN_MISMATCH);
++ }
++ if (tls_conf->check_cert_subject
++ && !tls_mbedtls_match_dn_field(crt, tls_conf->check_cert_subject)) {
++ *flags |= MBEDTLS_X509_BADCERT_CN_MISMATCH;
++ tls_mbedtls_verify_fail_event(crt, depth,
++ "Distinguished Name",
++ TLS_FAIL_DN_MISMATCH);
++ }
++ if (tls_conf->flags & TLS_CONN_SUITEB) {
++ /* check RSA modulus size (public key bitlen) */
++ const mbedtls_pk_type_t pk_alg = mbedtls_pk_get_type(&crt->pk);
++ if ((pk_alg == MBEDTLS_PK_RSA || pk_alg == MBEDTLS_PK_RSASSA_PSS)
++ && mbedtls_pk_get_bitlen(&crt->pk) < 3072) {
++ /* hwsim suite_b RSA tests expect 3072
++ * suite_b_192_rsa_ecdhe_radius_rsa2048_client
++ * suite_b_192_rsa_dhe_radius_rsa2048_client */
++ *flags |= MBEDTLS_X509_BADCERT_BAD_KEY;
++ tls_mbedtls_verify_fail_event(crt, depth,
++ "Insufficient RSA modulus size",
++ TLS_FAIL_INSUFFICIENT_KEY_LEN);
++ }
++ }
++ if (tls_conf->check_crl && tls_conf->crl == NULL) {
++ /* see tests/hwsim test_ap_eap.py ap_wpa2_eap_tls_check_crl */
++ emsg(MSG_WARNING, "check_crl set but no CRL loaded; reject all?");
++ *flags |= MBEDTLS_X509_BADCERT_OTHER;
++ tls_mbedtls_verify_fail_event(crt, depth,
++ "check_crl set but no CRL loaded; "
++ "reject all?",
++ TLS_FAIL_BAD_CERTIFICATE);
++ }
++ }
++ else {
++ if (tls_conf->check_crl != 2) /* 2 == verify CRLs for all certs */
++ *flags &= ~MBEDTLS_X509_BADCERT_REVOKED;
++ }
++
++ if (!tls_conf->check_crl_strict) {
++ *flags &= ~MBEDTLS_X509_BADCRL_EXPIRED;
++ *flags &= ~MBEDTLS_X509_BADCRL_FUTURE;
++ }
++
++ if (tls_conf->flags & TLS_CONN_DISABLE_TIME_CHECKS) {
++ *flags &= ~MBEDTLS_X509_BADCERT_EXPIRED;
++ *flags &= ~MBEDTLS_X509_BADCERT_FUTURE;
++ }
++
++ tls_mbedtls_verify_cert_event(conn, crt, depth);
++
++ if (*flags) {
++ if (*flags & (MBEDTLS_X509_BADCERT_NOT_TRUSTED
++ |MBEDTLS_X509_BADCERT_CN_MISMATCH
++ |MBEDTLS_X509_BADCERT_REVOKED)) {
++ emsg(MSG_WARNING, "client cert not trusted");
++ }
++ /* report event if flags set but no additional flags set above */
++ /* (could translate flags to more detailed TLS_FAIL_* if needed) */
++ if (!(*flags & ~flags_in)) {
++ enum tls_fail_reason reason = TLS_FAIL_UNSPECIFIED;
++ const char *errmsg = "cert verify fail unspecified";
++ if (*flags & MBEDTLS_X509_BADCERT_NOT_TRUSTED) {
++ reason = TLS_FAIL_UNTRUSTED;
++ errmsg = "certificate not trusted";
++ }
++ if (*flags & MBEDTLS_X509_BADCERT_REVOKED) {
++ reason = TLS_FAIL_REVOKED;
++ errmsg = "certificate has been revoked";
++ }
++ if (*flags & MBEDTLS_X509_BADCERT_FUTURE) {
++ reason = TLS_FAIL_NOT_YET_VALID;
++ errmsg = "certificate not yet valid";
++ }
++ if (*flags & MBEDTLS_X509_BADCERT_EXPIRED) {
++ reason = TLS_FAIL_EXPIRED;
++ errmsg = "certificate has expired";
++ }
++ if (*flags & MBEDTLS_X509_BADCERT_BAD_MD) {
++ reason = TLS_FAIL_BAD_CERTIFICATE;
++ errmsg = "certificate uses insecure algorithm";
++ }
++ tls_mbedtls_verify_fail_event(crt, depth, errmsg, reason);
++ }
++ #if 0
++ /* ??? send (again) cert events for all certs in chain ???
++ * (should already have been called for greater depths) */
++ /* tls_openssl.c:tls_verify_cb() sends cert events for all certs
++ * in chain if certificate validation fails, but sends all events
++ * with depth set to 0 (might be a bug) */
++ if (depth > 0) {
++ int pdepth = depth + 1;
++ for (mbedtls_x509_crt *pcrt; (pcrt = crt->next); ++pdepth) {
++ tls_mbedtls_verify_cert_event(conn, pcrt, pdepth);
++ }
++ }
++ #endif
++ /*(do not preserve subject if verification failed but was optional)*/
++ if (depth == 0 && conn->peer_subject) {
++ os_free(conn->peer_subject);
++ conn->peer_subject = NULL;
++ }
++ }
++ else if (depth == 0) {
++ struct tls_config *init_conf = &tls_ctx_global.init_conf;
++ if (tls_conf->ca_cert_probe) {
++ /* reject server certificate on probe-only run */
++ *flags |= MBEDTLS_X509_BADCERT_OTHER;
++ tls_mbedtls_verify_fail_event(crt, depth,
++ "server chain probe",
++ TLS_FAIL_SERVER_CHAIN_PROBE);
++ }
++ else if (init_conf->event_cb) {
++ /* ??? send event as soon as depth == 0 is verified ???
++ * What about rest of chain?
++ * Follows tls_mbedtls.c behavior: */
++ init_conf->event_cb(init_conf->cb_ctx,
++ TLS_CERT_CHAIN_SUCCESS, NULL);
++ }
++ }
++
++ return 0;
++}
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index 72446fac1..c1aa98b65 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -971,6 +971,9 @@ struct wpa_driver_associate_params {
+ * responsible for selecting with which BSS to associate. */
+ const u8 *bssid;
+
++ unsigned char rates[32];
++ int mcast_rate;
++
+ /**
+ * bssid_hint - BSSID of a proposed AP
+ *
+@@ -1873,6 +1876,7 @@ struct wpa_driver_mesh_join_params {
+ #define WPA_DRIVER_MESH_FLAG_AMPE 0x00000008
+ unsigned int flags;
+ bool handle_dfs;
++ int mcast_rate;
+ };
+
+ struct wpa_driver_set_key_params {
+@@ -2340,6 +2344,9 @@ struct wpa_driver_capa {
+ /** Maximum number of iterations in a single scan plan */
+ u32 max_sched_scan_plan_iterations;
+
++ /** Maximum number of extra IE bytes for scans */
++ u16 max_scan_ie_len;
++
+ /** Whether sched_scan (offloaded scanning) is supported */
+ int sched_scan_supported;
+
+@@ -3859,6 +3866,25 @@ struct wpa_driver_ops {
+ int (*if_remove)(void *priv, enum wpa_driver_if_type type,
+ const char *ifname);
+
++ /**
++ * if_rename - Rename a virtual interface
++ * @priv: Private driver interface data
++ * @type: Interface type
++ * @ifname: Interface name of the virtual interface to be renamed
++ * (NULL when renaming the AP BSS interface)
++ * @new_name: New interface name of the virtual interface
++ * Returns: 0 on success, -1 on failure
++ */
++ int (*if_rename)(void *priv, enum wpa_driver_if_type type,
++ const char *ifname, const char *new_name);
++
++ /**
++ * set_first_bss - Make a virtual interface the first (primary) bss
++ * @priv: Private driver interface data
++ * Returns: 0 on success, -1 on failure
++ */
++ int (*set_first_bss)(void *priv);
++
+ /**
+ * set_sta_vlan - Bind a station into a specific interface (AP only)
+ * @priv: Private driver interface data
+@@ -4263,7 +4289,7 @@ struct wpa_driver_ops {
+ * Returns: 0 on success, negative (<0) on failure
+ */
+ int (*br_set_net_param)(void *priv, enum drv_br_net_param param,
+- unsigned int val);
++ const char *ifname, unsigned int val);
+
+ /**
+ * get_wowlan - Get wake-on-wireless status
+@@ -6514,6 +6540,7 @@ union wpa_event_data {
+
+ /**
+ * struct ch_switch
++ * @count: Count until channel switch activates
+ * @freq: Frequency of new channel in MHz
+ * @ht_enabled: Whether this is an HT channel
+ * @ch_offset: Secondary channel offset
+@@ -6524,6 +6551,7 @@ union wpa_event_data {
+ * @punct_bitmap: Puncturing bitmap
+ */
+ struct ch_switch {
++ int count;
+ int freq;
+ int ht_enabled;
+ int ch_offset;
+@@ -6771,8 +6799,8 @@ union wpa_event_data {
+ * Driver wrapper code should call this function whenever an event is received
+ * from the driver.
+ */
+-void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
+- union wpa_event_data *data);
++extern void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
++ union wpa_event_data *data);
+
+ /**
+ * wpa_supplicant_event_global - Report a driver event for wpa_supplicant
+@@ -6784,7 +6812,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
+ * Same as wpa_supplicant_event(), but we search for the interface in
+ * wpa_global.
+ */
+-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
++extern void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data);
+
+ /*
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index e2c46c123..45c1ea9ce 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -78,6 +78,16 @@ enum nlmsgerr_attrs {
+
+ #endif /* ANDROID */
+
++static void handle_nl_debug_hook(struct nl_msg *msg, int tx)
++{
++ const struct nlmsghdr *nlh;
++
++ if (!wpa_netlink_hook)
++ return;
++
++ nlh = nlmsg_hdr(msg);
++ wpa_netlink_hook(tx, nlh, nlh->nlmsg_len);
++}
+
+ static struct nl_sock * nl_create_handle(struct nl_cb *cb, const char *dbg)
+ {
+@@ -432,6 +442,11 @@ static int no_seq_check(struct nl_msg *msg, void *arg)
+ return NL_OK;
+ }
+
++static int debug_handler(struct nl_msg *msg, void *arg)
++{
++ handle_nl_debug_hook(msg, 0);
++ return NL_OK;
++}
+
+ static void nl80211_nlmsg_clear(struct nl_msg *msg)
+ {
+@@ -505,6 +520,7 @@ int send_and_recv(struct nl80211_global *global,
+ if (!msg)
+ return -ENOMEM;
+
++ handle_nl_debug_hook(msg, 1);
+ err.err = -ENOMEM;
+
+ s_nl_cb = nl_socket_get_cb(nl_handle);
+@@ -539,6 +555,7 @@ int send_and_recv(struct nl80211_global *global,
+ err.orig_msg = msg;
+ err.err_info = err_info;
+
++ nl_cb_set(cb, NL_CB_MSG_IN, NL_CB_CUSTOM, debug_handler, NULL);
+ nl_cb_err(cb, NL_CB_CUSTOM, error_handler, &err);
+ nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, &err.err);
+ if (ack_handler_custom) {
+@@ -942,6 +959,7 @@ nl80211_get_wiphy_data_ap(struct i802_bss *bss)
+ os_free(w);
+ return NULL;
+ }
++ nl_cb_set(w->nl_cb, NL_CB_MSG_IN, NL_CB_CUSTOM, debug_handler, NULL);
+ nl_cb_set(w->nl_cb, NL_CB_SEQ_CHECK, NL_CB_CUSTOM,
+ no_seq_check, NULL);
+ nl_cb_set(w->nl_cb, NL_CB_VALID, NL_CB_CUSTOM,
+@@ -1356,7 +1374,7 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx,
+ }
+ wpa_printf(MSG_DEBUG, "nl80211: Interface down (%s/%s)",
+ namebuf, ifname);
+- if (os_strcmp(drv->first_bss->ifname, ifname) != 0) {
++ if (drv->first_bss->ifindex != ifi->ifi_index) {
+ wpa_printf(MSG_DEBUG,
+ "nl80211: Not the main interface (%s) - do not indicate interface down",
+ drv->first_bss->ifname);
+@@ -1392,7 +1410,7 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx,
+ }
+ wpa_printf(MSG_DEBUG, "nl80211: Interface up (%s/%s)",
+ namebuf, ifname);
+- if (os_strcmp(drv->first_bss->ifname, ifname) != 0) {
++ if (drv->first_bss->ifindex != ifi->ifi_index) {
+ wpa_printf(MSG_DEBUG,
+ "nl80211: Not the main interface (%s) - do not indicate interface up",
+ drv->first_bss->ifname);
+@@ -2038,6 +2056,7 @@ static int wpa_driver_nl80211_init_nl_global(struct nl80211_global *global)
+ genl_family_put(family);
+ nl_cache_free(cache);
+
++ nl_cb_set(global->nl_cb, NL_CB_MSG_IN, NL_CB_CUSTOM, debug_handler, NULL);
+ nl_cb_set(global->nl_cb, NL_CB_SEQ_CHECK, NL_CB_CUSTOM,
+ no_seq_check, NULL);
+ nl_cb_set(global->nl_cb, NL_CB_VALID, NL_CB_CUSTOM,
+@@ -2208,6 +2227,7 @@ static int nl80211_init_bss(struct i802_bss *bss)
+ if (!bss->nl_cb)
+ return -1;
+
++ nl_cb_set(bss->nl_cb, NL_CB_MSG_IN, NL_CB_CUSTOM, debug_handler, NULL);
+ nl_cb_set(bss->nl_cb, NL_CB_SEQ_CHECK, NL_CB_CUSTOM,
+ no_seq_check, NULL);
+ nl_cb_set(bss->nl_cb, NL_CB_VALID, NL_CB_CUSTOM,
+@@ -3078,12 +3098,12 @@ static int wpa_driver_nl80211_del_beacon(struct i802_bss *bss,
+ return 0;
+
+ wpa_printf(MSG_DEBUG, "nl80211: Remove beacon (ifindex=%d)",
+- drv->ifindex);
++ bss->ifindex);
+ link->beacon_set = 0;
+ link->freq = 0;
+
+ nl80211_put_wiphy_data_ap(bss);
+- msg = nl80211_drv_msg(drv, 0, NL80211_CMD_DEL_BEACON);
++ msg = nl80211_bss_msg(bss, 0, NL80211_CMD_DEL_BEACON);
+ if (!msg)
+ return -ENOBUFS;
+
+@@ -5318,6 +5338,9 @@ static int wpa_driver_nl80211_set_ap(void *priv,
+ nla_nest_end(msg, ftm);
+ }
+
++ if (params->freq && nl80211_put_freq_params(msg, params->freq) < 0)
++ goto fail;
++
+ #ifdef CONFIG_IEEE80211AX
+ if (params->he_spr_ctrl) {
+ struct nlattr *spr;
+@@ -5486,7 +5509,7 @@ static int nl80211_set_channel(struct i802_bss *bss,
+ freq->he_enabled, freq->eht_enabled, freq->bandwidth,
+ freq->center_freq1, freq->center_freq2);
+
+- msg = nl80211_drv_msg(drv, 0, set_chan ? NL80211_CMD_SET_CHANNEL :
++ msg = nl80211_bss_msg(bss, 0, set_chan ? NL80211_CMD_SET_CHANNEL :
+ NL80211_CMD_SET_WIPHY);
+ if (!msg || nl80211_put_freq_params(msg, freq) < 0) {
+ nlmsg_free(msg);
+@@ -5859,26 +5882,29 @@ fail:
+
+ static void rtnl_neigh_delete_fdb_entry(struct i802_bss *bss, const u8 *addr)
+ {
+-#ifdef CONFIG_LIBNL3_ROUTE
+ struct wpa_driver_nl80211_data *drv = bss->drv;
+- struct rtnl_neigh *rn;
+- struct nl_addr *nl_addr;
++ struct ndmsg nhdr = {
++ .ndm_state = NUD_PERMANENT,
++ .ndm_ifindex = bss->ifindex,
++ .ndm_family = AF_BRIDGE,
++ };
++ struct nl_msg *msg;
+ int err;
+
+- rn = rtnl_neigh_alloc();
+- if (!rn)
++ msg = nlmsg_alloc_simple(RTM_DELNEIGH, NLM_F_CREATE);
++ if (!msg)
+ return;
+
+- rtnl_neigh_set_family(rn, AF_BRIDGE);
+- rtnl_neigh_set_ifindex(rn, bss->ifindex);
+- nl_addr = nl_addr_build(AF_BRIDGE, (void *) addr, ETH_ALEN);
+- if (!nl_addr) {
+- rtnl_neigh_put(rn);
+- return;
+- }
+- rtnl_neigh_set_lladdr(rn, nl_addr);
++ if (nlmsg_append(msg, &nhdr, sizeof(nhdr), NLMSG_ALIGNTO) < 0)
++ goto errout;
++
++ if (nla_put(msg, NDA_LLADDR, ETH_ALEN, (void *)addr))
++ goto errout;
++
++ if (nl_send_auto_complete(drv->rtnl_sk, msg) < 0)
++ goto errout;
+
+- err = rtnl_neigh_delete(drv->rtnl_sk, rn, 0);
++ err = nl_wait_for_ack(drv->rtnl_sk);
+ if (err < 0) {
+ wpa_printf(MSG_DEBUG, "nl80211: bridge FDB entry delete for "
+ MACSTR " ifindex=%d failed: %s", MAC2STR(addr),
+@@ -5888,9 +5914,8 @@ static void rtnl_neigh_delete_fdb_entry(struct i802_bss *bss, const u8 *addr)
+ MACSTR, MAC2STR(addr));
+ }
+
+- nl_addr_put(nl_addr);
+- rtnl_neigh_put(rn);
+-#endif /* CONFIG_LIBNL3_ROUTE */
++errout:
++ nlmsg_free(msg);
+ }
+
+
+@@ -6179,6 +6204,8 @@ static void nl80211_teardown_ap(struct i802_bss *bss)
+ nl80211_put_wiphy_data_ap(bss);
+ if (bss->flink)
+ bss->flink->beacon_set = 0;
++
++ wpa_driver_nl80211_del_beacon_all(bss);
+ }
+
+
+@@ -8556,6 +8583,7 @@ static void *i802_init(struct hostapd_data *hapd,
+ char master_ifname[IFNAMSIZ];
+ int ifindex, br_ifindex = 0;
+ int br_added = 0;
++ int err;
+
+ bss = wpa_driver_nl80211_drv_init(hapd, params->ifname,
+ params->global_priv, 1,
+@@ -8615,24 +8643,18 @@ static void *i802_init(struct hostapd_data *hapd,
+ (params->num_bridge == 0 || !params->bridge[0]))
+ add_ifidx(drv, br_ifindex, drv->ifindex);
+
+-#ifdef CONFIG_LIBNL3_ROUTE
+- if (bss->added_if_into_bridge || bss->already_in_bridge) {
+- int err;
+-
+- drv->rtnl_sk = nl_socket_alloc();
+- if (drv->rtnl_sk == NULL) {
+- wpa_printf(MSG_ERROR, "nl80211: Failed to allocate nl_sock");
+- goto failed;
+- }
++ drv->rtnl_sk = nl_socket_alloc();
++ if (drv->rtnl_sk == NULL) {
++ wpa_printf(MSG_ERROR, "nl80211: Failed to allocate nl_sock");
++ goto failed;
++ }
+
+- err = nl_connect(drv->rtnl_sk, NETLINK_ROUTE);
+- if (err) {
+- wpa_printf(MSG_ERROR, "nl80211: Failed to connect nl_sock to NETLINK_ROUTE: %s",
+- nl_geterror(err));
+- goto failed;
+- }
++ err = nl_connect(drv->rtnl_sk, NETLINK_ROUTE);
++ if (err) {
++ wpa_printf(MSG_ERROR, "nl80211: Failed to connect nl_sock to NETLINK_ROUTE: %s",
++ nl_geterror(err));
++ goto failed;
+ }
+-#endif /* CONFIG_LIBNL3_ROUTE */
+
+ if (drv->capa.flags2 & WPA_DRIVER_FLAGS2_CONTROL_PORT_RX) {
+ wpa_printf(MSG_DEBUG,
+@@ -8980,14 +9002,13 @@ static int wpa_driver_nl80211_if_remove(struct i802_bss *bss,
+ } else {
+ wpa_printf(MSG_DEBUG, "nl80211: First BSS - reassign context");
+ nl80211_teardown_ap(bss);
+- if (!bss->added_if && !drv->first_bss->next)
+- wpa_driver_nl80211_del_beacon_all(bss);
+ nl80211_destroy_bss(bss);
+ if (!bss->added_if)
+ i802_set_iface_flags(bss, 0);
+ if (drv->first_bss->next) {
+ drv->first_bss = drv->first_bss->next;
+ drv->ctx = drv->first_bss->ctx;
++ drv->ifindex = drv->first_bss->ifindex;
+ os_free(bss);
+ } else {
+ wpa_printf(MSG_DEBUG, "nl80211: No second BSS to reassign context to");
+@@ -8997,6 +9018,50 @@ static int wpa_driver_nl80211_if_remove(struct i802_bss *bss,
+ return 0;
+ }
+
++static int wpa_driver_nl80211_if_rename(struct i802_bss *bss,
++ enum wpa_driver_if_type type,
++ const char *ifname, const char *new_name)
++{
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct ifinfomsg ifi = {
++ .ifi_family = AF_UNSPEC,
++ .ifi_index = bss->ifindex,
++ };
++ struct nl_msg *msg;
++ int res = -ENOMEM;
++
++ if (ifname)
++ ifi.ifi_index = if_nametoindex(ifname);
++
++ msg = nlmsg_alloc_simple(RTM_SETLINK, 0);
++ if (!msg)
++ return res;
++
++ if (nlmsg_append(msg, &ifi, sizeof(ifi), NLMSG_ALIGNTO) < 0)
++ goto out;
++
++ if (nla_put_string(msg, IFLA_IFNAME, new_name))
++ goto out;
++
++ res = nl_send_auto_complete(drv->rtnl_sk, msg);
++ if (res < 0)
++ goto out;
++
++ res = nl_wait_for_ack(drv->rtnl_sk);
++ if (res) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Renaming device %s to %s failed: %s",
++ ifname ? ifname : bss->ifname, new_name, nl_geterror(res));
++ goto out;
++ }
++
++ if (type == WPA_IF_AP_BSS && !ifname)
++ os_strlcpy(bss->ifname, new_name, sizeof(bss->ifname));
++
++out:
++ nlmsg_free(msg);
++ return res;
++}
+
+ static int cookie_handler(struct nl_msg *msg, void *arg)
+ {
+@@ -10693,6 +10758,37 @@ static int driver_nl80211_if_remove(void *priv, enum wpa_driver_if_type type,
+ }
+
+
++static int driver_nl80211_if_rename(void *priv, enum wpa_driver_if_type type,
++ const char *ifname, const char *new_name)
++{
++ struct i802_bss *bss = priv;
++ return wpa_driver_nl80211_if_rename(bss, type, ifname, new_name);
++}
++
++
++static int driver_nl80211_set_first_bss(void *priv)
++{
++ struct i802_bss *bss = priv, *tbss;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++
++ if (drv->first_bss == bss)
++ return 0;
++
++ for (tbss = drv->first_bss; tbss; tbss = tbss->next) {
++ if (tbss->next != bss)
++ continue;
++
++ tbss->next = bss->next;
++ bss->next = drv->first_bss;
++ drv->first_bss = bss;
++ drv->ctx = bss->ctx;
++ return 0;
++ }
++
++ return -1;
++}
++
++
+ static int driver_nl80211_send_mlme(void *priv, const u8 *data,
+ size_t data_len, int noack,
+ unsigned int freq,
+@@ -11195,6 +11291,10 @@ static int nl80211_switch_channel(void *priv, struct csa_settings *settings)
+ if (ret)
+ goto error;
+
++ if (drv->nlmode == NL80211_IFTYPE_MESH_POINT) {
++ nla_put_flag(msg, NL80211_ATTR_HANDLE_DFS);
++ }
++
+ /* beacon_csa params */
+ beacon_csa = nla_nest_start(msg, NL80211_ATTR_CSA_IES);
+ if (!beacon_csa)
+@@ -11851,6 +11951,18 @@ static int nl80211_put_mesh_id(struct nl_msg *msg, const u8 *mesh_id,
+ }
+
+
++static int nl80211_put_mcast_rate(struct nl_msg *msg, int mcast_rate)
++{
++ if (mcast_rate > 0) {
++ wpa_printf(MSG_DEBUG, " * mcast_rate=%.1f",
++ (double)mcast_rate / 10);
++ return nla_put_u32(msg, NL80211_ATTR_MCAST_RATE, mcast_rate);
++ }
++
++ return 0;
++}
++
++
+ static int nl80211_put_mesh_config(struct nl_msg *msg,
+ struct wpa_driver_mesh_bss_params *params)
+ {
+@@ -11912,6 +12024,7 @@ static int nl80211_join_mesh(struct i802_bss *bss,
+ nl80211_put_basic_rates(msg, params->basic_rates) ||
+ nl80211_put_mesh_id(msg, params->meshid, params->meshid_len) ||
+ nl80211_put_beacon_int(msg, params->beacon_int) ||
++ nl80211_put_mcast_rate(msg, params->mcast_rate) ||
+ nl80211_put_dtim_period(msg, params->dtim_period))
+ goto fail;
+
+@@ -12067,13 +12180,14 @@ static int wpa_driver_br_add_ip_neigh(void *priv, u8 version,
+ const u8 *ipaddr, int prefixlen,
+ const u8 *addr)
+ {
+-#ifdef CONFIG_LIBNL3_ROUTE
+ struct i802_bss *bss = priv;
+ struct wpa_driver_nl80211_data *drv = bss->drv;
+- struct rtnl_neigh *rn;
+- struct nl_addr *nl_ipaddr = NULL;
+- struct nl_addr *nl_lladdr = NULL;
+- int family, addrsize;
++ struct ndmsg nhdr = {
++ .ndm_state = NUD_PERMANENT,
++ .ndm_ifindex = bss->br_ifindex,
++ };
++ struct nl_msg *msg;
++ int addrsize;
+ int res;
+
+ if (!ipaddr || prefixlen == 0 || !addr)
+@@ -12092,85 +12206,66 @@ static int wpa_driver_br_add_ip_neigh(void *priv, u8 version,
+ }
+
+ if (version == 4) {
+- family = AF_INET;
++ nhdr.ndm_family = AF_INET;
+ addrsize = 4;
+ } else if (version == 6) {
+- family = AF_INET6;
++ nhdr.ndm_family = AF_INET6;
+ addrsize = 16;
+ } else {
+ return -EINVAL;
+ }
+
+- rn = rtnl_neigh_alloc();
+- if (rn == NULL)
++ msg = nlmsg_alloc_simple(RTM_NEWNEIGH, NLM_F_CREATE);
++ if (!msg)
+ return -ENOMEM;
+
+- /* set the destination ip address for neigh */
+- nl_ipaddr = nl_addr_build(family, (void *) ipaddr, addrsize);
+- if (nl_ipaddr == NULL) {
+- wpa_printf(MSG_DEBUG, "nl80211: nl_ipaddr build failed");
+- res = -ENOMEM;
++ res = -ENOMEM;
++ if (nlmsg_append(msg, &nhdr, sizeof(nhdr), NLMSG_ALIGNTO) < 0)
+ goto errout;
+- }
+- nl_addr_set_prefixlen(nl_ipaddr, prefixlen);
+- res = rtnl_neigh_set_dst(rn, nl_ipaddr);
+- if (res) {
+- wpa_printf(MSG_DEBUG,
+- "nl80211: neigh set destination addr failed");
++
++ if (nla_put(msg, NDA_DST, addrsize, (void *)ipaddr))
+ goto errout;
+- }
+
+- /* set the corresponding lladdr for neigh */
+- nl_lladdr = nl_addr_build(AF_BRIDGE, (u8 *) addr, ETH_ALEN);
+- if (nl_lladdr == NULL) {
+- wpa_printf(MSG_DEBUG, "nl80211: neigh set lladdr failed");
+- res = -ENOMEM;
++ if (nla_put(msg, NDA_LLADDR, ETH_ALEN, (void *)addr))
+ goto errout;
+- }
+- rtnl_neigh_set_lladdr(rn, nl_lladdr);
+
+- rtnl_neigh_set_ifindex(rn, bss->br_ifindex);
+- rtnl_neigh_set_state(rn, NUD_PERMANENT);
++ res = nl_send_auto_complete(drv->rtnl_sk, msg);
++ if (res < 0)
++ goto errout;
+
+- res = rtnl_neigh_add(drv->rtnl_sk, rn, NLM_F_CREATE);
++ res = nl_wait_for_ack(drv->rtnl_sk);
+ if (res) {
+ wpa_printf(MSG_DEBUG,
+ "nl80211: Adding bridge ip neigh failed: %s",
+ nl_geterror(res));
+ }
+ errout:
+- if (nl_lladdr)
+- nl_addr_put(nl_lladdr);
+- if (nl_ipaddr)
+- nl_addr_put(nl_ipaddr);
+- if (rn)
+- rtnl_neigh_put(rn);
++ nlmsg_free(msg);
+ return res;
+-#else /* CONFIG_LIBNL3_ROUTE */
+- return -1;
+-#endif /* CONFIG_LIBNL3_ROUTE */
+ }
+
+
+ static int wpa_driver_br_delete_ip_neigh(void *priv, u8 version,
+ const u8 *ipaddr)
+ {
+-#ifdef CONFIG_LIBNL3_ROUTE
+ struct i802_bss *bss = priv;
+ struct wpa_driver_nl80211_data *drv = bss->drv;
+- struct rtnl_neigh *rn;
+- struct nl_addr *nl_ipaddr;
+- int family, addrsize;
++ struct ndmsg nhdr = {
++ .ndm_state = NUD_PERMANENT,
++ .ndm_ifindex = bss->br_ifindex,
++ };
++ struct nl_msg *msg;
++ int addrsize;
+ int res;
+
+ if (!ipaddr)
+ return -EINVAL;
+
+ if (version == 4) {
+- family = AF_INET;
++ nhdr.ndm_family = AF_INET;
+ addrsize = 4;
+ } else if (version == 6) {
+- family = AF_INET6;
++ nhdr.ndm_family = AF_INET6;
+ addrsize = 16;
+ } else {
+ return -EINVAL;
+@@ -12188,41 +12283,30 @@ static int wpa_driver_br_delete_ip_neigh(void *priv, u8 version,
+ return -1;
+ }
+
+- rn = rtnl_neigh_alloc();
+- if (rn == NULL)
++ msg = nlmsg_alloc_simple(RTM_DELNEIGH, NLM_F_CREATE);
++ if (!msg)
+ return -ENOMEM;
+
+- /* set the destination ip address for neigh */
+- nl_ipaddr = nl_addr_build(family, (void *) ipaddr, addrsize);
+- if (nl_ipaddr == NULL) {
+- wpa_printf(MSG_DEBUG, "nl80211: nl_ipaddr build failed");
+- res = -ENOMEM;
++ res = -ENOMEM;
++ if (nlmsg_append(msg, &nhdr, sizeof(nhdr), NLMSG_ALIGNTO) < 0)
+ goto errout;
+- }
+- res = rtnl_neigh_set_dst(rn, nl_ipaddr);
+- if (res) {
+- wpa_printf(MSG_DEBUG,
+- "nl80211: neigh set destination addr failed");
++
++ if (nla_put(msg, NDA_DST, addrsize, (void *)ipaddr))
+ goto errout;
+- }
+
+- rtnl_neigh_set_ifindex(rn, bss->br_ifindex);
++ res = nl_send_auto_complete(drv->rtnl_sk, msg);
++ if (res < 0)
++ goto errout;
+
+- res = rtnl_neigh_delete(drv->rtnl_sk, rn, 0);
++ res = nl_wait_for_ack(drv->rtnl_sk);
+ if (res) {
+ wpa_printf(MSG_DEBUG,
+ "nl80211: Deleting bridge ip neigh failed: %s",
+ nl_geterror(res));
+ }
+ errout:
+- if (nl_ipaddr)
+- nl_addr_put(nl_ipaddr);
+- if (rn)
+- rtnl_neigh_put(rn);
++ nlmsg_free(msg);
+ return res;
+-#else /* CONFIG_LIBNL3_ROUTE */
+- return -1;
+-#endif /* CONFIG_LIBNL3_ROUTE */
+ }
+
+
+@@ -12300,7 +12384,7 @@ static const char * drv_br_net_param_str(enum drv_br_net_param param)
+
+
+ static int wpa_driver_br_set_net_param(void *priv, enum drv_br_net_param param,
+- unsigned int val)
++ const char *ifname, unsigned int val)
+ {
+ struct i802_bss *bss = priv;
+ char path[128];
+@@ -12326,8 +12410,11 @@ static int wpa_driver_br_set_net_param(void *priv, enum drv_br_net_param param,
+ return -EINVAL;
+ }
+
++ if (!ifname)
++ ifname = bss->brname;
++
+ os_snprintf(path, sizeof(path), "/proc/sys/net/ipv%d/conf/%s/%s",
+- ip_version, bss->brname, param_txt);
++ ip_version, ifname, param_txt);
+
+ set_val:
+ if (linux_write_system_file(path, val))
+@@ -13898,6 +13985,8 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .set_acl = wpa_driver_nl80211_set_acl,
+ .if_add = wpa_driver_nl80211_if_add,
+ .if_remove = driver_nl80211_if_remove,
++ .if_rename = driver_nl80211_if_rename,
++ .set_first_bss = driver_nl80211_set_first_bss,
+ .send_mlme = driver_nl80211_send_mlme,
+ .get_hw_feature_data = nl80211_get_hw_feature_data,
+ .sta_add = wpa_driver_nl80211_sta_add,
+diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
+index 3bcd66c24..305e4ab5b 100644
+--- a/src/drivers/driver_nl80211_capa.c
++++ b/src/drivers/driver_nl80211_capa.c
+@@ -972,6 +972,10 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
+ nla_get_u32(tb[NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS]);
+ }
+
++ if (tb[NL80211_ATTR_MAX_SCAN_IE_LEN])
++ capa->max_scan_ie_len =
++ nla_get_u16(tb[NL80211_ATTR_MAX_SCAN_IE_LEN]);
++
+ if (tb[NL80211_ATTR_MAX_MATCH_SETS])
+ capa->max_match_sets =
+ nla_get_u8(tb[NL80211_ATTR_MAX_MATCH_SETS]);
+diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c
+index 02c6eae49..601e75a87 100644
+--- a/src/drivers/driver_nl80211_event.c
++++ b/src/drivers/driver_nl80211_event.c
+@@ -1196,6 +1196,7 @@ static void mlme_event_ch_switch(struct wpa_driver_nl80211_data *drv,
+ struct nlattr *bw, struct nlattr *cf1,
+ struct nlattr *cf2,
+ struct nlattr *punct_bitmap,
++ struct nlattr *count,
+ int finished)
+ {
+ struct i802_bss *bss;
+@@ -1259,6 +1260,8 @@ static void mlme_event_ch_switch(struct wpa_driver_nl80211_data *drv,
+ data.ch_switch.cf1 = nla_get_u32(cf1);
+ if (cf2)
+ data.ch_switch.cf2 = nla_get_u32(cf2);
++ if (count)
++ data.ch_switch.count = nla_get_u32(count);
+
+ if (finished)
+ bss->flink->freq = data.ch_switch.freq;
+@@ -3961,6 +3964,7 @@ static void do_process_drv_event(struct i802_bss *bss, int cmd,
+ tb[NL80211_ATTR_CENTER_FREQ1],
+ tb[NL80211_ATTR_CENTER_FREQ2],
+ tb[NL80211_ATTR_PUNCT_BITMAP],
++ tb[NL80211_ATTR_CH_SWITCH_COUNT],
+ 0);
+ break;
+ case NL80211_CMD_CH_SWITCH_NOTIFY:
+@@ -3973,6 +3977,7 @@ static void do_process_drv_event(struct i802_bss *bss, int cmd,
+ tb[NL80211_ATTR_CENTER_FREQ1],
+ tb[NL80211_ATTR_CENTER_FREQ2],
+ tb[NL80211_ATTR_PUNCT_BITMAP],
++ NULL,
+ 1);
+ break;
+ case NL80211_CMD_DISCONNECT:
+diff --git a/src/drivers/driver_nl80211_scan.c b/src/drivers/driver_nl80211_scan.c
+index 577f84fef..c352a88bc 100644
+--- a/src/drivers/driver_nl80211_scan.c
++++ b/src/drivers/driver_nl80211_scan.c
+@@ -221,7 +221,7 @@ nl80211_scan_common(struct i802_bss *bss, u8 cmd,
+ wpa_printf(MSG_DEBUG, "nl80211: Passive scan requested");
+ }
+
+- if (params->extra_ies) {
++ if (params->extra_ies && drv->capa.max_scan_ie_len >= params->extra_ies_len) {
+ wpa_hexdump(MSG_MSGDUMP, "nl80211: Scan extra IEs",
+ params->extra_ies, params->extra_ies_len);
+ if (nla_put(msg, NL80211_ATTR_IE, params->extra_ies_len,
+diff --git a/src/drivers/drivers.c b/src/drivers/drivers.c
+index e95df6ddb..9071da3cf 100644
+--- a/src/drivers/drivers.c
++++ b/src/drivers/drivers.c
+@@ -10,6 +10,10 @@
+ #include "utils/common.h"
+ #include "driver.h"
+
++void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
++ union wpa_event_data *data);
++void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
++ union wpa_event_data *data);
+
+ const struct wpa_driver_ops *const wpa_drivers[] =
+ {
+diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak
+index a03d4a034..8da44d9f5 100644
+--- a/src/drivers/drivers.mak
++++ b/src/drivers/drivers.mak
+@@ -54,7 +54,6 @@ NEED_SME=y
+ NEED_AP_MLME=y
+ NEED_NETLINK=y
+ NEED_LINUX_IOCTL=y
+-NEED_RFKILL=y
+ NEED_RADIOTAP=y
+ NEED_LIBNL=y
+ endif
+@@ -111,7 +110,6 @@ DRV_WPA_CFLAGS += -DCONFIG_DRIVER_WEXT
+ CONFIG_WIRELESS_EXTENSION=y
+ NEED_NETLINK=y
+ NEED_LINUX_IOCTL=y
+-NEED_RFKILL=y
+ endif
+
+ ifdef CONFIG_DRIVER_NDIS
+@@ -137,7 +135,6 @@ endif
+ ifdef CONFIG_WIRELESS_EXTENSION
+ DRV_WPA_CFLAGS += -DCONFIG_WIRELESS_EXTENSION
+ DRV_WPA_OBJS += ../src/drivers/driver_wext.o
+-NEED_RFKILL=y
+ endif
+
+ ifdef NEED_NETLINK
+@@ -146,6 +143,7 @@ endif
+
+ ifdef NEED_RFKILL
+ DRV_OBJS += ../src/drivers/rfkill.o
++DRV_WPA_CFLAGS += -DCONFIG_RFKILL
+ endif
+
+ ifdef NEED_RADIOTAP
+diff --git a/src/drivers/rfkill.h b/src/drivers/rfkill.h
+index 0412ac330..e27565375 100644
+--- a/src/drivers/rfkill.h
++++ b/src/drivers/rfkill.h
+@@ -18,8 +18,24 @@ struct rfkill_config {
+ void (*unblocked_cb)(void *ctx);
+ };
+
++#ifdef CONFIG_RFKILL
+ struct rfkill_data * rfkill_init(struct rfkill_config *cfg);
+ void rfkill_deinit(struct rfkill_data *rfkill);
+ int rfkill_is_blocked(struct rfkill_data *rfkill);
++#else
++static inline struct rfkill_data * rfkill_init(struct rfkill_config *cfg)
++{
++ return (void *) 1;
++}
++
++static inline void rfkill_deinit(struct rfkill_data *rfkill)
++{
++}
++
++static inline int rfkill_is_blocked(struct rfkill_data *rfkill)
++{
++ return 0;
++}
++#endif
+
+ #endif /* RFKILL_H */
+diff --git a/src/radius/radius_client.c b/src/radius/radius_client.c
+index 2a7f36170..8e8903051 100644
+--- a/src/radius/radius_client.c
++++ b/src/radius/radius_client.c
+@@ -165,6 +165,8 @@ struct radius_client_data {
+ */
+ void *ctx;
+
++ struct hostapd_ip_addr local_ip;
++
+ /**
+ * conf - RADIUS client configuration (list of RADIUS servers to use)
+ */
+@@ -818,6 +820,30 @@ static void radius_close_acct_socket(struct radius_client_data *radius)
+ }
+
+
++/**
++ * radius_client_send - Get local address for the RADIUS auth socket
++ * @radius: RADIUS client context from radius_client_init()
++ * @addr: pointer to store the address
++ *
++ * This function returns the local address for the connection to the RADIUS
++ * auth server. It also opens the socket if it's not available yet.
++ */
++int radius_client_get_local_addr(struct radius_client_data *radius,
++ struct hostapd_ip_addr *addr)
++{
++ struct hostapd_radius_servers *conf = radius->conf;
++
++ if (conf->auth_server && radius->auth_sock < 0)
++ radius_client_init_auth(radius);
++
++ if (radius->auth_sock < 0)
++ return -1;
++
++ memcpy(addr, &radius->local_ip, sizeof(*addr));
++
++ return 0;
++}
++
+ /**
+ * radius_client_send - Send a RADIUS request
+ * @radius: RADIUS client context from radius_client_init()
+@@ -1711,6 +1737,10 @@ radius_change_server(struct radius_client_data *radius,
+ wpa_printf(MSG_DEBUG, "RADIUS local address: %s:%u",
+ inet_ntoa(claddr.sin_addr),
+ ntohs(claddr.sin_port));
++ if (auth) {
++ radius->local_ip.af = AF_INET;
++ radius->local_ip.u.v4 = claddr.sin_addr;
++ }
+ }
+ break;
+ #ifdef CONFIG_IPV6
+@@ -1722,6 +1752,10 @@ radius_change_server(struct radius_client_data *radius,
+ inet_ntop(AF_INET6, &claddr6.sin6_addr,
+ abuf, sizeof(abuf)),
+ ntohs(claddr6.sin6_port));
++ if (auth) {
++ radius->local_ip.af = AF_INET6;
++ radius->local_ip.u.v6 = claddr6.sin6_addr;
++ }
+ }
+ break;
+ }
+diff --git a/src/radius/radius_client.h b/src/radius/radius_client.h
+index db40637ea..9a89b0382 100644
+--- a/src/radius/radius_client.h
++++ b/src/radius/radius_client.h
+@@ -274,6 +274,8 @@ int radius_client_register(struct radius_client_data *radius,
+ void radius_client_set_interim_error_cb(struct radius_client_data *radius,
+ void (*cb)(const u8 *addr, void *ctx),
+ void *ctx);
++int radius_client_get_local_addr(struct radius_client_data *radius,
++ struct hostapd_ip_addr * addr);
+ int radius_client_send(struct radius_client_data *radius,
+ struct radius_msg *msg,
+ RadiusType msg_type, const u8 *addr);
+diff --git a/src/radius/radius_das.c b/src/radius/radius_das.c
+index aaa3fc267..327782f62 100644
+--- a/src/radius/radius_das.c
++++ b/src/radius/radius_das.c
+@@ -12,13 +12,26 @@
+ #include "utils/common.h"
+ #include "utils/eloop.h"
+ #include "utils/ip_addr.h"
++#include "utils/list.h"
+ #include "radius.h"
+ #include "radius_das.h"
+
+
+-struct radius_das_data {
++static struct dl_list das_ports = DL_LIST_HEAD_INIT(das_ports);
++
++struct radius_das_port {
++ struct dl_list list;
++ struct dl_list das_data;
++
++ int port;
+ int sock;
++};
++
++struct radius_das_data {
++ struct dl_list list;
++ struct radius_das_port *port;
+ u8 *shared_secret;
++ u8 *nas_identifier;
+ size_t shared_secret_len;
+ struct hostapd_ip_addr client_addr;
+ unsigned int time_window;
+@@ -378,56 +391,17 @@ fail:
+ }
+
+
+-static void radius_das_receive(int sock, void *eloop_ctx, void *sock_ctx)
++static void
++radius_das_receive_msg(struct radius_das_data *das, struct radius_msg *msg,
++ struct sockaddr *from, socklen_t fromlen,
++ char *abuf, int from_port)
+ {
+- struct radius_das_data *das = eloop_ctx;
+- u8 buf[1500];
+- union {
+- struct sockaddr_storage ss;
+- struct sockaddr_in sin;
+-#ifdef CONFIG_IPV6
+- struct sockaddr_in6 sin6;
+-#endif /* CONFIG_IPV6 */
+- } from;
+- char abuf[50];
+- int from_port = 0;
+- socklen_t fromlen;
+- int len;
+- struct radius_msg *msg, *reply = NULL;
++ struct radius_msg *reply = NULL;
+ struct radius_hdr *hdr;
+ struct wpabuf *rbuf;
++ struct os_time now;
+ u32 val;
+ int res;
+- struct os_time now;
+-
+- fromlen = sizeof(from);
+- len = recvfrom(sock, buf, sizeof(buf), 0,
+- (struct sockaddr *) &from.ss, &fromlen);
+- if (len < 0) {
+- wpa_printf(MSG_ERROR, "DAS: recvfrom: %s", strerror(errno));
+- return;
+- }
+-
+- os_strlcpy(abuf, inet_ntoa(from.sin.sin_addr), sizeof(abuf));
+- from_port = ntohs(from.sin.sin_port);
+-
+- wpa_printf(MSG_DEBUG, "DAS: Received %d bytes from %s:%d",
+- len, abuf, from_port);
+- if (das->client_addr.u.v4.s_addr &&
+- das->client_addr.u.v4.s_addr != from.sin.sin_addr.s_addr) {
+- wpa_printf(MSG_DEBUG, "DAS: Drop message from unknown client");
+- return;
+- }
+-
+- msg = radius_msg_parse(buf, len);
+- if (msg == NULL) {
+- wpa_printf(MSG_DEBUG, "DAS: Parsing incoming RADIUS packet "
+- "from %s:%d failed", abuf, from_port);
+- return;
+- }
+-
+- if (wpa_debug_level <= MSG_MSGDUMP)
+- radius_msg_dump(msg);
+
+ if (radius_msg_verify_das_req(msg, das->shared_secret,
+ das->shared_secret_len,
+@@ -494,9 +468,8 @@ static void radius_das_receive(int sock, void *eloop_ctx, void *sock_ctx)
+ radius_msg_dump(reply);
+
+ rbuf = radius_msg_get_buf(reply);
+- res = sendto(das->sock, wpabuf_head(rbuf),
+- wpabuf_len(rbuf), 0,
+- (struct sockaddr *) &from.ss, fromlen);
++ res = sendto(das->port->sock, wpabuf_head(rbuf),
++ wpabuf_len(rbuf), 0, from, fromlen);
+ if (res < 0) {
+ wpa_printf(MSG_ERROR, "DAS: sendto(to %s:%d): %s",
+ abuf, from_port, strerror(errno));
+@@ -508,6 +481,72 @@ fail:
+ radius_msg_free(reply);
+ }
+
++static void radius_das_receive(int sock, void *eloop_ctx, void *sock_ctx)
++{
++ struct radius_das_port *p = eloop_ctx;
++ struct radius_das_data *das;
++ u8 buf[1500];
++ union {
++ struct sockaddr_storage ss;
++ struct sockaddr_in sin;
++#ifdef CONFIG_IPV6
++ struct sockaddr_in6 sin6;
++#endif /* CONFIG_IPV6 */
++ } from;
++ struct radius_msg *msg;
++ size_t nasid_len = 0;
++ u8 *nasid_buf = NULL;
++ char abuf[50];
++ int from_port = 0;
++ socklen_t fromlen;
++ int found = 0;
++ int len;
++
++ fromlen = sizeof(from);
++ len = recvfrom(sock, buf, sizeof(buf), 0,
++ (struct sockaddr *) &from.ss, &fromlen);
++ if (len < 0) {
++ wpa_printf(MSG_ERROR, "DAS: recvfrom: %s", strerror(errno));
++ return;
++ }
++
++ os_strlcpy(abuf, inet_ntoa(from.sin.sin_addr), sizeof(abuf));
++ from_port = ntohs(from.sin.sin_port);
++
++ msg = radius_msg_parse(buf, len);
++ if (msg == NULL) {
++ wpa_printf(MSG_DEBUG, "DAS: Parsing incoming RADIUS packet "
++ "from %s:%d failed", abuf, from_port);
++ return;
++ }
++
++ wpa_printf(MSG_DEBUG, "DAS: Received %d bytes from %s:%d",
++ len, abuf, from_port);
++
++ if (wpa_debug_level <= MSG_MSGDUMP)
++ radius_msg_dump(msg);
++
++ radius_msg_get_attr_ptr(msg, RADIUS_ATTR_NAS_IDENTIFIER,
++ &nasid_buf, &nasid_len, NULL);
++ dl_list_for_each(das, &p->das_data, struct radius_das_data, list) {
++ if (das->client_addr.u.v4.s_addr &&
++ das->client_addr.u.v4.s_addr != from.sin.sin_addr.s_addr)
++ continue;
++
++ if (das->nas_identifier && nasid_buf &&
++ (nasid_len != os_strlen(das->nas_identifier) ||
++ os_memcmp(das->nas_identifier, nasid_buf, nasid_len) != 0))
++ continue;
++
++ found = 1;
++ radius_das_receive_msg(das, msg, (struct sockaddr *)&from.ss,
++ fromlen, abuf, from_port);
++ }
++
++ if (!found)
++ wpa_printf(MSG_DEBUG, "DAS: Drop message from unknown client");
++}
++
+
+ static int radius_das_open_socket(int port)
+ {
+@@ -533,6 +572,49 @@ static int radius_das_open_socket(int port)
+ }
+
+
++static struct radius_das_port *
++radius_das_open_port(int port)
++{
++ struct radius_das_port *p;
++
++ dl_list_for_each(p, &das_ports, struct radius_das_port, list) {
++ if (p->port == port)
++ return p;
++ }
++
++ p = os_zalloc(sizeof(*p));
++ if (p == NULL)
++ return NULL;
++
++ dl_list_init(&p->das_data);
++ p->port = port;
++ p->sock = radius_das_open_socket(port);
++ if (p->sock < 0)
++ goto free_port;
++
++ if (eloop_register_read_sock(p->sock, radius_das_receive, p, NULL))
++ goto close_port;
++
++ dl_list_add(&das_ports, &p->list);
++
++ return p;
++
++close_port:
++ close(p->sock);
++free_port:
++ os_free(p);
++
++ return NULL;
++}
++
++static void radius_das_close_port(struct radius_das_port *p)
++{
++ dl_list_del(&p->list);
++ eloop_unregister_read_sock(p->sock);
++ close(p->sock);
++ free(p);
++}
++
+ struct radius_das_data *
+ radius_das_init(struct radius_das_conf *conf)
+ {
+@@ -553,6 +635,8 @@ radius_das_init(struct radius_das_conf *conf)
+ das->ctx = conf->ctx;
+ das->disconnect = conf->disconnect;
+ das->coa = conf->coa;
++ if (conf->nas_identifier)
++ das->nas_identifier = os_strdup(conf->nas_identifier);
+
+ os_memcpy(&das->client_addr, conf->client_addr,
+ sizeof(das->client_addr));
+@@ -565,19 +649,15 @@ radius_das_init(struct radius_das_conf *conf)
+ }
+ das->shared_secret_len = conf->shared_secret_len;
+
+- das->sock = radius_das_open_socket(conf->port);
+- if (das->sock < 0) {
++ das->port = radius_das_open_port(conf->port);
++ if (!das->port) {
+ wpa_printf(MSG_ERROR, "Failed to open UDP socket for RADIUS "
+ "DAS");
+ radius_das_deinit(das);
+ return NULL;
+ }
+
+- if (eloop_register_read_sock(das->sock, radius_das_receive, das, NULL))
+- {
+- radius_das_deinit(das);
+- return NULL;
+- }
++ dl_list_add(&das->port->das_data, &das->list);
+
+ return das;
+ }
+@@ -588,11 +668,14 @@ void radius_das_deinit(struct radius_das_data *das)
+ if (das == NULL)
+ return;
+
+- if (das->sock >= 0) {
+- eloop_unregister_read_sock(das->sock);
+- close(das->sock);
++ if (das->port) {
++ dl_list_del(&das->list);
++
++ if (dl_list_empty(&das->port->das_data))
++ radius_das_close_port(das->port);
+ }
+
++ os_free(das->nas_identifier);
+ os_free(das->shared_secret);
+ os_free(das);
+ }
+diff --git a/src/radius/radius_das.h b/src/radius/radius_das.h
+index 233d662f6..80dc13fc8 100644
+--- a/src/radius/radius_das.h
++++ b/src/radius/radius_das.h
+@@ -44,6 +44,7 @@ struct radius_das_attrs {
+ struct radius_das_conf {
+ int port;
+ const u8 *shared_secret;
++ const u8 *nas_identifier;
+ size_t shared_secret_len;
+ const struct hostapd_ip_addr *client_addr;
+ unsigned int time_window;
+diff --git a/src/radius/radius_server.c b/src/radius/radius_server.c
+index e02c21540..57a47263e 100644
+--- a/src/radius/radius_server.c
++++ b/src/radius/radius_server.c
+@@ -63,6 +63,12 @@ struct radius_server_counters {
+ u32 unknown_acct_types;
+ };
+
++struct radius_accept_attr {
++ u8 type;
++ u16 len;
++ void *data;
++};
++
+ /**
+ * struct radius_session - Internal RADIUS server data for a session
+ */
+@@ -90,7 +96,7 @@ struct radius_session {
+ unsigned int macacl:1;
+ unsigned int t_c_filtering:1;
+
+- struct hostapd_radius_attr *accept_attr;
++ struct radius_accept_attr *accept_attr;
+
+ u32 t_c_timestamp; /* Last read T&C timestamp from user DB */
+ };
+@@ -394,6 +400,7 @@ static void radius_server_session_free(struct radius_server_data *data,
+ radius_msg_free(sess->last_reply);
+ os_free(sess->username);
+ os_free(sess->nas_ip);
++ os_free(sess->accept_attr);
+ os_free(sess);
+ data->num_sess--;
+ }
+@@ -554,6 +561,36 @@ radius_server_erp_find_key(struct radius_server_data *data, const char *keyname)
+ }
+ #endif /* CONFIG_ERP */
+
++static struct radius_accept_attr *
++radius_server_copy_attr(const struct hostapd_radius_attr *data)
++{
++ const struct hostapd_radius_attr *attr;
++ struct radius_accept_attr *attr_new;
++ size_t data_size = 0;
++ void *data_buf;
++ int n_attr = 1;
++
++ for (attr = data; attr; attr = attr->next) {
++ n_attr++;
++ data_size += wpabuf_len(attr->val);
++ }
++
++ attr_new = os_zalloc(n_attr * sizeof(*attr) + data_size);
++ if (!attr_new)
++ return NULL;
++
++ data_buf = &attr_new[n_attr];
++ for (n_attr = 0, attr = data; attr; attr = attr->next) {
++ struct radius_accept_attr *cur = &attr_new[n_attr++];
++
++ cur->type = attr->type;
++ cur->len = wpabuf_len(attr->val);
++ cur->data = memcpy(data_buf, wpabuf_head(attr->val), cur->len);
++ data_buf += cur->len;
++ }
++
++ return attr_new;
++}
+
+ static struct radius_session *
+ radius_server_get_new_session(struct radius_server_data *data,
+@@ -607,7 +644,7 @@ radius_server_get_new_session(struct radius_server_data *data,
+ eap_user_free(tmp);
+ return NULL;
+ }
+- sess->accept_attr = tmp->accept_attr;
++ sess->accept_attr = radius_server_copy_attr(tmp->accept_attr);
+ sess->macacl = tmp->macacl;
+ eap_user_free(tmp);
+
+@@ -1118,11 +1155,10 @@ radius_server_encapsulate_eap(struct radius_server_data *data,
+ }
+
+ if (code == RADIUS_CODE_ACCESS_ACCEPT) {
+- struct hostapd_radius_attr *attr;
+- for (attr = sess->accept_attr; attr; attr = attr->next) {
+- if (!radius_msg_add_attr(msg, attr->type,
+- wpabuf_head(attr->val),
+- wpabuf_len(attr->val))) {
++ struct radius_accept_attr *attr;
++ for (attr = sess->accept_attr; attr->data; attr++) {
++ if (!radius_msg_add_attr(msg, attr->type, attr->data,
++ attr->len)) {
+ wpa_printf(MSG_ERROR, "Could not add RADIUS attribute");
+ radius_msg_free(msg);
+ return NULL;
+@@ -1211,11 +1247,10 @@ radius_server_macacl(struct radius_server_data *data,
+ }
+
+ if (code == RADIUS_CODE_ACCESS_ACCEPT) {
+- struct hostapd_radius_attr *attr;
+- for (attr = sess->accept_attr; attr; attr = attr->next) {
+- if (!radius_msg_add_attr(msg, attr->type,
+- wpabuf_head(attr->val),
+- wpabuf_len(attr->val))) {
++ struct radius_accept_attr *attr;
++ for (attr = sess->accept_attr; attr->data; attr++) {
++ if (!radius_msg_add_attr(msg, attr->type, attr->data,
++ attr->len)) {
+ wpa_printf(MSG_ERROR, "Could not add RADIUS attribute");
+ radius_msg_free(msg);
+ return NULL;
+@@ -2512,7 +2547,7 @@ static int radius_server_get_eap_user(void *ctx, const u8 *identity,
+ ret = data->get_eap_user(data->conf_ctx, identity, identity_len,
+ phase2, user);
+ if (ret == 0 && user) {
+- sess->accept_attr = user->accept_attr;
++ sess->accept_attr = radius_server_copy_attr(user->accept_attr);
+ sess->remediation = user->remediation;
+ sess->macacl = user->macacl;
+ sess->t_c_timestamp = user->t_c_timestamp;
+diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
+index 8956c4072..e669858d8 100644
+--- a/src/rsn_supp/wpa.c
++++ b/src/rsn_supp/wpa.c
+@@ -3943,6 +3943,8 @@ static u32 wpa_key_mgmt_suite(struct wpa_sm *sm)
+ }
+
+
++#ifdef CONFIG_CTRL_IFACE_MIB
++
+ #define RSN_SUITE "%02x-%02x-%02x-%d"
+ #define RSN_SUITE_ARG(s) \
+ ((s) >> 24) & 0xff, ((s) >> 16) & 0xff, ((s) >> 8) & 0xff, (s) & 0xff
+@@ -4024,6 +4026,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, char *buf, size_t buflen)
+
+ return (int) len;
+ }
++#endif
+ #endif /* CONFIG_CTRL_IFACE */
+
+
+diff --git a/src/tls/Makefile b/src/tls/Makefile
+index c84fbe859..e974a41f0 100644
+--- a/src/tls/Makefile
++++ b/src/tls/Makefile
+@@ -1,3 +1,10 @@
++LIB_OBJS= asn1.o
++
++ifneq ($(CONFIG_TLS),gnutls)
++ifneq ($(CONFIG_TLS),mbedtls)
++ifneq ($(CONFIG_TLS),openssl)
++ifneq ($(CONFIG_TLS),wolfssl)
++
+ CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
+ CFLAGS += -DCONFIG_CRYPTO_INTERNAL
+ CFLAGS += -DCONFIG_TLSV11
+@@ -21,5 +28,9 @@ LIB_OBJS= \
+ tlsv1_server_read.o \
+ tlsv1_server_write.o \
+ x509v3.o
++endif
++endif
++endif
++endif
+
+ include ../lib.rules
+diff --git a/src/utils/eloop.c b/src/utils/eloop.c
+index 00b0beff0..50dd1beda 100644
+--- a/src/utils/eloop.c
++++ b/src/utils/eloop.c
+@@ -77,6 +77,9 @@ struct eloop_sock_table {
+ struct eloop_data {
+ int max_sock;
+
++ eloop_timeout_poll_handler timeout_poll_cb;
++ eloop_poll_handler poll_cb;
++
+ size_t count; /* sum of all table counts */
+ #ifdef CONFIG_ELOOP_POLL
+ size_t max_pollfd_map; /* number of pollfds_map currently allocated */
+@@ -1121,6 +1124,12 @@ void eloop_run(void)
+ os_reltime_sub(&timeout->time, &now, &tv);
+ else
+ tv.sec = tv.usec = 0;
++ }
++
++ if (eloop.timeout_poll_cb && eloop.timeout_poll_cb(&tv, !!timeout))
++ timeout = (void *)1;
++
++ if (timeout) {
+ #if defined(CONFIG_ELOOP_POLL) || defined(CONFIG_ELOOP_EPOLL)
+ timeout_ms = tv.sec * 1000 + tv.usec / 1000;
+ #endif /* defined(CONFIG_ELOOP_POLL) || defined(CONFIG_ELOOP_EPOLL) */
+@@ -1190,7 +1199,8 @@ void eloop_run(void)
+ eloop.exceptions.changed = 0;
+
+ eloop_process_pending_signals();
+-
++ if (eloop.poll_cb)
++ eloop.poll_cb();
+
+ /* check if some registered timeouts have occurred */
+ timeout = dl_list_first(&eloop.timeout, struct eloop_timeout,
+@@ -1252,6 +1262,14 @@ out:
+ return;
+ }
+
++int eloop_register_cb(eloop_poll_handler poll_cb,
++ eloop_timeout_poll_handler timeout_cb)
++{
++ eloop.poll_cb = poll_cb;
++ eloop.timeout_poll_cb = timeout_cb;
++
++ return 0;
++}
+
+ void eloop_terminate(void)
+ {
+diff --git a/src/utils/eloop.h b/src/utils/eloop.h
+index 04ee6d183..5452ea589 100644
+--- a/src/utils/eloop.h
++++ b/src/utils/eloop.h
+@@ -65,6 +65,9 @@ typedef void (*eloop_timeout_handler)(void *eloop_ctx, void *user_ctx);
+ */
+ typedef void (*eloop_signal_handler)(int sig, void *signal_ctx);
+
++typedef bool (*eloop_timeout_poll_handler)(struct os_reltime *tv, bool tv_set);
++typedef void (*eloop_poll_handler)(void);
++
+ /**
+ * eloop_init() - Initialize global event loop data
+ * Returns: 0 on success, -1 on failure
+@@ -73,6 +76,9 @@ typedef void (*eloop_signal_handler)(int sig, void *signal_ctx);
+ */
+ int eloop_init(void);
+
++int eloop_register_cb(eloop_poll_handler poll_cb,
++ eloop_timeout_poll_handler timeout_cb);
++
+ /**
+ * eloop_register_read_sock - Register handler for read events
+ * @sock: File descriptor number for the socket
+@@ -320,6 +326,8 @@ int eloop_register_signal_reconfig(eloop_signal_handler handler,
+ */
+ int eloop_sock_requeue(void);
+
++void eloop_add_uloop(void);
++
+ /**
+ * eloop_run - Start the event loop
+ *
+diff --git a/src/utils/uloop.c b/src/utils/uloop.c
+new file mode 100644
+index 000000000..c0d26db93
+--- /dev/null
++++ b/src/utils/uloop.c
+@@ -0,0 +1,64 @@
++#include <libubox/uloop.h>
++#include "includes.h"
++#include "common.h"
++#include "eloop.h"
++
++static void eloop_uloop_event_cb(int sock, void *eloop_ctx, void *sock_ctx)
++{
++}
++
++static void eloop_uloop_fd_cb(struct uloop_fd *fd, unsigned int events)
++{
++ unsigned int changed = events ^ fd->flags;
++
++ if (changed & ULOOP_READ) {
++ if (events & ULOOP_READ)
++ eloop_register_sock(fd->fd, EVENT_TYPE_READ, eloop_uloop_event_cb, fd, fd);
++ else
++ eloop_unregister_sock(fd->fd, EVENT_TYPE_READ);
++ }
++
++ if (changed & ULOOP_WRITE) {
++ if (events & ULOOP_WRITE)
++ eloop_register_sock(fd->fd, EVENT_TYPE_WRITE, eloop_uloop_event_cb, fd, fd);
++ else
++ eloop_unregister_sock(fd->fd, EVENT_TYPE_WRITE);
++ }
++}
++
++static bool uloop_timeout_poll_handler(struct os_reltime *tv, bool tv_set)
++{
++ struct os_reltime tv_uloop;
++ int timeout_ms = uloop_get_next_timeout();
++
++ if (timeout_ms < 0)
++ return false;
++
++ tv_uloop.sec = timeout_ms / 1000;
++ tv_uloop.usec = (timeout_ms % 1000) * 1000;
++
++ if (!tv_set || os_reltime_before(&tv_uloop, tv)) {
++ *tv = tv_uloop;
++ return true;
++ }
++
++ return false;
++}
++
++static void uloop_poll_handler(void)
++{
++ uloop_run_timeout(0);
++}
++
++void eloop_add_uloop(void)
++{
++ static bool init_done = false;
++
++ if (!init_done) {
++ uloop_init();
++ uloop_fd_set_cb = eloop_uloop_fd_cb;
++ init_done = true;
++ }
++
++ eloop_register_cb(uloop_poll_handler, uloop_timeout_poll_handler);
++}
+diff --git a/src/utils/wpa_debug.c b/src/utils/wpa_debug.c
+index 7f3dd185f..627575e39 100644
+--- a/src/utils/wpa_debug.c
++++ b/src/utils/wpa_debug.c
+@@ -26,6 +26,10 @@ static FILE *wpa_debug_tracing_file = NULL;
+ #define WPAS_TRACE_PFX "wpas <%d>: "
+ #endif /* CONFIG_DEBUG_LINUX_TRACING */
+
++void (*wpa_printf_hook)(int level, const char *fmt, va_list ap);
++void (*wpa_hexdump_hook)(int level, const char *title, const void *buf,
++ size_t len);
++void (*wpa_netlink_hook)(int tx, const void *data, size_t len);
+
+ int wpa_debug_level = MSG_INFO;
+ int wpa_debug_show_keys = 0;
+@@ -206,10 +210,16 @@ void wpa_debug_close_linux_tracing(void)
+ *
+ * Note: New line '\n' is added to the end of the text when printing to stdout.
+ */
+-void wpa_printf(int level, const char *fmt, ...)
++void _wpa_printf(int level, const char *fmt, ...)
+ {
+ va_list ap;
+
++ if (wpa_printf_hook) {
++ va_start(ap, fmt);
++ wpa_printf_hook(level, fmt, ap);
++ va_end(ap);
++ }
++
+ if (level >= wpa_debug_level) {
+ #ifdef CONFIG_ANDROID_LOG
+ va_start(ap, fmt);
+@@ -255,11 +265,14 @@ void wpa_printf(int level, const char *fmt, ...)
+ }
+
+
+-static void _wpa_hexdump(int level, const char *title, const u8 *buf,
++void _wpa_hexdump(int level, const char *title, const u8 *buf,
+ size_t len, int show, int only_syslog)
+ {
+ size_t i;
+
++ if (wpa_hexdump_hook)
++ wpa_hexdump_hook(level, title, buf, len);
++
+ #ifdef CONFIG_DEBUG_LINUX_TRACING
+ if (wpa_debug_tracing_file != NULL) {
+ fprintf(wpa_debug_tracing_file,
+@@ -382,19 +395,7 @@ static void _wpa_hexdump(int level, const char *title, const u8 *buf,
+ #endif /* CONFIG_ANDROID_LOG */
+ }
+
+-void wpa_hexdump(int level, const char *title, const void *buf, size_t len)
+-{
+- _wpa_hexdump(level, title, buf, len, 1, 0);
+-}
+-
+-
+-void wpa_hexdump_key(int level, const char *title, const void *buf, size_t len)
+-{
+- _wpa_hexdump(level, title, buf, len, wpa_debug_show_keys, 0);
+-}
+-
+-
+-static void _wpa_hexdump_ascii(int level, const char *title, const void *buf,
++void _wpa_hexdump_ascii(int level, const char *title, const void *buf,
+ size_t len, int show)
+ {
+ size_t i, llen;
+@@ -507,20 +508,6 @@ file_done:
+ }
+
+
+-void wpa_hexdump_ascii(int level, const char *title, const void *buf,
+- size_t len)
+-{
+- _wpa_hexdump_ascii(level, title, buf, len, 1);
+-}
+-
+-
+-void wpa_hexdump_ascii_key(int level, const char *title, const void *buf,
+- size_t len)
+-{
+- _wpa_hexdump_ascii(level, title, buf, len, wpa_debug_show_keys);
+-}
+-
+-
+ #ifdef CONFIG_DEBUG_FILE
+ static char *last_path = NULL;
+ #endif /* CONFIG_DEBUG_FILE */
+@@ -644,7 +631,7 @@ void wpa_msg_register_ifname_cb(wpa_msg_get_ifname_func func)
+ }
+
+
+-void wpa_msg(void *ctx, int level, const char *fmt, ...)
++void _wpa_msg(void *ctx, int level, const char *fmt, ...)
+ {
+ va_list ap;
+ char *buf;
+@@ -682,7 +669,7 @@ void wpa_msg(void *ctx, int level, const char *fmt, ...)
+ }
+
+
+-void wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
++void _wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
+ {
+ va_list ap;
+ char *buf;
+diff --git a/src/utils/wpa_debug.h b/src/utils/wpa_debug.h
+index 4c02ad3c7..854520bfe 100644
+--- a/src/utils/wpa_debug.h
++++ b/src/utils/wpa_debug.h
+@@ -11,6 +11,10 @@
+
+ #include "wpabuf.h"
+
++extern void (*wpa_printf_hook)(int level, const char *fmt, va_list ap);
++extern void (*wpa_hexdump_hook)(int level, const char *title,
++ const void *buf, size_t len);
++extern void (*wpa_netlink_hook)(int tx, const void *data, size_t len);
+ extern int wpa_debug_level;
+ extern int wpa_debug_show_keys;
+ extern int wpa_debug_timestamp;
+@@ -51,6 +55,17 @@ void wpa_debug_close_file(void);
+ void wpa_debug_setup_stdout(void);
+ void wpa_debug_stop_log(void);
+
++/* internal */
++void _wpa_hexdump(int level, const char *title, const u8 *buf,
++ size_t len, int show, int only_syslog);
++void _wpa_hexdump_ascii(int level, const char *title, const void *buf,
++ size_t len, int show);
++extern int wpa_debug_show_keys;
++
++#ifndef CONFIG_MSG_MIN_PRIORITY
++#define CONFIG_MSG_MIN_PRIORITY 0
++#endif
++
+ /**
+ * wpa_debug_printf_timestamp - Print timestamp for debug output
+ *
+@@ -71,9 +86,15 @@ void wpa_debug_print_timestamp(void);
+ *
+ * Note: New line '\n' is added to the end of the text when printing to stdout.
+ */
+-void wpa_printf(int level, const char *fmt, ...)
++void _wpa_printf(int level, const char *fmt, ...)
+ PRINTF_FORMAT(2, 3);
+
++#define wpa_printf(level, ...) \
++ do { \
++ if (level >= CONFIG_MSG_MIN_PRIORITY) \
++ _wpa_printf(level, __VA_ARGS__); \
++ } while(0)
++
+ /**
+ * wpa_hexdump - conditional hex dump
+ * @level: priority level (MSG_*) of the message
+@@ -85,7 +106,13 @@ PRINTF_FORMAT(2, 3);
+ * output may be directed to stdout, stderr, and/or syslog based on
+ * configuration. The contents of buf is printed out has hex dump.
+ */
+-void wpa_hexdump(int level, const char *title, const void *buf, size_t len);
++static inline void wpa_hexdump(int level, const char *title, const void *buf, size_t len)
++{
++ if (level < CONFIG_MSG_MIN_PRIORITY)
++ return;
++
++ _wpa_hexdump(level, title, buf, len, 1, 1);
++}
+
+ static inline void wpa_hexdump_buf(int level, const char *title,
+ const struct wpabuf *buf)
+@@ -107,7 +134,13 @@ static inline void wpa_hexdump_buf(int level, const char *title,
+ * like wpa_hexdump(), but by default, does not include secret keys (passwords,
+ * etc.) in debug output.
+ */
+-void wpa_hexdump_key(int level, const char *title, const void *buf, size_t len);
++static inline void wpa_hexdump_key(int level, const char *title, const u8 *buf, size_t len)
++{
++ if (level < CONFIG_MSG_MIN_PRIORITY)
++ return;
++
++ _wpa_hexdump(level, title, buf, len, wpa_debug_show_keys, 1);
++}
+
+ static inline void wpa_hexdump_buf_key(int level, const char *title,
+ const struct wpabuf *buf)
+@@ -129,8 +162,14 @@ static inline void wpa_hexdump_buf_key(int level, const char *title,
+ * the hex numbers and ASCII characters (for printable range) are shown. 16
+ * bytes per line will be shown.
+ */
+-void wpa_hexdump_ascii(int level, const char *title, const void *buf,
+- size_t len);
++static inline void wpa_hexdump_ascii(int level, const char *title,
++ const u8 *buf, size_t len)
++{
++ if (level < CONFIG_MSG_MIN_PRIORITY)
++ return;
++
++ _wpa_hexdump_ascii(level, title, buf, len, 1);
++}
+
+ /**
+ * wpa_hexdump_ascii_key - conditional hex dump, hide keys
+@@ -146,8 +185,14 @@ void wpa_hexdump_ascii(int level, const char *title, const void *buf,
+ * bytes per line will be shown. This works like wpa_hexdump_ascii(), but by
+ * default, does not include secret keys (passwords, etc.) in debug output.
+ */
+-void wpa_hexdump_ascii_key(int level, const char *title, const void *buf,
+- size_t len);
++static inline void wpa_hexdump_ascii_key(int level, const char *title,
++ const u8 *buf, size_t len)
++{
++ if (level < CONFIG_MSG_MIN_PRIORITY)
++ return;
++
++ _wpa_hexdump_ascii(level, title, buf, len, wpa_debug_show_keys);
++}
+
+ /*
+ * wpa_dbg() behaves like wpa_msg(), but it can be removed from build to reduce
+@@ -184,7 +229,12 @@ void wpa_hexdump_ascii_key(int level, const char *title, const void *buf,
+ *
+ * Note: New line '\n' is added to the end of the text when printing to stdout.
+ */
+-void wpa_msg(void *ctx, int level, const char *fmt, ...) PRINTF_FORMAT(3, 4);
++void _wpa_msg(void *ctx, int level, const char *fmt, ...) PRINTF_FORMAT(3, 4);
++#define wpa_msg(ctx, level, ...) \
++ do { \
++ if (level >= CONFIG_MSG_MIN_PRIORITY) \
++ _wpa_msg(ctx, level, __VA_ARGS__); \
++ } while(0)
+
+ /**
+ * wpa_msg_ctrl - Conditional printf for ctrl_iface monitors
+@@ -198,8 +248,13 @@ void wpa_msg(void *ctx, int level, const char *fmt, ...) PRINTF_FORMAT(3, 4);
+ * attached ctrl_iface monitors. In other words, it can be used for frequent
+ * events that do not need to be sent to syslog.
+ */
+-void wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
++void _wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
+ PRINTF_FORMAT(3, 4);
++#define wpa_msg_ctrl(ctx, level, ...) \
++ do { \
++ if (level >= CONFIG_MSG_MIN_PRIORITY) \
++ _wpa_msg_ctrl(ctx, level, __VA_ARGS__); \
++ } while(0)
+
+ /**
+ * wpa_msg_global - Global printf for ctrl_iface monitors
+diff --git a/tests/Makefile b/tests/Makefile
+index 8ec154bb3..58287f56f 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -5,6 +5,14 @@ ALL=test-base64 test-md4 test-milenage \
+ test-sha256 test-aes test-x509v3 test-list test-rc4 \
+ test-bss
+
++RUN_TESTS= \
++ test-list \
++ test-md4 test-rc4 test-sha1 test-sha256 \
++ test-milenage test-aes \
++ test-crypto_module
++
++ALL=$(RUN_TESTS) test-base64 test-https test-https_server
++
+ include ../src/build.rules
+
+ ifdef LIBFUZZER
+@@ -25,13 +33,27 @@ CFLAGS += -DCONFIG_IEEE80211R_AP
+ CFLAGS += -DCONFIG_IEEE80211R
+ CFLAGS += -DCONFIG_TDLS
+
++# test-crypto_module
++CFLAGS += -DCONFIG_MODULE_TESTS
++CFLAGS += -DCONFIG_DPP
++#CFLAGS += -DCONFIG_DPP2
++#CFLAGS += -DCONFIG_DPP3
++CFLAGS += -DCONFIG_ECC
++CFLAGS += -DCONFIG_HMAC_SHA256_KDF
++CFLAGS += -DCONFIG_HMAC_SHA384_KDF
++CFLAGS += -DCONFIG_MESH
++CFLAGS += -DCONFIG_SHA256
++CFLAGS += -DCONFIG_SHA384
++CFLAGS += -DEAP_PSK
++CFLAGS += -DEAP_FAST
++
+ CFLAGS += -I../src
+ CFLAGS += -I../src/utils
+
+ SLIBS = ../src/utils/libutils.a
+
+-DLIBS = ../src/crypto/libcrypto.a \
+- ../src/tls/libtls.a
++DLIBS = ../src/tls/libtls.a \
++ ../src/crypto/libcrypto.a
+
+ _OBJS_VAR := LLIBS
+ include ../src/objs.mk
+@@ -43,12 +65,43 @@ include ../src/objs.mk
+ LIBS = $(SLIBS) $(DLIBS)
+ LLIBS = -Wl,--start-group $(DLIBS) -Wl,--end-group $(SLIBS)
+
++ifeq ($(CONFIG_TLS),mbedtls)
++CFLAGS += -DCONFIG_TLS_MBEDTLS
++LLIBS += -lmbedtls -lmbedx509 -lmbedcrypto
++else
++ifeq ($(CONFIG_TLS),openssl)
++CFLAGS += -DCONFIG_TLS_OPENSSL
++LLIBS += -lssl -lcrypto
++else
++ifeq ($(CONFIG_TLS),gnutls)
++CFLAGS += -DCONFIG_TLS_GNUTLS
++LLIBS += -lgnutls -lgpg-error -lgcrypt
++else
++ifeq ($(CONFIG_TLS),wolfssl)
++CFLAGS += -DCONFIG_TLS_WOLFSSL
++LLIBS += -lwolfssl -lm
++else
++CFLAGS += -DCONFIG_TLS_INTERNAL
++CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
++ALL += test-rsa-sig-ver
++ALL += test-x509v3
++clean-config_tls_internal:
++ rm -f test_x509v3_nist.out.*
++ rm -f test_x509v3_nist2.out.*
++endif
++endif
++endif
++endif
++
+ # glibc < 2.17 needs -lrt for clock_gettime()
+ LLIBS += -lrt
+
+ test-aes: $(call BUILDOBJ,test-aes.o) $(LIBS)
+ $(LDO) $(LDFLAGS) -o $@ $^ $(LLIBS)
+
++test-crypto_module: $(call BUILDOBJ,test-crypto_module.o) $(LIBS)
++ $(LDO) $(LDFLAGS) -o $@ $< $(LLIBS)
++
+ test-base64: $(call BUILDOBJ,test-base64.o) $(LIBS)
+ $(LDO) $(LDFLAGS) -o $@ $^ $(LLIBS)
+
+@@ -149,10 +202,12 @@ run-tests: $(ALL)
+ ./test-sha1
+ ./test-sha256
+ ./test-bss
++
++ @set -ex; for i in $(RUN_TESTS); do ./$$i; done
+ @echo
+ @echo All tests completed successfully.
+
+-clean: common-clean
++clean: common-clean clean-config_tls_internal
+ rm -f *~
+- rm -f test_x509v3_nist.out.*
+- rm -f test_x509v3_nist2.out.*
++
++.PHONY: run-tests clean-config_tls_internal
+diff --git a/tests/hwsim/example-hostapd.config b/tests/hwsim/example-hostapd.config
+index 210b7fb86..608e20eed 100644
+--- a/tests/hwsim/example-hostapd.config
++++ b/tests/hwsim/example-hostapd.config
+@@ -4,6 +4,7 @@ CONFIG_DRIVER_NONE=y
+ CONFIG_DRIVER_NL80211=y
+ CONFIG_RSN_PREAUTH=y
+
++#CONFIG_TLS=mbedtls
+ #CONFIG_TLS=internal
+ #CONFIG_INTERNAL_LIBTOMMATH=y
+ #CONFIG_INTERNAL_LIBTOMMATH_FAST=y
+@@ -33,12 +34,7 @@ CONFIG_EAP_TNC=y
+ CFLAGS += -DTNC_CONFIG_FILE=\"tnc/tnc_config\"
+ LIBS += -rdynamic
+ CONFIG_EAP_UNAUTH_TLS=y
+-ifeq ($(CONFIG_TLS), openssl)
+-CONFIG_EAP_PWD=y
+-endif
+-ifeq ($(CONFIG_TLS), wolfssl)
+-CONFIG_EAP_PWD=y
+-endif
++CONFIG_EAP_PWD=$(if $(filter openssl wolfssl mbedtls,$(CONFIG_TLS)),y,)
+ CONFIG_EAP_EKE=y
+ CONFIG_PKCS12=y
+ CONFIG_RADIUS_SERVER=y
+@@ -88,7 +84,7 @@ CFLAGS += -DCONFIG_RADIUS_TEST
+ CONFIG_MODULE_TESTS=y
+
+ CONFIG_SUITEB=y
+-CONFIG_SUITEB192=y
++CONFIG_SUITEB192=$(if $(filter openssl mbedtls,$(CONFIG_TLS)),y,)
+
+ # AddressSanitizer (ASan) can be enabled by uncommenting the following lines.
+ # This can be used as a more efficient memory error detector than valgrind
+diff --git a/tests/hwsim/example-wpa_supplicant.config b/tests/hwsim/example-wpa_supplicant.config
+index 123f397e3..da0dde659 100644
+--- a/tests/hwsim/example-wpa_supplicant.config
++++ b/tests/hwsim/example-wpa_supplicant.config
+@@ -2,6 +2,7 @@
+
+ CONFIG_TLS=openssl
+ #CONFIG_TLS=wolfssl
++#CONFIG_TLS=mbedtls
+ #CONFIG_TLS=internal
+ #CONFIG_INTERNAL_LIBTOMMATH=y
+ #CONFIG_INTERNAL_LIBTOMMATH_FAST=y
+@@ -34,13 +35,7 @@ LIBS += -rdynamic
+ CONFIG_EAP_FAST=y
+ CONFIG_EAP_TEAP=y
+ CONFIG_EAP_IKEV2=y
+-
+-ifeq ($(CONFIG_TLS), openssl)
+-CONFIG_EAP_PWD=y
+-endif
+-ifeq ($(CONFIG_TLS), wolfssl)
+-CONFIG_EAP_PWD=y
+-endif
++CONFIG_EAP_PWD=$(if $(filter openssl wolfssl mbedtls,$(CONFIG_TLS)),y,)
+
+ CONFIG_USIM_SIMULATOR=y
+ CONFIG_SIM_SIMULATOR=y
+@@ -136,7 +131,7 @@ CONFIG_TESTING_OPTIONS=y
+ CONFIG_MODULE_TESTS=y
+
+ CONFIG_SUITEB=y
+-CONFIG_SUITEB192=y
++CONFIG_SUITEB192=$(if $(filter openssl mbedtls,$(CONFIG_TLS)),y,)
+
+ # AddressSanitizer (ASan) can be enabled by uncommenting the following lines.
+ # This can be used as a more efficient memory error detector than valgrind
+diff --git a/tests/hwsim/test_ap_eap.py b/tests/hwsim/test_ap_eap.py
+index a20140316..027a60b25 100644
+--- a/tests/hwsim/test_ap_eap.py
++++ b/tests/hwsim/test_ap_eap.py
+@@ -42,20 +42,42 @@ def check_eap_capa(dev, method):
+ res = dev.get_capability("eap")
+ if method not in res:
+ raise HwsimSkip("EAP method %s not supported in the build" % method)
++ if method == "FAST" or method == "TEAP":
++ tls = dev.request("GET tls_library")
++ if tls.startswith("mbed TLS"):
++ raise HwsimSkip("EAP-%s not supported with this TLS library: " % method + tls)
+
+ def check_subject_match_support(dev):
+ tls = dev.request("GET tls_library")
+- if not tls.startswith("OpenSSL") and not tls.startswith("wolfSSL"):
++ if tls.startswith("OpenSSL"):
++ return
++ elif tls.startswith("wolfSSL"):
++ return
++ elif tls.startswith("mbed TLS"):
++ return
++ else:
+ raise HwsimSkip("subject_match not supported with this TLS library: " + tls)
+
+ def check_check_cert_subject_support(dev):
+ tls = dev.request("GET tls_library")
+- if not tls.startswith("OpenSSL") and not tls.startswith("wolfSSL"):
++ if tls.startswith("OpenSSL"):
++ return
++ elif tls.startswith("wolfSSL"):
++ return
++ elif tls.startswith("mbed TLS"):
++ return
++ else:
+ raise HwsimSkip("check_cert_subject not supported with this TLS library: " + tls)
+
+ def check_altsubject_match_support(dev):
+ tls = dev.request("GET tls_library")
+- if not tls.startswith("OpenSSL") and not tls.startswith("wolfSSL"):
++ if tls.startswith("OpenSSL"):
++ return
++ elif tls.startswith("wolfSSL"):
++ return
++ elif tls.startswith("mbed TLS"):
++ return
++ else:
+ raise HwsimSkip("altsubject_match not supported with this TLS library: " + tls)
+
+ def check_domain_match(dev):
+@@ -70,7 +92,13 @@ def check_domain_suffix_match(dev):
+
+ def check_domain_match_full(dev):
+ tls = dev.request("GET tls_library")
+- if not tls.startswith("OpenSSL") and not tls.startswith("wolfSSL"):
++ if tls.startswith("OpenSSL"):
++ return
++ elif tls.startswith("wolfSSL"):
++ return
++ elif tls.startswith("mbed TLS"):
++ return
++ else:
+ raise HwsimSkip("domain_suffix_match requires full match with this TLS library: " + tls)
+
+ def check_cert_probe_support(dev):
+@@ -79,8 +107,15 @@ def check_cert_probe_support(dev):
+ raise HwsimSkip("Certificate probing not supported with this TLS library: " + tls)
+
+ def check_ext_cert_check_support(dev):
++ if not openssl_imported:
++ raise HwsimSkip("OpenSSL python method not available")
++
+ tls = dev.request("GET tls_library")
+- if not tls.startswith("OpenSSL"):
++ if tls.startswith("OpenSSL"):
++ return
++ elif tls.startswith("mbed TLS"):
++ return
++ else:
+ raise HwsimSkip("ext_cert_check not supported with this TLS library: " + tls)
+
+ def check_ocsp_support(dev):
+@@ -91,10 +126,12 @@ def check_ocsp_support(dev):
+ # raise HwsimSkip("OCSP not supported with this TLS library: " + tls)
+ #if tls.startswith("wolfSSL"):
+ # raise HwsimSkip("OCSP not supported with this TLS library: " + tls)
++ if tls.startswith("mbed TLS"):
++ raise HwsimSkip("OCSP not supported with this TLS library: " + tls)
+
+ def check_pkcs5_v15_support(dev):
+ tls = dev.request("GET tls_library")
+- if "BoringSSL" in tls or "GnuTLS" in tls:
++ if "BoringSSL" in tls or "GnuTLS" in tls or "mbed TLS" in tls:
+ raise HwsimSkip("PKCS#5 v1.5 not supported with this TLS library: " + tls)
+
+ def check_tls13_support(dev):
+@@ -122,11 +159,15 @@ def check_pkcs12_support(dev):
+ # raise HwsimSkip("PKCS#12 not supported with this TLS library: " + tls)
+ if tls.startswith("wolfSSL"):
+ raise HwsimSkip("PKCS#12 not supported with this TLS library: " + tls)
++ if tls.startswith("mbed TLS"):
++ raise HwsimSkip("PKCS#12 not supported with this TLS library: " + tls)
+
+ def check_dh_dsa_support(dev):
+ tls = dev.request("GET tls_library")
+ if tls.startswith("internal"):
+ raise HwsimSkip("DH DSA not supported with this TLS library: " + tls)
++ if tls.startswith("mbed TLS"):
++ raise HwsimSkip("DH DSA not supported with this TLS library: " + tls)
+
+ def check_ec_support(dev):
+ tls = dev.request("GET tls_library")
+@@ -1741,7 +1782,7 @@ def test_ap_wpa2_eap_ttls_pap_subject_match(dev, apdev):
+ eap_connect(dev[0], hapd, "TTLS", "pap user",
+ anonymous_identity="ttls", password="password",
+ ca_cert="auth_serv/ca.pem", phase2="auth=PAP",
+- subject_match="/C=FI/O=w1.fi/CN=server.w1.fi",
++ check_cert_subject="/C=FI/O=w1.fi/CN=server.w1.fi",
+ altsubject_match="EMAIL:noone@example.com;DNS:server.w1.fi;URI:http://example.com/")
+ eap_reauth(dev[0], "TTLS")
+
+@@ -2976,6 +3017,7 @@ def test_ap_wpa2_eap_tls_neg_domain_match(dev, apdev):
+
+ def test_ap_wpa2_eap_tls_neg_subject_match(dev, apdev):
+ """WPA2-Enterprise negative test - subject mismatch"""
++ check_subject_match_support(dev[0])
+ params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap")
+ hostapd.add_ap(apdev[0], params)
+ dev[0].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="TTLS",
+@@ -3036,6 +3078,7 @@ def test_ap_wpa2_eap_tls_neg_subject_match(dev, apdev):
+
+ def test_ap_wpa2_eap_tls_neg_altsubject_match(dev, apdev):
+ """WPA2-Enterprise negative test - altsubject mismatch"""
++ check_altsubject_match_support(dev[0])
+ params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap")
+ hostapd.add_ap(apdev[0], params)
+
+@@ -3582,7 +3625,7 @@ def test_ap_wpa2_eap_ikev2_oom(dev, apdev):
+ dev[0].request("REMOVE_NETWORK all")
+
+ tls = dev[0].request("GET tls_library")
+- if not tls.startswith("wolfSSL"):
++ if not tls.startswith("wolfSSL") and not tls.startswith("mbed TLS"):
+ tests = [(1, "os_get_random;dh_init")]
+ else:
+ tests = [(1, "crypto_dh_init;dh_init")]
+@@ -4896,7 +4939,7 @@ def test_ap_wpa2_eap_tls_intermediate_ca(dev, apdev, params):
+ params["private_key"] = "auth_serv/iCA-server/server.key"
+ hostapd.add_ap(apdev[0], params)
+ tls = dev[0].request("GET tls_library")
+- if "GnuTLS" in tls or "wolfSSL" in tls:
++ if "GnuTLS" in tls or "wolfSSL" in tls or "mbed TLS" in tls:
+ ca_cert = "auth_serv/iCA-user/ca-and-root.pem"
+ client_cert = "auth_serv/iCA-user/user_and_ica.pem"
+ else:
+@@ -4962,6 +5005,7 @@ def test_ap_wpa2_eap_tls_intermediate_ca_ocsp_sha1(dev, apdev, params):
+ run_ap_wpa2_eap_tls_intermediate_ca_ocsp(dev, apdev, params, "-sha1")
+
+ def run_ap_wpa2_eap_tls_intermediate_ca_ocsp(dev, apdev, params, md):
++ check_ocsp_support(dev[0])
+ params = int_eap_server_params()
+ params["ca_cert"] = "auth_serv/iCA-server/ca-and-root.pem"
+ params["server_cert"] = "auth_serv/iCA-server/server.pem"
+@@ -4971,7 +5015,7 @@ def run_ap_wpa2_eap_tls_intermediate_ca_ocsp(dev, apdev, params, md):
+ try:
+ hostapd.add_ap(apdev[0], params)
+ tls = dev[0].request("GET tls_library")
+- if "GnuTLS" in tls or "wolfSSL" in tls:
++ if "GnuTLS" in tls or "wolfSSL" in tls or "mbed TLS" in tls:
+ ca_cert = "auth_serv/iCA-user/ca-and-root.pem"
+ client_cert = "auth_serv/iCA-user/user_and_ica.pem"
+ else:
+@@ -5007,7 +5051,7 @@ def run_ap_wpa2_eap_tls_intermediate_ca_ocsp_revoked(dev, apdev, params, md):
+ try:
+ hostapd.add_ap(apdev[0], params)
+ tls = dev[0].request("GET tls_library")
+- if "GnuTLS" in tls or "wolfSSL" in tls:
++ if "GnuTLS" in tls or "wolfSSL" in tls or "mbed TLS" in tls:
+ ca_cert = "auth_serv/iCA-user/ca-and-root.pem"
+ client_cert = "auth_serv/iCA-user/user_and_ica.pem"
+ else:
+@@ -5057,7 +5101,7 @@ def test_ap_wpa2_eap_tls_intermediate_ca_ocsp_multi_missing_resp(dev, apdev, par
+ try:
+ hostapd.add_ap(apdev[0], params)
+ tls = dev[0].request("GET tls_library")
+- if "GnuTLS" in tls or "wolfSSL" in tls:
++ if "GnuTLS" in tls or "wolfSSL" in tls or "mbed TLS" in tls:
+ ca_cert = "auth_serv/iCA-user/ca-and-root.pem"
+ client_cert = "auth_serv/iCA-user/user_and_ica.pem"
+ else:
+@@ -5124,7 +5168,7 @@ def test_ap_wpa2_eap_tls_intermediate_ca_ocsp_multi(dev, apdev, params):
+
+ hostapd.add_ap(apdev[0], params)
+ tls = dev[0].request("GET tls_library")
+- if "GnuTLS" in tls or "wolfSSL" in tls:
++ if "GnuTLS" in tls or "wolfSSL" in tls or "mbed TLS" in tls:
+ ca_cert = "auth_serv/iCA-user/ca-and-root.pem"
+ client_cert = "auth_serv/iCA-user/user_and_ica.pem"
+ else:
+@@ -5382,6 +5426,7 @@ def test_ap_wpa2_eap_ttls_server_cert_eku_client_server(dev, apdev):
+
+ def test_ap_wpa2_eap_ttls_server_pkcs12(dev, apdev):
+ """WPA2-Enterprise using EAP-TTLS and server PKCS#12 file"""
++ check_pkcs12_support(dev[0])
+ skip_with_fips(dev[0])
+ params = int_eap_server_params()
+ del params["server_cert"]
+@@ -5394,6 +5439,7 @@ def test_ap_wpa2_eap_ttls_server_pkcs12(dev, apdev):
+
+ def test_ap_wpa2_eap_ttls_server_pkcs12_extra(dev, apdev):
+ """EAP-TTLS and server PKCS#12 file with extra certs"""
++ check_pkcs12_support(dev[0])
+ skip_with_fips(dev[0])
+ params = int_eap_server_params()
+ del params["server_cert"]
+@@ -5416,6 +5462,7 @@ def test_ap_wpa2_eap_ttls_dh_params_server(dev, apdev):
+
+ def test_ap_wpa2_eap_ttls_dh_params_dsa_server(dev, apdev):
+ """WPA2-Enterprise using EAP-TTLS and alternative server dhparams (DSA)"""
++ check_dh_dsa_support(dev[0])
+ params = int_eap_server_params()
+ params["dh_file"] = "auth_serv/dsaparam.pem"
+ hapd = hostapd.add_ap(apdev[0], params)
+@@ -5727,8 +5774,8 @@ def test_ap_wpa2_eap_non_ascii_identity2(dev, apdev):
+ def test_openssl_cipher_suite_config_wpas(dev, apdev):
+ """OpenSSL cipher suite configuration on wpa_supplicant"""
+ tls = dev[0].request("GET tls_library")
+- if not tls.startswith("OpenSSL"):
+- raise HwsimSkip("TLS library is not OpenSSL: " + tls)
++ if not tls.startswith("OpenSSL") and not tls.startswith("mbed TLS"):
++ raise HwsimSkip("TLS library is not OpenSSL or mbed TLS: " + tls)
+ params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap")
+ hapd = hostapd.add_ap(apdev[0], params)
+ eap_connect(dev[0], hapd, "TTLS", "pap user",
+@@ -5754,14 +5801,14 @@ def test_openssl_cipher_suite_config_wpas(dev, apdev):
+ def test_openssl_cipher_suite_config_hapd(dev, apdev):
+ """OpenSSL cipher suite configuration on hostapd"""
+ tls = dev[0].request("GET tls_library")
+- if not tls.startswith("OpenSSL"):
+- raise HwsimSkip("wpa_supplicant TLS library is not OpenSSL: " + tls)
++ if not tls.startswith("OpenSSL") and not tls.startswith("mbed TLS"):
++ raise HwsimSkip("wpa_supplicant TLS library is not OpenSSL or mbed TLS: " + tls)
+ params = int_eap_server_params()
+ params['openssl_ciphers'] = "AES256"
+ hapd = hostapd.add_ap(apdev[0], params)
+ tls = hapd.request("GET tls_library")
+- if not tls.startswith("OpenSSL"):
+- raise HwsimSkip("hostapd TLS library is not OpenSSL: " + tls)
++ if not tls.startswith("OpenSSL") and not tls.startswith("mbed TLS"):
++ raise HwsimSkip("hostapd TLS library is not OpenSSL or mbed TLS: " + tls)
+ eap_connect(dev[0], hapd, "TTLS", "pap user",
+ anonymous_identity="ttls", password="password",
+ ca_cert="auth_serv/ca.pem", phase2="auth=PAP")
+@@ -6207,14 +6254,26 @@ def test_ap_wpa2_eap_tls_versions(dev, apdev):
+ check_tls_ver(dev[0], hapd,
+ "tls_disable_tlsv1_0=1 tls_disable_tlsv1_1=1",
+ "TLSv1.2")
+- elif tls.startswith("internal"):
++ elif tls.startswith("internal") or tls.startswith("mbed TLS"):
+ check_tls_ver(dev[0], hapd,
+ "tls_disable_tlsv1_0=1 tls_disable_tlsv1_1=1", "TLSv1.2")
++<<<<<<< HEAD
+ check_tls_ver(dev[1], hapd,
+ "tls_disable_tlsv1_0=1 tls_disable_tlsv1_1=0 tls_disable_tlsv1_2=1", "TLSv1.1")
+ check_tls_ver(dev[2], hapd,
+ "tls_disable_tlsv1_0=0 tls_disable_tlsv1_1=1 tls_disable_tlsv1_2=1", "TLSv1")
+ if "run=OpenSSL 1.1.1" in tls or "run=OpenSSL 3." in tls:
++=======
++ if tls.startswith("mbed TLS"):
++ check_tls_ver(dev[2], hapd,
++ "tls_disable_tlsv1_0=0 tls_disable_tlsv1_1=1 tls_disable_tlsv1_2=1", "TLSv1.0")
++ else:
++ check_tls_ver(dev[1], hapd,
++ "tls_disable_tlsv1_0=1 tls_disable_tlsv1_1=0 tls_disable_tlsv1_2=1", "TLSv1.1")
++ check_tls_ver(dev[2], hapd,
++ "tls_disable_tlsv1_0=0 tls_disable_tlsv1_1=1 tls_disable_tlsv1_2=1", "TLSv1")
++ if "run=OpenSSL 1.1.1" in tls or "run=OpenSSL 3.0" in tls:
++>>>>>>> 585bc9ada (hostapd: sync 2024-01-18 openwrt/trunk patch folder)
+ check_tls_ver(dev[0], hapd,
+ "tls_disable_tlsv1_0=1 tls_disable_tlsv1_1=1 tls_disable_tlsv1_2=1 tls_disable_tlsv1_3=0", "TLSv1.3")
+
+@@ -6235,6 +6294,11 @@ def test_ap_wpa2_eap_tls_versions_server(dev, apdev):
+ tests = [("TLSv1", "[ENABLE-TLSv1.0][DISABLE-TLSv1.1][DISABLE-TLSv1.2][DISABLE-TLSv1.3]"),
+ ("TLSv1.1", "[ENABLE-TLSv1.0][ENABLE-TLSv1.1][DISABLE-TLSv1.2][DISABLE-TLSv1.3]"),
+ ("TLSv1.2", "[ENABLE-TLSv1.0][ENABLE-TLSv1.1][ENABLE-TLSv1.2][DISABLE-TLSv1.3]")]
++ tls = dev[0].request("GET tls_library")
++ if tls.startswith("mbed TLS"):
++ tests = [#("TLSv1.0", "[ENABLE-TLSv1.0][DISABLE-TLSv1.1][DISABLE-TLSv1.2][DISABLE-TLSv1.3]"),
++ #("TLSv1.1", "[ENABLE-TLSv1.0][ENABLE-TLSv1.1][DISABLE-TLSv1.2][DISABLE-TLSv1.3]"),
++ ("TLSv1.2", "[ENABLE-TLSv1.0][ENABLE-TLSv1.1][ENABLE-TLSv1.2][DISABLE-TLSv1.3]")]
+ for exp, flags in tests:
+ hapd.disable()
+ hapd.set("tls_flags", flags)
+@@ -7305,6 +7369,7 @@ def test_ap_wpa2_eap_assoc_rsn(dev, apdev):
+ def test_eap_tls_ext_cert_check(dev, apdev):
+ """EAP-TLS and external server certification validation"""
+ # With internal server certificate chain validation
++ check_ext_cert_check_support(dev[0])
+ id = dev[0].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="TLS",
+ identity="tls user",
+ ca_cert="auth_serv/ca.pem",
+@@ -7317,6 +7382,7 @@ def test_eap_tls_ext_cert_check(dev, apdev):
+ def test_eap_ttls_ext_cert_check(dev, apdev):
+ """EAP-TTLS and external server certification validation"""
+ # Without internal server certificate chain validation
++ check_ext_cert_check_support(dev[0])
+ id = dev[0].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="TTLS",
+ identity="pap user", anonymous_identity="ttls",
+ password="password", phase2="auth=PAP",
+@@ -7327,6 +7393,7 @@ def test_eap_ttls_ext_cert_check(dev, apdev):
+ def test_eap_peap_ext_cert_check(dev, apdev):
+ """EAP-PEAP and external server certification validation"""
+ # With internal server certificate chain validation
++ check_ext_cert_check_support(dev[0])
+ id = dev[0].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="PEAP",
+ identity="user", anonymous_identity="peap",
+ ca_cert="auth_serv/ca.pem",
+@@ -7337,6 +7404,7 @@ def test_eap_peap_ext_cert_check(dev, apdev):
+
+ def test_eap_fast_ext_cert_check(dev, apdev):
+ """EAP-FAST and external server certification validation"""
++ check_ext_cert_check_support(dev[0])
+ check_eap_capa(dev[0], "FAST")
+ # With internal server certificate chain validation
+ dev[0].request("SET blob fast_pac_auth_ext ")
+@@ -7351,10 +7419,6 @@ def test_eap_fast_ext_cert_check(dev, apdev):
+ run_ext_cert_check(dev, apdev, id)
+
+ def run_ext_cert_check(dev, apdev, net_id):
+- check_ext_cert_check_support(dev[0])
+- if not openssl_imported:
+- raise HwsimSkip("OpenSSL python method not available")
+-
+ params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap")
+ hapd = hostapd.add_ap(apdev[0], params)
+
+diff --git a/tests/hwsim/test_ap_ft.py b/tests/hwsim/test_ap_ft.py
+index 3d07d21f7..a708412de 100644
+--- a/tests/hwsim/test_ap_ft.py
++++ b/tests/hwsim/test_ap_ft.py
+@@ -2486,11 +2486,11 @@ def test_ap_ft_ap_oom5(dev, apdev):
+ # This will fail to roam
+ dev[0].roam(bssid1, check_bssid=False)
+
+- with fail_test(hapd1, 1, "sha256_prf_bits;wpa_pmk_r1_to_ptk;wpa_ft_process_auth_req"):
++ with fail_test(hapd1, 1, "sha256_prf;wpa_pmk_r1_to_ptk;wpa_ft_process_auth_req"):
+ # This will fail to roam
+ dev[0].roam(bssid1, check_bssid=False)
+
+- with fail_test(hapd1, 3, "wpa_pmk_r1_to_ptk;wpa_ft_process_auth_req"):
++ with fail_test(hapd1, 2, "wpa_pmk_r1_to_ptk;wpa_ft_process_auth_req"):
+ # This will fail to roam
+ dev[0].roam(bssid1, check_bssid=False)
+
+diff --git a/tests/hwsim/test_authsrv.py b/tests/hwsim/test_authsrv.py
+index e0665bcb2..02ec301e5 100644
+--- a/tests/hwsim/test_authsrv.py
++++ b/tests/hwsim/test_authsrv.py
+@@ -156,9 +156,12 @@ def test_authsrv_oom(dev, apdev):
+ if "FAIL" not in authsrv.request("ENABLE"):
+ raise Exception("ENABLE succeeded during OOM")
+
+- with alloc_fail(authsrv, 1, "tls_init;authsrv_init"):
+- if "FAIL" not in authsrv.request("ENABLE"):
+- raise Exception("ENABLE succeeded during OOM")
++ # tls_mbedtls.c:tls_init() does not alloc memory (no alloc fail trigger)
++ tls = dev[0].request("GET tls_library")
++ if not tls.startswith("mbed TLS"):
++ with alloc_fail(authsrv, 1, "tls_init;authsrv_init"):
++ if "FAIL" not in authsrv.request("ENABLE"):
++ raise Exception("ENABLE succeeded during OOM")
+
+ for count in range(1, 3):
+ with alloc_fail(authsrv, count, "eap_sim_db_init;authsrv_init"):
+diff --git a/tests/hwsim/test_dpp.py b/tests/hwsim/test_dpp.py
+index 518983bd0..077de58c9 100644
+--- a/tests/hwsim/test_dpp.py
++++ b/tests/hwsim/test_dpp.py
+@@ -39,7 +39,8 @@ def check_dpp_capab(dev, brainpool=False, min_ver=1):
+ raise HwsimSkip("DPP not supported")
+ if brainpool:
+ tls = dev.request("GET tls_library")
+- if (not tls.startswith("OpenSSL") or "run=BoringSSL" in tls) and not tls.startswith("wolfSSL"):
++ if (not tls.startswith("OpenSSL") or "run=BoringSSL" in tls) and not tls.startswith("wolfSSL") \
++ and not tls.startswith("mbed TLS"):
+ raise HwsimSkip("Crypto library does not support Brainpool curves: " + tls)
+ capa = dev.request("GET_CAPABILITY dpp")
+ ver = 1
+@@ -3902,6 +3903,9 @@ def test_dpp_proto_auth_req_no_i_proto_key(dev, apdev):
+
+ def test_dpp_proto_auth_req_invalid_i_proto_key(dev, apdev):
+ """DPP protocol testing - invalid I-proto key in Auth Req"""
++ tls = dev[0].request("GET tls_library")
++ if tls.startswith("mbed TLS"):
++ raise HwsimSkip("mbed TLS crypto_ecdh_set_peerkey() properly detects invalid key; no response")
+ run_dpp_proto_auth_req_missing(dev, 66, "Invalid Initiator Protocol Key")
+
+ def test_dpp_proto_auth_req_no_i_nonce(dev, apdev):
+@@ -3997,7 +4001,12 @@ def test_dpp_proto_auth_resp_no_r_proto_key(dev, apdev):
+
+ def test_dpp_proto_auth_resp_invalid_r_proto_key(dev, apdev):
+ """DPP protocol testing - invalid R-Proto Key in Auth Resp"""
+- run_dpp_proto_auth_resp_missing(dev, 67, "Invalid Responder Protocol Key")
++ tls = dev[0].request("GET tls_library")
++ if tls.startswith("mbed TLS"):
++ # mbed TLS crypto_ecdh_set_peerkey() properly detects invalid key
++ run_dpp_proto_auth_resp_missing(dev, 67, "Failed to derive ECDH shared secret")
++ else:
++ run_dpp_proto_auth_resp_missing(dev, 67, "Invalid Responder Protocol Key")
+
+ def test_dpp_proto_auth_resp_no_r_nonce(dev, apdev):
+ """DPP protocol testing - no R-nonce in Auth Resp"""
+@@ -4359,11 +4368,17 @@ def test_dpp_proto_pkex_exchange_resp_invalid_status(dev, apdev):
+
+ def test_dpp_proto_pkex_cr_req_invalid_bootstrap_key(dev, apdev):
+ """DPP protocol testing - invalid Bootstrap Key in PKEX Commit-Reveal Request"""
++ tls = dev[0].request("GET tls_library")
++ if tls.startswith("mbed TLS"):
++ raise HwsimSkip("mbed TLS crypto_ecdh_set_peerkey() properly detects invalid key; no response")
+ run_dpp_proto_pkex_req_missing(dev, 47,
+ "Peer bootstrapping key is invalid")
+
+ def test_dpp_proto_pkex_cr_resp_invalid_bootstrap_key(dev, apdev):
+ """DPP protocol testing - invalid Bootstrap Key in PKEX Commit-Reveal Response"""
++ tls = dev[0].request("GET tls_library")
++ if tls.startswith("mbed TLS"):
++ raise HwsimSkip("mbed TLS crypto_ecdh_set_peerkey() properly detects invalid key; no response")
+ run_dpp_proto_pkex_resp_missing(dev, 48,
+ "Peer bootstrapping key is invalid")
+
+diff --git a/tests/hwsim/test_erp.py b/tests/hwsim/test_erp.py
+index d083993e8..262e9f095 100644
+--- a/tests/hwsim/test_erp.py
++++ b/tests/hwsim/test_erp.py
+@@ -12,7 +12,7 @@ import time
+
+ import hostapd
+ from utils import *
+-from test_ap_eap import int_eap_server_params, check_tls13_support
++from test_ap_eap import int_eap_server_params, check_tls13_support, check_eap_capa
+ from test_ap_psk import find_wpas_process, read_process_memory, verify_not_present, get_key_locations
+
+ def test_erp_initiate_reauth_start(dev, apdev):
+@@ -276,6 +276,7 @@ def test_erp_radius_eap_methods(dev, apdev):
+ params['erp_domain'] = 'example.com'
+ params['disable_pmksa_caching'] = '1'
+ hapd = hostapd.add_ap(apdev[0], params)
++ tls = dev[0].request("GET tls_library")
+
+ erp_test(dev[0], hapd, eap="AKA", identity="0232010000000000@example.com",
+ password="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123")
+@@ -289,7 +290,7 @@ def test_erp_radius_eap_methods(dev, apdev):
+ password="5122250214c33e723a5dd523fc145fc0:981d464c7c52eb6e5036234984ad0bcf:000000000123")
+ erp_test(dev[0], hapd, eap="EKE", identity="erp-eke@example.com",
+ password="hello")
+- if "FAST" in eap_methods:
++ if "FAST" in eap_methods and check_eap_capa(dev[0], "FAST"):
+ erp_test(dev[0], hapd, eap="FAST", identity="erp-fast@example.com",
+ password="password", ca_cert="auth_serv/ca.pem",
+ phase2="auth=GTC",
+@@ -301,13 +302,14 @@ def test_erp_radius_eap_methods(dev, apdev):
+ password="password")
+ erp_test(dev[0], hapd, eap="PAX", identity="erp-pax@example.com",
+ password_hex="0123456789abcdef0123456789abcdef")
+- if "MSCHAPV2" in eap_methods:
++ if "MSCHAPV2" in eap_methods and check_eap_capa(dev[0], "MSCHAPV2"):
+ erp_test(dev[0], hapd, eap="PEAP", identity="erp-peap@example.com",
+ password="password", ca_cert="auth_serv/ca.pem",
+ phase2="auth=MSCHAPV2")
+- erp_test(dev[0], hapd, eap="TEAP", identity="erp-teap@example.com",
+- password="password", ca_cert="auth_serv/ca.pem",
+- phase2="auth=MSCHAPV2", pac_file="blob://teap_pac")
++ if check_eap_capa(dev[0], "TEAP"):
++ erp_test(dev[0], hapd, eap="TEAP", identity="erp-teap@example.com",
++ password="password", ca_cert="auth_serv/ca.pem",
++ phase2="auth=MSCHAPV2", pac_file="blob://teap_pac")
+ erp_test(dev[0], hapd, eap="PSK", identity="erp-psk@example.com",
+ password_hex="0123456789abcdef0123456789abcdef")
+ if "PWD" in eap_methods:
+@@ -640,7 +642,7 @@ def test_erp_local_errors(dev, apdev):
+ dev[0].request("REMOVE_NETWORK all")
+ dev[0].wait_disconnected()
+
+- for count in range(1, 6):
++ for count in range(1, 4):
+ dev[0].request("ERP_FLUSH")
+ with fail_test(dev[0], count, "hmac_sha256_kdf;eap_peer_erp_init"):
+ dev[0].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="TTLS",
+diff --git a/tests/hwsim/test_fils.py b/tests/hwsim/test_fils.py
+index 5cdc28734..17110c5c2 100644
+--- a/tests/hwsim/test_fils.py
++++ b/tests/hwsim/test_fils.py
+@@ -1484,6 +1484,18 @@ def run_fils_sk_pfs(dev, apdev, group, params):
+ check_erp_capa(dev[0])
+ check_ec_group(dev[0], group)
+
++ tls = dev[0].request("GET tls_library")
++ if tls.startswith("mbed TLS"):
++ if int(group) == 27:
++ raise HwsimSkip("Brainpool EC group 27 not supported by mbed TLS")
++ elif not tls.startswith("wolfSSL"):
++ if int(group) in [25]:
++ if not (tls.startswith("OpenSSL") and ("build=OpenSSL 1.0.2" in tls or "build=OpenSSL 1.1" in tls or "build=OpenSSL 3.0" in tls) and ("run=OpenSSL 1.0.2" in tls or "run=OpenSSL 1.1" in tls or "run=OpenSSL 3.0" in tls)):
++ raise HwsimSkip("EC group not supported")
++ if int(group) in [27, 28, 29, 30]:
++ if not (tls.startswith("OpenSSL") and ("build=OpenSSL 1.0.2" in tls or "build=OpenSSL 1.1" in tls or "build=OpenSSL 3.0" in tls) and ("run=OpenSSL 1.0.2" in tls or "run=OpenSSL 1.1" in tls or "run=OpenSSL 3.0" in tls)):
++ raise HwsimSkip("Brainpool EC group not supported")
++
+ start_erp_as(msk_dump=os.path.join(params['logdir'], "msk.lst"))
+
+ bssid = apdev[0]['bssid']
+diff --git a/tests/hwsim/test_pmksa_cache.py b/tests/hwsim/test_pmksa_cache.py
+index 4a3b444ff..4f7f7f760 100644
+--- a/tests/hwsim/test_pmksa_cache.py
++++ b/tests/hwsim/test_pmksa_cache.py
+@@ -958,7 +958,7 @@ def test_pmksa_cache_preauth_wpas_oom(dev, apdev):
+ eap_connect(dev[0], hapd, "PAX", "pax.user@example.com",
+ password_hex="0123456789abcdef0123456789abcdef",
+ bssid=apdev[0]['bssid'])
+- for i in range(1, 11):
++ for i in range(1, 10):
+ with alloc_fail(dev[0], i, "rsn_preauth_init"):
+ res = dev[0].request("PREAUTH f2:11:22:33:44:55").strip()
+ logger.info("Iteration %d - PREAUTH command results: %s" % (i, res))
+@@ -966,7 +966,7 @@ def test_pmksa_cache_preauth_wpas_oom(dev, apdev):
+ state = dev[0].request('GET_ALLOC_FAIL')
+ if state.startswith('0:'):
+ break
+- time.sleep(0.05)
++ time.sleep(0.10)
+
+ def test_pmksa_cache_ctrl(dev, apdev):
+ """PMKSA cache control interface operations"""
+diff --git a/tests/hwsim/test_sae.py b/tests/hwsim/test_sae.py
+index b3837d6ac..8d6fe834d 100644
+--- a/tests/hwsim/test_sae.py
++++ b/tests/hwsim/test_sae.py
+@@ -178,6 +178,11 @@ def test_sae_groups(dev, apdev):
+ if tls.startswith("OpenSSL") and "run=OpenSSL 1." in tls:
+ logger.info("Add Brainpool EC groups since OpenSSL is new enough")
+ sae_groups += [27, 28, 29, 30]
++ if tls.startswith("mbed TLS"):
++ # secp224k1 and secp224r1 (26) have prime p = 1 mod 4, and mbedtls
++ # does not have code to derive y from compressed format for those curves
++ sae_groups = [19, 25, 20, 21, 1, 2, 5, 14, 15, 16, 22, 23, 24]
++ sae_groups += [27, 28, 29, 30]
+ heavy_groups = [14, 15, 16]
+ suitable_groups = [15, 16, 17, 18, 19, 20, 21]
+ groups = [str(g) for g in sae_groups]
+@@ -2194,6 +2199,8 @@ def run_sae_pwe_group(dev, apdev, group):
+ logger.info("Add Brainpool EC groups since OpenSSL is new enough")
+ elif tls.startswith("wolfSSL"):
+ logger.info("Make sure Brainpool EC groups were enabled when compiling wolfSSL")
++ elif tls.startswith("mbed TLS"):
++ logger.info("Make sure Brainpool EC groups were enabled when compiling mbed TLS")
+ else:
+ raise HwsimSkip("Brainpool curve not supported")
+ start_sae_pwe_ap(apdev[0], group, 2)
+diff --git a/tests/hwsim/test_suite_b.py b/tests/hwsim/test_suite_b.py
+index d03a39dee..d703dee95 100644
+--- a/tests/hwsim/test_suite_b.py
++++ b/tests/hwsim/test_suite_b.py
+@@ -27,6 +27,8 @@ def check_suite_b_tls_lib(dev, dhe=False, level128=False):
+ return
+ if tls.startswith("wolfSSL"):
+ return
++ if tls.startswith("mbed TLS"):
++ return
+ if not tls.startswith("OpenSSL"):
+ raise HwsimSkip("TLS library not supported for Suite B: " + tls)
+ supported = False
+@@ -520,6 +522,7 @@ def test_suite_b_192_rsa_insufficient_dh(dev, apdev):
+
+ dev[0].connect("test-suite-b", key_mgmt="WPA-EAP-SUITE-B-192",
+ ieee80211w="2",
++ openssl_ciphers="DHE-RSA-AES256-GCM-SHA384",
+ phase1="tls_suiteb=1",
+ eap="TLS", identity="tls user",
+ ca_cert="auth_serv/rsa3072-ca.pem",
+diff --git a/tests/hwsim/test_wpas_ctrl.py b/tests/hwsim/test_wpas_ctrl.py
+index e40aecda1..2b7d4ab35 100644
+--- a/tests/hwsim/test_wpas_ctrl.py
++++ b/tests/hwsim/test_wpas_ctrl.py
+@@ -1842,7 +1842,7 @@ def _test_wpas_ctrl_oom(dev):
+ tls = dev[0].request("GET tls_library")
+ if not tls.startswith("internal"):
+ tests.append(('NFC_GET_HANDOVER_SEL NDEF P2P-CR-TAG', 'FAIL',
+- 4, 'wpas_ctrl_nfc_get_handover_sel_p2p'))
++ 3, 'wpas_ctrl_nfc_get_handover_sel_p2p'))
+ for cmd, exp, count, func in tests:
+ with alloc_fail(dev[0], count, func):
+ res = dev[0].request(cmd)
+diff --git a/tests/hwsim/utils.py b/tests/hwsim/utils.py
+index 7e3608284..b23c1ee0b 100644
+--- a/tests/hwsim/utils.py
++++ b/tests/hwsim/utils.py
+@@ -145,7 +145,13 @@ def check_imsi_privacy_support(dev):
+
+ def check_tls_tod(dev):
+ tls = dev.request("GET tls_library")
+- if not tls.startswith("OpenSSL") and not tls.startswith("internal"):
++ if tls.startswith("OpenSSL"):
++ return
++ elif tls.startswith("internal"):
++ return
++ elif tls.startswith("mbed TLS"):
++ return
++ else:
+ raise HwsimSkip("TLS TOD-TOFU/STRICT not supported with this TLS library: " + tls)
+
+ def vht_supported():
+diff --git a/tests/test-crypto_module.c b/tests/test-crypto_module.c
+new file mode 100644
+index 000000000..0f1156142
+--- /dev/null
++++ b/tests/test-crypto_module.c
+@@ -0,0 +1,16 @@
++/*
++ * crypto module tests - test program
++ * Copyright (c) 2022, Glenn Strauss <gstrauss@gluelogic.com>
++ *
++ * This software may be distributed under the terms of the BSD license.
++ * See README for more details.
++ */
++
++#include "utils/includes.h"
++#include "utils/module_tests.h"
++#include "crypto/crypto_module_tests.c"
++
++int main(int argc, char *argv[])
++{
++ return crypto_module_tests();
++}
+diff --git a/tests/test-https.c b/tests/test-https.c
+index a72e56f9d..e9df82f1d 100644
+--- a/tests/test-https.c
++++ b/tests/test-https.c
+@@ -75,7 +75,7 @@ static int https_client(int s, const char *path)
+ struct tls_connection *conn;
+ struct wpabuf *in, *out, *appl;
+ int res = -1;
+- int need_more_data;
++ int need_more_data = 0;
+
+ os_memset(&conf, 0, sizeof(conf));
+ conf.event_cb = https_tls_event_cb;
+@@ -93,8 +93,12 @@ static int https_client(int s, const char *path)
+
+ for (;;) {
+ appl = NULL;
++#ifdef CONFIG_TLS_INTERNAL_SERVER
+ out = tls_connection_handshake2(tls, conn, in, &appl,
+ &need_more_data);
++#else
++ out = tls_connection_handshake(tls, conn, in, &appl);
++#endif
+ wpabuf_free(in);
+ in = NULL;
+ if (out == NULL) {
+@@ -152,11 +156,15 @@ static int https_client(int s, const char *path)
+
+ wpa_printf(MSG_INFO, "Reading HTTP response");
+ for (;;) {
+- int need_more_data;
++ int need_more_data = 0;
+ in = https_recv(s);
+ if (in == NULL)
+ goto done;
++#ifdef CONFIG_TLS_INTERNAL_SERVER
+ out = tls_connection_decrypt2(tls, conn, in, &need_more_data);
++#else
++ out = tls_connection_decrypt(tls, conn, in);
++#endif
+ if (need_more_data)
+ wpa_printf(MSG_DEBUG, "HTTP: Need more data");
+ wpabuf_free(in);
+diff --git a/tests/test-https_server.c b/tests/test-https_server.c
+index 33b448682..9dcca5596 100644
+--- a/tests/test-https_server.c
++++ b/tests/test-https_server.c
+@@ -67,10 +67,12 @@ static struct wpabuf * https_recv(int s, int timeout_ms)
+ }
+
+
++#ifdef CONFIG_TLS_INTERNAL_SERVER
+ static void https_tls_log_cb(void *ctx, const char *msg)
+ {
+ wpa_printf(MSG_DEBUG, "TLS: %s", msg);
+ }
++#endif
+
+
+ static int https_server(int s)
+@@ -79,7 +81,7 @@ static int https_server(int s)
+ void *tls;
+ struct tls_connection_params params;
+ struct tls_connection *conn;
+- struct wpabuf *in, *out, *appl;
++ struct wpabuf *in = NULL, *out = NULL, *appl = NULL;
+ int res = -1;
+
+ os_memset(&conf, 0, sizeof(conf));
+@@ -106,7 +108,9 @@ static int https_server(int s)
+ return -1;
+ }
+
++#ifdef CONFIG_TLS_INTERNAL_SERVER
+ tls_connection_set_log_cb(conn, https_tls_log_cb, NULL);
++#endif
+
+ for (;;) {
+ in = https_recv(s, 5000);
+@@ -147,12 +151,16 @@ static int https_server(int s)
+
+ wpa_printf(MSG_INFO, "Reading HTTP request");
+ for (;;) {
+- int need_more_data;
++ int need_more_data = 0;
+
+ in = https_recv(s, 5000);
+ if (!in)
+ goto done;
++#ifdef CONFIG_TLS_INTERNAL_SERVER
+ out = tls_connection_decrypt2(tls, conn, in, &need_more_data);
++#else
++ out = tls_connection_decrypt(tls, conn, in);
++#endif
+ wpabuf_free(in);
+ in = NULL;
+ if (need_more_data) {
+diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
+index dd13308f7..c65acab94 100644
+--- a/wpa_supplicant/Makefile
++++ b/wpa_supplicant/Makefile
+@@ -10,6 +10,7 @@ ALL += dbus/fi.w1.wpa_supplicant1.service
+ EXTRA_TARGETS=dynamic_eap_methods
+
+ CONFIG_FILE=.config
++-include $(if $(MULTICALL),../hostapd/.config)
+ include ../src/build.rules
+
+ ifdef CONFIG_BUILD_PASN_SO
+@@ -188,6 +189,25 @@ ifdef CONFIG_EAPOL_TEST
+ CFLAGS += -Werror -DEAPOL_TEST
+ endif
+
++ifdef CONFIG_UBUS
++CFLAGS += -DUBUS_SUPPORT
++OBJS += ubus.o
++LIBS += -lubus
++NEED_ULOOP:=y
++endif
++
++ifdef CONFIG_UCODE
++CFLAGS += -DUCODE_SUPPORT
++OBJS += ../src/utils/ucode.o
++OBJS += ucode.o
++NEED_ULOOP:=y
++endif
++
++ifdef NEED_ULOOP
++OBJS += ../src/utils/uloop.o
++LIBS += -lubox
++endif
++
+ ifdef CONFIG_CODE_COVERAGE
+ CFLAGS += -O0 -fprofile-arcs -ftest-coverage -U_FORTIFY_SOURCE
+ LIBS += -lgcov
+@@ -334,6 +354,7 @@ endif
+ ifdef CONFIG_FILS
+ CFLAGS += -DCONFIG_FILS
+ NEED_SHA384=y
++NEED_HMAC_SHA384_KDF=y
+ NEED_AES_SIV=y
+ ifdef CONFIG_FILS_SK_PFS
+ CFLAGS += -DCONFIG_FILS_SK_PFS
+@@ -388,7 +409,9 @@ endif
+ ifdef CONFIG_IBSS_RSN
+ NEED_RSN_AUTHENTICATOR=y
+ CFLAGS += -DCONFIG_IBSS_RSN
++ifndef MULTICALL
+ CFLAGS += -DCONFIG_NO_VLAN
++endif
+ OBJS += ibss_rsn.o
+ endif
+
+@@ -980,6 +1003,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
+ CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
+ LIBS += -ldl -rdynamic
+ endif
++else
++ ifdef MULTICALL
++ OBJS += ../src/eap_common/eap_common.o
++ endif
+ endif
+
+ ifdef CONFIG_AP
+@@ -987,9 +1014,11 @@ NEED_EAP_COMMON=y
+ NEED_RSN_AUTHENTICATOR=y
+ CFLAGS += -DCONFIG_AP
+ OBJS += ap.o
++ifndef MULTICALL
+ CFLAGS += -DCONFIG_NO_RADIUS
+ CFLAGS += -DCONFIG_NO_ACCOUNTING
+ CFLAGS += -DCONFIG_NO_VLAN
++endif
+ OBJS += ../src/ap/hostapd.o
+ OBJS += ../src/ap/wpa_auth_glue.o
+ OBJS += ../src/ap/utils.o
+@@ -1029,7 +1058,16 @@ ifdef CONFIG_FILS
+ OBJS += ../src/ap/fils_hlp.o
+ endif
+ ifdef CONFIG_CTRL_IFACE
++ifdef CONFIG_CTRL_IFACE_MIB
++CFLAGS += -DCONFIG_CTRL_IFACE_MIB
++endif
+ OBJS += ../src/ap/ctrl_iface_ap.o
++ifdef CONFIG_UBUS
++OBJS += ../src/ap/ubus.o
++endif
++ifdef CONFIG_UCODE
++OBJS += ../src/ap/ucode.o
++endif
+ endif
+
+ CFLAGS += -DEAP_SERVER -DEAP_SERVER_IDENTITY
+@@ -1080,6 +1118,12 @@ endif
+ ifdef CONFIG_HS20
+ OBJS += ../src/ap/hs20.o
+ endif
++else
++ ifdef MULTICALL
++ OBJS += ../src/eap_server/eap_server.o
++ OBJS += ../src/eap_server/eap_server_identity.o
++ OBJS += ../src/eap_server/eap_server_methods.o
++ endif
+ endif
+
+ ifdef CONFIG_MBO
+@@ -1089,7 +1133,9 @@ NEED_GAS=y
+ endif
+
+ ifdef NEED_RSN_AUTHENTICATOR
++ifndef MULTICALL
+ CFLAGS += -DCONFIG_NO_RADIUS
++endif
+ NEED_AES_WRAP=y
+ OBJS += ../src/ap/wpa_auth.o
+ OBJS += ../src/ap/wpa_auth_ie.o
+@@ -1188,6 +1234,7 @@ TLS_FUNCS=y
+ endif
+
+ ifeq ($(CONFIG_TLS), wolfssl)
++CFLAGS += -DCONFIG_TLS_WOLFSSL
+ ifdef TLS_FUNCS
+ CFLAGS += -DWOLFSSL_DER_LOAD
+ OBJS += ../src/crypto/tls_wolfssl.o
+@@ -1203,6 +1250,7 @@ LIBS_p += -lwolfssl -lm
+ endif
+
+ ifeq ($(CONFIG_TLS), openssl)
++CFLAGS += -DCONFIG_TLS_OPENSSL
+ CFLAGS += -DCRYPTO_RSA_OAEP_SHA256
+ ifdef TLS_FUNCS
+ CFLAGS += -DEAP_TLS_OPENSSL
+@@ -1229,7 +1277,28 @@ endif
+ CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONFIG_TLS_DEFAULT_CIPHERS)\"
+ endif
+
++ifeq ($(CONFIG_TLS), mbedtls)
++CFLAGS += -DCONFIG_TLS_MBEDTLS
++ifndef CONFIG_CRYPTO
++CONFIG_CRYPTO=mbedtls
++endif
++ifdef TLS_FUNCS
++OBJS += ../src/crypto/tls_mbedtls.o
++LIBS += -lmbedtls -lmbedx509
++endif
++OBJS += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
++OBJS_p += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
++OBJS_priv += ../src/crypto/crypto_$(CONFIG_CRYPTO).o
++ifeq ($(CONFIG_CRYPTO), mbedtls)
++LIBS += -lmbedcrypto
++LIBS_p += -lmbedcrypto
++# XXX: create a config option?
++CFLAGS += -DCRYPTO_RSA_OAEP_SHA256
++endif
++endif
++
+ ifeq ($(CONFIG_TLS), gnutls)
++CFLAGS += -DCONFIG_TLS_GNUTLS
+ ifndef CONFIG_CRYPTO
+ # default to libgcrypt
+ CONFIG_CRYPTO=gnutls
+@@ -1260,6 +1329,7 @@ endif
+ endif
+
+ ifeq ($(CONFIG_TLS), internal)
++CFLAGS += -DCONFIG_TLS_INTERNAL
+ ifndef CONFIG_CRYPTO
+ CONFIG_CRYPTO=internal
+ endif
+@@ -1340,6 +1410,7 @@ endif
+ endif
+
+ ifeq ($(CONFIG_TLS), linux)
++CFLAGS += -DCONFIG_TLS_INTERNAL
+ OBJS += ../src/crypto/crypto_linux.o
+ OBJS_p += ../src/crypto/crypto_linux.o
+ ifdef TLS_FUNCS
+@@ -1421,9 +1492,11 @@ endif
+
+ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ NEED_INTERNAL_AES_WRAP=y
+ endif
+ endif
++endif
+ ifdef CONFIG_OPENSSL_INTERNAL_AES_WRAP
+ # Seems to be needed at least with BoringSSL
+ NEED_INTERNAL_AES_WRAP=y
+@@ -1437,9 +1510,11 @@ endif
+
+ ifdef NEED_INTERNAL_AES_WRAP
+ ifneq ($(CONFIG_TLS), linux)
++ifneq ($(CONFIG_TLS), mbedtls)
+ AESOBJS += ../src/crypto/aes-unwrap.o
+ endif
+ endif
++endif
+ ifdef NEED_AES_EAX
+ AESOBJS += ../src/crypto/aes-eax.o
+ NEED_AES_CTR=y
+@@ -1449,35 +1524,45 @@ AESOBJS += ../src/crypto/aes-siv.o
+ NEED_AES_CTR=y
+ endif
+ ifdef NEED_AES_CTR
++ifneq ($(CONFIG_TLS), mbedtls)
+ AESOBJS += ../src/crypto/aes-ctr.o
+ endif
++endif
+ ifdef NEED_AES_ENCBLOCK
++ifneq ($(CONFIG_TLS), mbedtls)
+ AESOBJS += ../src/crypto/aes-encblock.o
+ endif
++endif
+ NEED_AES_ENC=y
+ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), linux)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ AESOBJS += ../src/crypto/aes-omac1.o
+ endif
+ endif
+ endif
++endif
+ ifdef NEED_AES_WRAP
+ NEED_AES_ENC=y
+ ifdef NEED_INTERNAL_AES_WRAP
++ifneq ($(CONFIG_TLS), mbedtls)
+ AESOBJS += ../src/crypto/aes-wrap.o
+ endif
+ endif
++endif
+ ifdef NEED_AES_CBC
+ NEED_AES_ENC=y
+ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), linux)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ AESOBJS += ../src/crypto/aes-cbc.o
+ endif
+ endif
+ endif
+ endif
++endif
+ ifdef NEED_AES_ENC
+ ifdef CONFIG_INTERNAL_AES
+ AESOBJS += ../src/crypto/aes-internal-enc.o
+@@ -1492,12 +1577,16 @@ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), linux)
+ ifneq ($(CONFIG_TLS), gnutls)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ SHA1OBJS += ../src/crypto/sha1.o
+ endif
+ endif
+ endif
+ endif
++endif
++ifneq ($(CONFIG_TLS), mbedtls)
+ SHA1OBJS += ../src/crypto/sha1-prf.o
++endif
+ ifdef CONFIG_INTERNAL_SHA1
+ SHA1OBJS += ../src/crypto/sha1-internal.o
+ ifdef NEED_FIPS186_2_PRF
+@@ -1509,29 +1598,37 @@ CFLAGS += -DCONFIG_NO_PBKDF2
+ else
+ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ SHA1OBJS += ../src/crypto/sha1-pbkdf2.o
+ endif
+ endif
+ endif
++endif
+ ifdef NEED_T_PRF
++ifneq ($(CONFIG_TLS), mbedtls)
+ SHA1OBJS += ../src/crypto/sha1-tprf.o
+ endif
++endif
+ ifdef NEED_TLS_PRF
++ifneq ($(CONFIG_TLS), mbedtls)
+ SHA1OBJS += ../src/crypto/sha1-tlsprf.o
+ endif
+ endif
++endif
+
+ ifndef CONFIG_FIPS
+ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), linux)
+ ifneq ($(CONFIG_TLS), gnutls)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ MD5OBJS += ../src/crypto/md5.o
+ endif
+ endif
+ endif
+ endif
+ endif
++endif
+ ifdef NEED_MD5
+ ifdef CONFIG_INTERNAL_MD5
+ MD5OBJS += ../src/crypto/md5-internal.o
+@@ -1586,12 +1683,17 @@ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), linux)
+ ifneq ($(CONFIG_TLS), gnutls)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ SHA256OBJS += ../src/crypto/sha256.o
+ endif
+ endif
+ endif
+ endif
++endif
++
++ifneq ($(CONFIG_TLS), mbedtls)
+ SHA256OBJS += ../src/crypto/sha256-prf.o
++endif
+ ifdef CONFIG_INTERNAL_SHA256
+ SHA256OBJS += ../src/crypto/sha256-internal.o
+ endif
+@@ -1604,50 +1706,68 @@ CFLAGS += -DCONFIG_INTERNAL_SHA512
+ SHA256OBJS += ../src/crypto/sha512-internal.o
+ endif
+ ifdef NEED_TLS_PRF_SHA256
++ifneq ($(CONFIG_TLS), mbedtls)
+ SHA256OBJS += ../src/crypto/sha256-tlsprf.o
+ endif
++endif
+ ifdef NEED_TLS_PRF_SHA384
++ifneq ($(CONFIG_TLS), mbedtls)
+ SHA256OBJS += ../src/crypto/sha384-tlsprf.o
+ endif
++endif
+ ifdef NEED_HMAC_SHA256_KDF
+ CFLAGS += -DCONFIG_HMAC_SHA256_KDF
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha256-kdf.o
+ endif
++endif
+ ifdef NEED_HMAC_SHA384_KDF
+ CFLAGS += -DCONFIG_HMAC_SHA384_KDF
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha384-kdf.o
+ endif
++endif
+ ifdef NEED_HMAC_SHA512_KDF
+ CFLAGS += -DCONFIG_HMAC_SHA512_KDF
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha512-kdf.o
+ endif
++endif
+ OBJS += $(SHA256OBJS)
+ ifdef NEED_SHA384
+ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), linux)
+ ifneq ($(CONFIG_TLS), gnutls)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha384.o
+ endif
+ endif
+ endif
+ endif
++endif
+ CFLAGS += -DCONFIG_SHA384
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha384-prf.o
+ endif
++endif
+ ifdef NEED_SHA512
+ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), linux)
+ ifneq ($(CONFIG_TLS), gnutls)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha512.o
+ endif
+ endif
+ endif
+ endif
++endif
+ CFLAGS += -DCONFIG_SHA512
++ifneq ($(CONFIG_TLS), mbedtls)
+ OBJS += ../src/crypto/sha512-prf.o
+ endif
++endif
+
+ ifdef NEED_ASN1
+ OBJS += ../src/tls/asn1.o
+@@ -1822,10 +1942,12 @@ ifdef CONFIG_FIPS
+ CFLAGS += -DCONFIG_FIPS
+ ifneq ($(CONFIG_TLS), openssl)
+ ifneq ($(CONFIG_TLS), wolfssl)
++ifneq ($(CONFIG_TLS), mbedtls)
+ $(error CONFIG_FIPS=y requires CONFIG_TLS=openssl)
+ endif
+ endif
+ endif
++endif
+
+ OBJS += $(SHA1OBJS) $(DESOBJS)
+
+@@ -2003,32 +2125,38 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
+
+ _OBJS_VAR := OBJS
+ include ../src/objs.mk
++wpa_supplicant_multi.a: .config $(BCHECK) $(OBJS) $(EXTRA_progs)
++ $(Q)$(CC) -c -o wpa_supplicant_multi.o -Dmain=wpa_supplicant_main $(CFLAGS) main.c
++ @$(E) " CC " $<
++ @rm -f $@
++ @$(AR) cr $@ wpa_supplicant_multi.o $(OBJS)
++
+ wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
+- $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
++ +$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
+ @$(E) " LD " $@
+
+ _OBJS_VAR := OBJS_t
+ include ../src/objs.mk
+ eapol_test: $(OBJS_t)
+- $(Q)$(LDO) $(LDFLAGS) -o eapol_test $(OBJS_t) $(LIBS)
++ +$(Q)$(LDO) $(LDFLAGS) -o eapol_test $(OBJS_t) $(LIBS)
+ @$(E) " LD " $@
+
+ _OBJS_VAR := OBJS_t2
+ include ../src/objs.mk
+ preauth_test: $(OBJS_t2)
+- $(Q)$(LDO) $(LDFLAGS) -o preauth_test $(OBJS_t2) $(LIBS)
++ +$(Q)$(LDO) $(LDFLAGS) -o preauth_test $(OBJS_t2) $(LIBS)
+ @$(E) " LD " $@
+
+ _OBJS_VAR := OBJS_p
+ include ../src/objs.mk
+ wpa_passphrase: $(OBJS_p)
+- $(Q)$(LDO) $(LDFLAGS) -o wpa_passphrase $(OBJS_p) $(LIBS_p) $(LIBS)
++ +$(Q)$(LDO) $(LDFLAGS) -o wpa_passphrase $(OBJS_p) $(LIBS_p) $(LIBS)
+ @$(E) " LD " $@
+
+ _OBJS_VAR := OBJS_c
+ include ../src/objs.mk
+ wpa_cli: $(OBJS_c)
+- $(Q)$(LDO) $(LDFLAGS) -o wpa_cli $(OBJS_c) $(LIBS_c)
++ +$(Q)$(LDO) $(LDFLAGS) -o wpa_cli $(OBJS_c) $(LIBS_c)
+ @$(E) " LD " $@
+
+ LIBCTRL += ../src/common/wpa_ctrl.o
+@@ -2135,6 +2263,12 @@ eap_gpsk.so: $(SRC_EAP_GPSK)
+ $(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
+ @$(E) " sed" $<
+
++dump_cflags:
++ @printf "%s " "$(CFLAGS)"
++
++dump_ldflags:
++ @printf "%s " "$(LDFLAGS) $(LIBS) $(EXTRALIBS)"
++
+ wpa_supplicant.exe: wpa_supplicant
+ mv -f $< $@
+ wpa_cli.exe: wpa_cli
+diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
+index 69a0e5ee1..43c39d7ce 100644
+--- a/wpa_supplicant/ap.c
++++ b/wpa_supplicant/ap.c
+@@ -1520,7 +1520,7 @@ int wpas_ap_wps_nfc_report_handover(struct wpa_supplicant *wpa_s,
+ #endif /* CONFIG_WPS */
+
+
+-#ifdef CONFIG_CTRL_IFACE
++#if defined(CONFIG_CTRL_IFACE) && defined(CONFIG_CTRL_IFACE_MIB)
+
+ int ap_ctrl_iface_sta_first(struct wpa_supplicant *wpa_s,
+ char *buf, size_t buflen)
+@@ -1846,11 +1846,31 @@ int ap_switch_channel(struct wpa_supplicant *wpa_s,
+
+
+ #ifdef CONFIG_CTRL_IFACE
++
++static int __ap_ctrl_iface_chanswitch(struct hostapd_iface *iface,
++ struct csa_settings *settings)
++{
++#ifdef NEED_AP_MLME
++ if (!iface || !iface->bss[0])
++ return 0;
++
++ return hostapd_switch_channel(iface->bss[0], settings);
++#else
++ return -1;
++#endif
++}
++
++
+ int ap_ctrl_iface_chanswitch(struct wpa_supplicant *wpa_s, const char *pos)
+ {
+ struct csa_settings settings;
+ int ret = hostapd_parse_csa_settings(pos, &settings);
+
++ if (!(wpa_s->ap_iface && wpa_s->ap_iface->bss[0]) &&
++ !(wpa_s->ifmsh && wpa_s->ifmsh->bss[0]))
++ return -1;
++
++ ret = __ap_ctrl_iface_chanswitch(wpa_s->ap_iface, &settings);
+ if (ret)
+ return ret;
+
+diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
+index 2c756136c..c3943355d 100644
+--- a/wpa_supplicant/config.c
++++ b/wpa_supplicant/config.c
+@@ -18,6 +18,7 @@
+ #include "eap_peer/eap.h"
+ #include "p2p/p2p.h"
+ #include "fst/fst.h"
++#include "ap/sta_info.h"
+ #include "config.h"
+
+
+@@ -2421,6 +2422,97 @@ static char * wpa_config_write_mac_value(const struct parse_data *data,
+ #endif /* NO_CONFIG_WRITE */
+
+
++static int wpa_config_parse_mcast_rate(const struct parse_data *data,
++ struct wpa_ssid *ssid, int line,
++ const char *value)
++{
++ ssid->mcast_rate = (int)(strtod(value, NULL) * 10);
++
++ return 0;
++}
++
++#ifndef NO_CONFIG_WRITE
++static char * wpa_config_write_mcast_rate(const struct parse_data *data,
++ struct wpa_ssid *ssid)
++{
++ char *value;
++ int res;
++
++ if (!ssid->mcast_rate == 0)
++ return NULL;
++
++ value = os_malloc(6); /* longest: 300.0 */
++ if (value == NULL)
++ return NULL;
++ res = os_snprintf(value, 5, "%.1f", (double)ssid->mcast_rate / 10);
++ if (res < 0) {
++ os_free(value);
++ return NULL;
++ }
++ return value;
++}
++#endif /* NO_CONFIG_WRITE */
++
++static int wpa_config_parse_rates(const struct parse_data *data,
++ struct wpa_ssid *ssid, int line,
++ const char *value)
++{
++ int i;
++ char *pos, *r, *sptr, *end;
++ double rate;
++
++ pos = (char *)value;
++ r = strtok_r(pos, ",", &sptr);
++ i = 0;
++ while (pos && i < WLAN_SUPP_RATES_MAX) {
++ rate = 0.0;
++ if (r)
++ rate = strtod(r, &end);
++ ssid->rates[i] = rate * 2;
++ if (*end != '\0' || rate * 2 != ssid->rates[i])
++ return 1;
++
++ i++;
++ r = strtok_r(NULL, ",", &sptr);
++ }
++
++ return 0;
++}
++
++#ifndef NO_CONFIG_WRITE
++static char * wpa_config_write_rates(const struct parse_data *data,
++ struct wpa_ssid *ssid)
++{
++ char *value, *pos;
++ int res, i;
++
++ if (ssid->rates[0] <= 0)
++ return NULL;
++
++ value = os_malloc(6 * WLAN_SUPP_RATES_MAX + 1);
++ if (value == NULL)
++ return NULL;
++ pos = value;
++ for (i = 0; i < WLAN_SUPP_RATES_MAX - 1; i++) {
++ res = os_snprintf(pos, 6, "%.1f,", (double)ssid->rates[i] / 2);
++ if (res < 0) {
++ os_free(value);
++ return NULL;
++ }
++ pos += res;
++ }
++ res = os_snprintf(pos, 6, "%.1f",
++ (double)ssid->rates[WLAN_SUPP_RATES_MAX - 1] / 2);
++ if (res < 0) {
++ os_free(value);
++ return NULL;
++ }
++
++ value[6 * WLAN_SUPP_RATES_MAX] = '\0';
++ return value;
++}
++#endif /* NO_CONFIG_WRITE */
++
+ /* Helper macros for network block parser */
+
+ #ifdef OFFSET
+@@ -2639,6 +2731,7 @@ static const struct parse_data ssid_fields[] = {
+ #else /* CONFIG_MESH */
+ { INT_RANGE(mode, 0, 4) },
+ #endif /* CONFIG_MESH */
++ { INT_RANGE(noscan, 0, 1) },
+ { INT_RANGE(proactive_key_caching, 0, 1) },
+ { INT_RANGE(disabled, 0, 2) },
+ { STR(id_str) },
+@@ -2712,6 +2805,8 @@ static const struct parse_data ssid_fields[] = {
+ { INT(ap_max_inactivity) },
+ { INT(dtim_period) },
+ { INT(beacon_int) },
++ { FUNC(rates) },
++ { FUNC(mcast_rate) },
+ #ifdef CONFIG_MACSEC
+ { INT_RANGE(macsec_policy, 0, 1) },
+ { INT_RANGE(macsec_integ_only, 0, 1) },
+diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c
+index 1a2c0c9be..7a3ed6373 100644
+--- a/wpa_supplicant/config_file.c
++++ b/wpa_supplicant/config_file.c
+@@ -326,8 +326,13 @@ struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp,
+ while (cred_tail && cred_tail->next)
+ cred_tail = cred_tail->next;
+
++ if (!strncmp(name, "data:", 5)) {
++ f = fmemopen((void *)(name + 5), strlen(name + 5), "r");
++ name = "<inline>";
++ } else {
++ f = fopen(name, "r");
++ }
+ wpa_printf(MSG_DEBUG, "Reading configuration file '%s'", name);
+- f = fopen(name, "r");
+ if (f == NULL) {
+ wpa_printf(MSG_ERROR, "Failed to open config file '%s', "
+ "error: %s", name, strerror(errno));
+@@ -775,6 +780,7 @@ static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid)
+ #endif /* IEEE8021X_EAPOL */
+ INT(mode);
+ INT(no_auto_peer);
++ INT(noscan);
+ INT(mesh_fwding);
+ INT(frequency);
+ INT(enable_edmg);
+diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h
+index e40650c27..de79972b6 100644
+--- a/wpa_supplicant/config_ssid.h
++++ b/wpa_supplicant/config_ssid.h
+@@ -10,8 +10,10 @@
+ #define CONFIG_SSID_H
+
+ #include "common/defs.h"
++#include "ap/sta_info.h"
+ #include "utils/list.h"
+ #include "eap_peer/eap_config.h"
++#include "drivers/nl80211_copy.h"
+
+
+ #define DEFAULT_EAP_WORKAROUND ((unsigned int) -1)
+@@ -879,6 +881,9 @@ struct wpa_ssid {
+ */
+ void *parent_cred;
+
++ unsigned char rates[WLAN_SUPP_RATES_MAX];
++ double mcast_rate;
++
+ #ifdef CONFIG_MACSEC
+ /**
+ * macsec_policy - Determines the policy for MACsec secure session
+@@ -1035,6 +1040,8 @@ struct wpa_ssid {
+ */
+ int no_auto_peer;
+
++ int noscan;
++
+ /**
+ * mesh_rssi_threshold - Set mesh parameter mesh_rssi_threshold (dBm)
+ *
+diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
+index d0fda4cd9..ec45f29bb 100644
+--- a/wpa_supplicant/ctrl_iface.c
++++ b/wpa_supplicant/ctrl_iface.c
+@@ -2355,7 +2355,7 @@ static int wpa_supplicant_ctrl_iface_status(struct wpa_supplicant *wpa_s,
+ pos += ret;
+ }
+
+-#ifdef CONFIG_AP
++#if defined(CONFIG_AP) && defined(CONFIG_CTRL_IFACE_MIB)
+ if (wpa_s->ap_iface) {
+ pos += ap_ctrl_iface_wpa_get_status(wpa_s, pos,
+ end - pos,
+@@ -12542,6 +12542,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
+ reply_len = -1;
+ } else if (os_strncmp(buf, "NOTE ", 5) == 0) {
+ wpa_printf(MSG_INFO, "NOTE: %s", buf + 5);
++#ifdef CONFIG_CTRL_IFACE_MIB
+ } else if (os_strcmp(buf, "MIB") == 0) {
+ reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size);
+ if (reply_len >= 0) {
+@@ -12554,6 +12555,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
+ reply_size - reply_len);
+ #endif /* CONFIG_MACSEC */
+ }
++#endif
+ } else if (os_strncmp(buf, "STATUS", 6) == 0) {
+ reply_len = wpa_supplicant_ctrl_iface_status(
+ wpa_s, buf + 6, reply, reply_size);
+@@ -13042,6 +13044,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
+ reply_len = wpa_supplicant_ctrl_iface_bss(
+ wpa_s, buf + 4, reply, reply_size);
+ #ifdef CONFIG_AP
++#ifdef CONFIG_CTRL_IFACE_MIB
+ } else if (os_strcmp(buf, "STA-FIRST") == 0) {
+ reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size);
+ } else if (os_strncmp(buf, "STA ", 4) == 0) {
+@@ -13050,12 +13053,15 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
+ } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
+ reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply,
+ reply_size);
++#endif
++#ifdef CONFIG_CTRL_IFACE_MIB
+ } else if (os_strncmp(buf, "DEAUTHENTICATE ", 15) == 0) {
+ if (ap_ctrl_iface_sta_deauthenticate(wpa_s, buf + 15))
+ reply_len = -1;
+ } else if (os_strncmp(buf, "DISASSOCIATE ", 13) == 0) {
+ if (ap_ctrl_iface_sta_disassociate(wpa_s, buf + 13))
+ reply_len = -1;
++#endif
+ } else if (os_strncmp(buf, "CHAN_SWITCH ", 12) == 0) {
+ if (ap_ctrl_iface_chanswitch(wpa_s, buf + 12))
+ reply_len = -1;
+@@ -13214,7 +13220,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
+ if (wpas_ctrl_iface_coloc_intf_report(wpa_s, buf + 18))
+ reply_len = -1;
+ #endif /* CONFIG_WNM */
+-#ifdef CONFIG_WNM_AP
++#if defined(CONFIG_AP) && defined(CONFIG_WNM_AP)
+ } else if (os_strncmp(buf, "DISASSOC_IMMINENT ", 18) == 0) {
+ if (ap_ctrl_iface_disassoc_imminent(wpa_s, buf + 18))
+ reply_len = -1;
+@@ -13224,7 +13230,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
+ } else if (os_strncmp(buf, "BSS_TM_REQ ", 11) == 0) {
+ if (ap_ctrl_iface_bss_tm_req(wpa_s, buf + 11))
+ reply_len = -1;
+-#endif /* CONFIG_WNM_AP */
++#endif /* CONFIG_AP && CONFIG_WNM_AP */
+ } else if (os_strcmp(buf, "FLUSH") == 0) {
+ wpa_supplicant_ctrl_iface_flush(wpa_s);
+ } else if (os_strncmp(buf, "RADIO_WORK ", 11) == 0) {
+diff --git a/wpa_supplicant/defconfig b/wpa_supplicant/defconfig
+index 52befd8f1..ace6c5530 100644
+--- a/wpa_supplicant/defconfig
++++ b/wpa_supplicant/defconfig
+@@ -10,8 +10,8 @@
+ # to override previous values of the variables.
+
+
+-# Uncomment following two lines and fix the paths if you have installed OpenSSL
+-# or GnuTLS in non-default location
++# Uncomment following two lines and fix the paths if you have installed TLS
++# libraries in a non-default location
+ #CFLAGS += -I/usr/local/openssl/include
+ #LIBS += -L/usr/local/openssl/lib
+
+@@ -20,6 +20,7 @@
+ # used to fix build issues on such systems (krb5.h not found).
+ #CFLAGS += -I/usr/include/kerberos
+
++
+ # Driver interface for generic Linux wireless extensions
+ # Note: WEXT is deprecated in the current Linux kernel version and no new
+ # functionality is added to it. nl80211-based interface is the new
+@@ -329,6 +330,7 @@ CONFIG_BACKEND=file
+ # openssl = OpenSSL (default)
+ # gnutls = GnuTLS
+ # internal = Internal TLSv1 implementation (experimental)
++# mbedtls = mbed TLS
+ # linux = Linux kernel AF_ALG and internal TLSv1 implementation (experimental)
+ # none = Empty template
+ #CONFIG_TLS=openssl
+diff --git a/wpa_supplicant/eapol_test.c b/wpa_supplicant/eapol_test.c
+index 95953de92..673c3cc11 100644
+--- a/wpa_supplicant/eapol_test.c
++++ b/wpa_supplicant/eapol_test.c
+@@ -31,7 +31,12 @@
+ #include "ctrl_iface.h"
+ #include "pcsc_funcs.h"
+ #include "wpas_glue.h"
++#include "drivers/driver.h"
+
++void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
++ union wpa_event_data *data);
++void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
++ union wpa_event_data *data);
+
+ const struct wpa_driver_ops *const wpa_drivers[] = { NULL };
+
+@@ -1325,6 +1330,10 @@ static void usage(void)
+ "option several times.\n");
+ }
+
++extern void supplicant_event(void *ctx, enum wpa_event_type event,
++ union wpa_event_data *data);
++extern void supplicant_event_global(void *ctx, enum wpa_event_type event,
++ union wpa_event_data *data);
+
+ int main(int argc, char *argv[])
+ {
+@@ -1348,6 +1357,8 @@ int main(int argc, char *argv[])
+ if (os_program_init())
+ return -1;
+
++ wpa_supplicant_event = supplicant_event;
++ wpa_supplicant_event_global = supplicant_event_global;
+ hostapd_logger_register_cb(hostapd_logger_cb);
+
+ os_memset(&eapol_test, 0, sizeof(eapol_test));
+diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
+index ca2794638..2a9342318 100644
+--- a/wpa_supplicant/events.c
++++ b/wpa_supplicant/events.c
+@@ -2935,8 +2935,6 @@ void wnm_bss_keep_alive_deinit(struct wpa_supplicant *wpa_s)
+ }
+
+
+-#ifdef CONFIG_INTERWORKING
+-
+ static int wpas_qos_map_set(struct wpa_supplicant *wpa_s, const u8 *qos_map,
+ size_t len)
+ {
+@@ -2969,8 +2967,6 @@ static void interworking_process_assoc_resp(struct wpa_supplicant *wpa_s,
+ }
+ }
+
+-#endif /* CONFIG_INTERWORKING */
+-
+
+ static void wpa_supplicant_set_4addr_mode(struct wpa_supplicant *wpa_s)
+ {
+@@ -3349,10 +3345,8 @@ static int wpa_supplicant_event_associnfo(struct wpa_supplicant *wpa_s,
+ wnm_process_assoc_resp(wpa_s, data->assoc_info.resp_ies,
+ data->assoc_info.resp_ies_len);
+ #endif /* CONFIG_WNM */
+-#ifdef CONFIG_INTERWORKING
+ interworking_process_assoc_resp(wpa_s, data->assoc_info.resp_ies,
+ data->assoc_info.resp_ies_len);
+-#endif /* CONFIG_INTERWORKING */
+ if (wpa_s->hw_capab == CAPAB_VHT &&
+ get_ie(data->assoc_info.resp_ies,
+ data->assoc_info.resp_ies_len, WLAN_EID_VHT_CAP))
+@@ -5928,8 +5922,8 @@ static void wpas_link_reconfig(struct wpa_supplicant *wpa_s)
+ }
+
+
+-void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
+- union wpa_event_data *data)
++void supplicant_event(void *ctx, enum wpa_event_type event,
++ union wpa_event_data *data)
+ {
+ struct wpa_supplicant *wpa_s = ctx;
+ int resched;
+@@ -5964,6 +5958,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
+ event_to_string(event), event);
+ #endif /* CONFIG_NO_STDOUT_DEBUG */
+
++ wpas_ucode_event(wpa_s, event, data);
+ switch (event) {
+ case EVENT_AUTH:
+ #ifdef CONFIG_FST
+@@ -6881,7 +6876,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
+ }
+
+
+-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
++void supplicant_event_global(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data)
+ {
+ struct wpa_supplicant *wpa_s;
+diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c
+index 9229eb51f..ee152c5b9 100644
+--- a/wpa_supplicant/main.c
++++ b/wpa_supplicant/main.c
+@@ -12,6 +12,7 @@
+ #endif /* __linux__ */
+
+ #include "common.h"
++#include "build_features.h"
+ #include "crypto/crypto.h"
+ #include "fst/fst.h"
+ #include "wpa_supplicant_i.h"
+@@ -202,7 +203,7 @@ int main(int argc, char *argv[])
+
+ for (;;) {
+ c = getopt(argc, argv,
+- "b:Bc:C:D:de:f:g:G:hi:I:KLMm:No:O:p:P:qsTtuvW");
++ "b:Bc:C:D:de:f:g:G:hi:I:KLMm:nNo:O:p:P:qsTtuv::W");
+ if (c < 0)
+ break;
+ switch (c) {
+@@ -267,6 +268,9 @@ int main(int argc, char *argv[])
+ params.conf_p2p_dev = optarg;
+ break;
+ #endif /* CONFIG_P2P */
++ case 'n':
++ iface_count = 0;
++ break;
+ case 'o':
+ params.override_driver = optarg;
+ break;
+@@ -302,8 +306,12 @@ int main(int argc, char *argv[])
+ break;
+ #endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
+ case 'v':
+- printf("%s\n", wpa_supplicant_version);
+- exitcode = 0;
++ if (optarg) {
++ exitcode = !has_feature(optarg);
++ } else {
++ printf("%s\n", wpa_supplicant_version);
++ exitcode = 0;
++ }
+ goto out;
+ case 'W':
+ params.wait_for_monitor++;
+diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c
+index 85c1ea8ba..dabbb0334 100644
+--- a/wpa_supplicant/mesh.c
++++ b/wpa_supplicant/mesh.c
+@@ -506,6 +506,8 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s,
+ frequency);
+ goto out_free;
+ }
++ if (conf->noscan)
++ ssid->noscan = 1;
+
+ if (ssid->mesh_basic_rates == NULL) {
+ /*
+@@ -630,6 +632,7 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s,
+
+ params->meshid = ssid->ssid;
+ params->meshid_len = ssid->ssid_len;
++ params->mcast_rate = ssid->mcast_rate;
+ ibss_mesh_setup_freq(wpa_s, ssid, ¶ms->freq);
+ wpa_s->mesh_ht_enabled = !!params->freq.ht_enabled;
+ wpa_s->mesh_vht_enabled = !!params->freq.vht_enabled;
+diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
+index b1334e2e6..93e310b73 100644
+--- a/wpa_supplicant/wpa_cli.c
++++ b/wpa_supplicant/wpa_cli.c
+@@ -26,6 +26,15 @@
+ #include <cutils/properties.h>
+ #endif /* ANDROID */
+
++#ifndef CONFIG_P2P
++#define CONFIG_P2P
++#endif
++#ifndef CONFIG_AP
++#define CONFIG_AP
++#endif
++#ifndef CONFIG_MESH
++#define CONFIG_MESH
++#endif
+
+ static const char *const wpa_cli_version =
+ "wpa_cli v" VERSION_STR "\n"
+diff --git a/wpa_supplicant/wpa_priv.c b/wpa_supplicant/wpa_priv.c
+index 88f3f2a52..92efe5629 100644
+--- a/wpa_supplicant/wpa_priv.c
++++ b/wpa_supplicant/wpa_priv.c
+@@ -1042,8 +1042,8 @@ static void wpa_priv_send_ft_response(struct wpa_priv_interface *iface,
+ }
+
+
+-void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
+- union wpa_event_data *data)
++static void supplicant_event(void *ctx, enum wpa_event_type event,
++ union wpa_event_data *data)
+ {
+ struct wpa_priv_interface *iface = ctx;
+
+@@ -1106,7 +1106,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
+ }
+
+
+-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
++void supplicant_event_global(void *ctx, enum wpa_event_type event,
+ union wpa_event_data *data)
+ {
+ struct wpa_priv_global *global = ctx;
+@@ -1220,6 +1220,8 @@ int main(int argc, char *argv[])
+ if (os_program_init())
+ return -1;
+
++ wpa_supplicant_event = supplicant_event;
++ wpa_supplicant_event_global = supplicant_event_global;
+ wpa_priv_fd_workaround();
+
+ os_memset(&global, 0, sizeof(global));
+diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
+index ab71e2f27..fea84fe49 100644
+--- a/wpa_supplicant/wpa_supplicant.c
++++ b/wpa_supplicant/wpa_supplicant.c
+@@ -1060,6 +1060,7 @@ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s,
+ sme_sched_obss_scan(wpa_s, 0);
+ }
+ wpa_s->wpa_state = state;
++ wpas_ucode_update_state(wpa_s);
+
+ #ifdef CONFIG_BGSCAN
+ if (state == WPA_COMPLETED && wpa_s->current_ssid != wpa_s->bgscan_ssid)
+@@ -2698,7 +2699,7 @@ static int drv_supports_vht(struct wpa_supplicant *wpa_s,
+ }
+
+
+-static bool ibss_mesh_is_80mhz_avail(int channel, struct hostapd_hw_modes *mode)
++static bool ibss_mesh_is_80mhz_avail(int channel, struct hostapd_hw_modes *mode, bool dfs_enabled)
+ {
+ int i;
+
+@@ -2707,7 +2708,10 @@ static bool ibss_mesh_is_80mhz_avail(int channel, struct hostapd_hw_modes *mode)
+
+ chan = hw_get_channel_chan(mode, i, NULL);
+ if (!chan ||
+- chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
++ chan->flag & HOSTAPD_CHAN_DISABLED)
++ return false;
++
++ if (!dfs_enabled && chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
+ return false;
+ }
+
+@@ -2767,7 +2771,7 @@ static bool ibss_mesh_can_use_vht(struct wpa_supplicant *wpa_s,
+ const struct wpa_ssid *ssid,
+ struct hostapd_hw_modes *mode)
+ {
+- if (mode->mode != HOSTAPD_MODE_IEEE80211A)
++ if (mode->mode != HOSTAPD_MODE_IEEE80211A && !(ssid->noscan))
+ return false;
+
+ if (!drv_supports_vht(wpa_s, ssid))
+@@ -2834,12 +2838,13 @@ static void ibss_mesh_select_40mhz(struct wpa_supplicant *wpa_s,
+ const struct wpa_ssid *ssid,
+ struct hostapd_hw_modes *mode,
+ struct hostapd_freq_params *freq,
+- int obss_scan) {
++ int obss_scan, bool dfs_enabled) {
+ int chan_idx;
+ struct hostapd_channel_data *pri_chan = NULL, *sec_chan = NULL;
+ int i, res;
+ unsigned int j;
+ static const int ht40plus[] = {
++ 1, 2, 3, 4, 5, 6, 7,
+ 36, 44, 52, 60, 100, 108, 116, 124, 132, 140,
+ 149, 157, 165, 173, 184, 192
+ };
+@@ -2858,8 +2863,11 @@ static void ibss_mesh_select_40mhz(struct wpa_supplicant *wpa_s,
+ return;
+
+ /* Check primary channel flags */
+- if (pri_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
++ if (pri_chan->flag & HOSTAPD_CHAN_DISABLED)
+ return;
++ if (pri_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
++ if (!dfs_enabled)
++ return;
+
+ #ifdef CONFIG_HT_OVERRIDES
+ if (ssid->disable_ht40)
+@@ -2885,8 +2893,11 @@ static void ibss_mesh_select_40mhz(struct wpa_supplicant *wpa_s,
+ return;
+
+ /* Check secondary channel flags */
+- if (sec_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
++ if (sec_chan->flag & HOSTAPD_CHAN_DISABLED)
+ return;
++ if (sec_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
++ if (!dfs_enabled)
++ return;
+
+ if (ht40 == -1) {
+ if (!(pri_chan->flag & HOSTAPD_CHAN_HT40MINUS))
+@@ -2941,7 +2952,7 @@ static bool ibss_mesh_select_80_160mhz(struct wpa_supplicant *wpa_s,
+ const struct wpa_ssid *ssid,
+ struct hostapd_hw_modes *mode,
+ struct hostapd_freq_params *freq,
+- int ieee80211_mode, bool is_6ghz) {
++ int ieee80211_mode, bool is_6ghz, bool dfs_enabled) {
+ static const int bw80[] = {
+ 5180, 5260, 5500, 5580, 5660, 5745, 5825,
+ 5955, 6035, 6115, 6195, 6275, 6355, 6435,
+@@ -2986,7 +2997,7 @@ static bool ibss_mesh_select_80_160mhz(struct wpa_supplicant *wpa_s,
+ goto skip_80mhz;
+
+ /* Use 40 MHz if channel not usable */
+- if (!ibss_mesh_is_80mhz_avail(channel, mode))
++ if (!ibss_mesh_is_80mhz_avail(channel, mode, dfs_enabled))
+ goto skip_80mhz;
+
+ chwidth = CONF_OPER_CHWIDTH_80MHZ;
+@@ -3000,7 +3011,7 @@ static bool ibss_mesh_select_80_160mhz(struct wpa_supplicant *wpa_s,
+ if ((mode->he_capab[ieee80211_mode].phy_cap[
+ HE_PHYCAP_CHANNEL_WIDTH_SET_IDX] &
+ HE_PHYCAP_CHANNEL_WIDTH_SET_160MHZ_IN_5G) && is_6ghz &&
+- ibss_mesh_is_80mhz_avail(channel + 16, mode)) {
++ ibss_mesh_is_80mhz_avail(channel + 16, mode, dfs_enabled)) {
+ for (j = 0; j < ARRAY_SIZE(bw160); j++) {
+ if (freq->freq == bw160[j]) {
+ chwidth = CONF_OPER_CHWIDTH_160MHZ;
+@@ -3028,10 +3039,12 @@ static bool ibss_mesh_select_80_160mhz(struct wpa_supplicant *wpa_s,
+ if (!chan)
+ continue;
+
+- if (chan->flag & (HOSTAPD_CHAN_DISABLED |
+- HOSTAPD_CHAN_NO_IR |
+- HOSTAPD_CHAN_RADAR))
++ if (chan->flag & HOSTAPD_CHAN_DISABLED)
+ continue;
++ if (chan->flag & (HOSTAPD_CHAN_RADAR |
++ HOSTAPD_CHAN_NO_IR))
++ if (!dfs_enabled)
++ continue;
+
+ /* Found a suitable second segment for 80+80 */
+ chwidth = CONF_OPER_CHWIDTH_80P80MHZ;
+@@ -3083,12 +3096,17 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
+ int ieee80211_mode = wpas_mode_to_ieee80211_mode(ssid->mode);
+ enum hostapd_hw_mode hw_mode;
+ struct hostapd_hw_modes *mode = NULL;
+- int i, obss_scan = 1;
++ int i, obss_scan = !(ssid->noscan);
+ u8 channel;
+ bool is_6ghz, is_24ghz;
++ bool dfs_enabled = wpa_s->conf->country[0] && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR);
+
+ freq->freq = ssid->frequency;
+
++ if (ssid->fixed_freq) {
++ obss_scan = 0;
++ }
++
+ if (ssid->mode == WPAS_MODE_IBSS && !ssid->fixed_freq) {
+ struct wpa_bss *bss = ibss_find_existing_bss(wpa_s, ssid);
+
+@@ -3132,11 +3150,13 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
+ freq->he_enabled = ibss_mesh_can_use_he(wpa_s, ssid, mode,
+ ieee80211_mode);
+ freq->channel = channel;
++ if (mode->mode == HOSTAPD_MODE_IEEE80211G && ssid->noscan)
++ ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan, dfs_enabled);
+ /* Setup higher BW only for 5 GHz */
+ if (mode->mode == HOSTAPD_MODE_IEEE80211A) {
+- ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan);
++ ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan, dfs_enabled);
+ if (!ibss_mesh_select_80_160mhz(wpa_s, ssid, mode, freq,
+- ieee80211_mode, is_6ghz))
++ ieee80211_mode, is_6ghz, dfs_enabled))
+ freq->he_enabled = freq->vht_enabled = false;
+ }
+
+@@ -4240,6 +4260,12 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
+ params.beacon_int = ssid->beacon_int;
+ else
+ params.beacon_int = wpa_s->conf->beacon_int;
++ int i = 0;
++ while (i < WLAN_SUPP_RATES_MAX) {
++ params.rates[i] = ssid->rates[i];
++ i++;
++ }
++ params.mcast_rate = ssid->mcast_rate;
+ }
+
+ if (bss && ssid->enable_edmg)
+@@ -5861,7 +5887,7 @@ wpa_supplicant_alloc(struct wpa_supplicant *parent)
+ if (wpa_s == NULL)
+ return NULL;
+ wpa_s->scan_req = INITIAL_SCAN_REQ;
+- wpa_s->scan_interval = 5;
++ wpa_s->scan_interval = 1;
+ wpa_s->new_connection = 1;
+ wpa_s->parent = parent ? parent : wpa_s;
+ wpa_s->p2pdev = wpa_s->parent;
+@@ -7576,7 +7602,6 @@ struct wpa_interface * wpa_supplicant_match_iface(struct wpa_global *global,
+ return NULL;
+ }
+
+-
+ /**
+ * wpa_supplicant_match_existing - Match existing interfaces
+ * @global: Pointer to global data from wpa_supplicant_init()
+@@ -7611,6 +7636,11 @@ static int wpa_supplicant_match_existing(struct wpa_global *global)
+
+ #endif /* CONFIG_MATCH_IFACE */
+
++extern void supplicant_event(void *ctx, enum wpa_event_type event,
++ union wpa_event_data *data);
++
++extern void supplicant_event_global(void *ctx, enum wpa_event_type event,
++ union wpa_event_data *data);
+
+ /**
+ * wpa_supplicant_add_iface - Add a new network interface
+@@ -7693,6 +7723,9 @@ struct wpa_supplicant * wpa_supplicant_add_iface(struct wpa_global *global,
+ }
+ #endif /* CONFIG_P2P */
+
++ wpas_ubus_add_bss(wpa_s);
++ wpas_ucode_add_bss(wpa_s);
++
+ return wpa_s;
+ }
+
+@@ -7719,6 +7752,9 @@ int wpa_supplicant_remove_iface(struct wpa_global *global,
+ struct wpa_supplicant *parent = wpa_s->parent;
+ #endif /* CONFIG_MESH */
+
++ wpas_ucode_free_bss(wpa_s);
++ wpas_ubus_free_bss(wpa_s);
++
+ /* Remove interface from the global list of interfaces */
+ prev = global->ifaces;
+ if (prev == wpa_s) {
+@@ -7867,6 +7903,8 @@ struct wpa_global * wpa_supplicant_init(struct wpa_params *params)
+ #ifndef CONFIG_NO_WPA_MSG
+ wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
+ #endif /* CONFIG_NO_WPA_MSG */
++ wpa_supplicant_event = supplicant_event;
++ wpa_supplicant_event_global = supplicant_event_global;
+
+ if (params->wpa_debug_file_path)
+ wpa_debug_open_file(params->wpa_debug_file_path);
+@@ -8025,6 +8063,7 @@ struct wpa_global * wpa_supplicant_init(struct wpa_params *params)
+
+ eloop_register_timeout(WPA_SUPPLICANT_CLEANUP_INTERVAL, 0,
+ wpas_periodic, global, NULL);
++ wpas_ucode_init(global);
+
+ return global;
+ }
+@@ -8097,6 +8136,8 @@ void wpa_supplicant_deinit(struct wpa_global *global)
+
+ wpas_notify_supplicant_deinitialized(global);
+
++ wpas_ucode_free();
++
+ eap_peer_unregister_methods();
+ #ifdef CONFIG_AP
+ eap_server_unregister_methods();
+diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
+index 426d077d2..e0c0e5b0c 100644
+--- a/wpa_supplicant/wpa_supplicant_i.h
++++ b/wpa_supplicant/wpa_supplicant_i.h
+@@ -21,6 +21,8 @@
+ #include "config_ssid.h"
+ #include "wmm_ac.h"
+ #include "pasn/pasn_common.h"
++#include "ubus.h"
++#include "ucode.h"
+
+ extern const char *const wpa_supplicant_version;
+ extern const char *const wpa_supplicant_license;
+@@ -319,6 +321,8 @@ struct wpa_global {
+ #endif /* CONFIG_WIFI_DISPLAY */
+
+ struct psk_list_entry *add_psk; /* From group formation */
++
++ struct ubus_object ubus_global;
+ };
+
+
+@@ -693,6 +697,8 @@ struct wpa_supplicant {
+ unsigned char own_addr[ETH_ALEN];
+ unsigned char perm_addr[ETH_ALEN];
+ char ifname[100];
++ struct wpas_ubus_bss ubus;
++ struct wpas_ucode_bss ucode;
+ #ifdef CONFIG_MATCH_IFACE
+ int matched;
+ #endif /* CONFIG_MATCH_IFACE */
+diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
+index 8cd355f6b..136b06583 100644
+--- a/wpa_supplicant/wps_supplicant.c
++++ b/wpa_supplicant/wps_supplicant.c
+@@ -33,6 +33,7 @@
+ #include "p2p/p2p.h"
+ #include "p2p_supplicant.h"
+ #include "wps_supplicant.h"
++#include "ubus.h"
+
+
+ #ifndef WPS_PIN_SCAN_IGNORE_SEL_REG
+@@ -401,6 +402,8 @@ static int wpa_supplicant_wps_cred(void *ctx,
+ wpa_hexdump_key(MSG_DEBUG, "WPS: Received Credential attribute",
+ cred->cred_attr, cred->cred_attr_len);
+
++ wpas_ubus_notify(wpa_s, cred);
++
+ if (wpa_s->conf->wps_cred_processing == 1)
+ return 0;
+
+diff --git a/wpa_supplicant/wps_supplicant.h b/wpa_supplicant/wps_supplicant.h
+index aae3f7cb5..30b4e9105 100644
+--- a/wpa_supplicant/wps_supplicant.h
++++ b/wpa_supplicant/wps_supplicant.h
+@@ -9,6 +9,7 @@
+ #ifndef WPS_SUPPLICANT_H
+ #define WPS_SUPPLICANT_H
+
++struct wpa_bss;
+ struct wpa_scan_results;
+
+ #ifdef CONFIG_WPS
+@@ -16,8 +17,6 @@ struct wpa_scan_results;
+ #include "wps/wps.h"
+ #include "wps/wps_defs.h"
+
+-struct wpa_bss;
+-
+ struct wps_new_ap_settings {
+ const char *ssid_hex;
+ const char *auth;
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0008-mtk-hostapd-Add-neighbor-report-and-BSS-Termination-.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0008-mtk-hostapd-Add-neighbor-report-and-BSS-Termination-.patch
new file mode 100644
index 0000000..4ed3619
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0008-mtk-hostapd-Add-neighbor-report-and-BSS-Termination-.patch
@@ -0,0 +1,441 @@
+From 26e418d9b4cee2fd9d65d3a032e90750abd1ea58 Mon Sep 17 00:00:00 2001
+From: "howard.hsu" <howard-yh.hsu@mediatek.com>
+Date: Wed, 19 Jan 2022 19:18:07 +0800
+Subject: [PATCH 08/69] mtk: hostapd: Add neighbor report and BSS Termination
+ for MBO certification
+
+1. Add hostapd_neighbor_count() and hostapd_neighbor_insert_buffer ()
+The first function can count the number of neighbor report in neighbore report
+database. The second can iterate neighbor report database to build up neighbor
+report data.
+
+2. Support including neighbor report elements in ANQP response
+3. Support including neignbor report elements in BTM response
+4. Support configuring BSS Termination TSF by using hostapd_cli command
+5. Disable interface if BSS Termination TSF is set
+6. Support including neighbor report elements in BTM request
+7. Add hostapd_neighbor_set_own_report_pref()
+8. Add hostapd_neighbor_set_pref_by_non_pref_chan()
+
+Revert set_send_disassoc_frame_timer
+---
+ hostapd/ctrl_iface.c | 5 ++
+ src/ap/ap_config.c | 1 +
+ src/ap/ap_config.h | 1 +
+ src/ap/ctrl_iface_ap.c | 18 ++++++-
+ src/ap/gas_serv.c | 29 ++++++++++
+ src/ap/gas_serv.h | 2 +
+ src/ap/neighbor_db.c | 118 +++++++++++++++++++++++++++++++++++++++++
+ src/ap/neighbor_db.h | 9 ++++
+ src/ap/wnm_ap.c | 43 +++++++++++++--
+ 9 files changed, 221 insertions(+), 5 deletions(-)
+
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index c6ce89fb6..478653ebf 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -1300,6 +1300,11 @@ static int hostapd_ctrl_iface_set(struct hostapd_data *hapd, char *cmd)
+ #endif /* CONFIG_DPP */
+ } else if (os_strcasecmp(cmd, "setband") == 0) {
+ ret = hostapd_ctrl_iface_set_band(hapd, value);
++ } else if (os_strcasecmp(cmd, "bss_termination_tsf") == 0) {
++ int termination_sec = atoi(value);
++ hapd->conf->bss_termination_tsf = termination_sec;
++ wpa_printf(MSG_DEBUG, "BSS Termination TSF: value = %d",
++ termination_sec);
+ } else {
+ ret = hostapd_set_iface(hapd->iconf, hapd->conf, cmd, value);
+ if (ret)
+diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
+index ca67aeb41..6c8b10291 100644
+--- a/src/ap/ap_config.c
++++ b/src/ap/ap_config.c
+@@ -175,6 +175,7 @@ void hostapd_config_defaults_bss(struct hostapd_bss_config *bss)
+ bss->pasn_comeback_after = 10;
+ bss->pasn_noauth = 1;
+ #endif /* CONFIG_PASN */
++ bss->bss_termination_tsf = 0;
+ }
+
+
+diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
+index d10b00be9..379dc22cf 100644
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -560,6 +560,7 @@ struct hostapd_bss_config {
+ int wnm_sleep_mode;
+ int wnm_sleep_mode_no_keys;
+ int bss_transition;
++ unsigned int bss_termination_tsf;
+
+ /* IEEE 802.11u - Interworking */
+ int interworking;
+diff --git a/src/ap/ctrl_iface_ap.c b/src/ap/ctrl_iface_ap.c
+index 87e398a5d..fbceb859d 100644
+--- a/src/ap/ctrl_iface_ap.c
++++ b/src/ap/ctrl_iface_ap.c
+@@ -1341,6 +1341,10 @@ int hostapd_ctrl_iface_bss_tm_req(struct hostapd_data *hapd,
+ wpa_printf(MSG_DEBUG, "Invalid bss_term data");
+ return -1;
+ }
++ if (hapd->conf->bss_termination_tsf) {
++ WPA_PUT_LE64(&bss_term_dur[2], hapd->conf->bss_termination_tsf);
++ }
++
+ end++;
+ WPA_PUT_LE16(&bss_term_dur[10], atoi(end));
+ }
+@@ -1367,16 +1371,26 @@ int hostapd_ctrl_iface_bss_tm_req(struct hostapd_data *hapd,
+ req_mode |= WNM_BSS_TM_REQ_ESS_DISASSOC_IMMINENT;
+ }
+
+- if (os_strstr(cmd, " pref=1"))
++ if (os_strstr(cmd, " pref=1")) {
+ req_mode |= WNM_BSS_TM_REQ_PREF_CAND_LIST_INCLUDED;
++ if (nei_len == 0) {
++ // Add neigibor report from neighbor report db to nei_rep buffer
++ nei_len = hostapd_neighbor_insert_buffer (hapd, nei_rep, 1000);
++ }
++ }
+ if (os_strstr(cmd, " abridged=1"))
+ req_mode |= WNM_BSS_TM_REQ_ABRIDGED;
+- if (os_strstr(cmd, " disassoc_imminent=1"))
++ if (os_strstr(cmd, " disassoc_imminent=1")) {
+ req_mode |= WNM_BSS_TM_REQ_DISASSOC_IMMINENT;
++ /* Set own BSS neighbor report preference value as 0 */
++ hostapd_neighbor_set_own_report_pref(hapd, nei_rep, nei_len, 0);
++ }
+ if (os_strstr(cmd, " link_removal_imminent=1"))
+ req_mode |= WNM_BSS_TM_REQ_LINK_REMOVAL_IMMINENT;
+
+ #ifdef CONFIG_MBO
++ hostapd_neighbor_set_pref_by_non_pref_chan(hapd, sta, nei_rep, nei_len);
++
+ pos = os_strstr(cmd, "mbo=");
+ if (pos) {
+ unsigned int mbo_reason, cell_pref, reassoc_delay;
+diff --git a/src/ap/gas_serv.c b/src/ap/gas_serv.c
+index 4642e4927..cce6df41c 100644
+--- a/src/ap/gas_serv.c
++++ b/src/ap/gas_serv.c
+@@ -19,6 +19,7 @@
+ #include "dpp_hostapd.h"
+ #include "sta_info.h"
+ #include "gas_serv.h"
++#include "neighbor_db.h"
+
+
+ #ifdef CONFIG_DPP
+@@ -369,6 +370,24 @@ static void anqp_add_network_auth_type(struct hostapd_data *hapd,
+ }
+ }
+
++static void anqp_add_neighbor_report(struct hostapd_data *hapd,
++ struct wpabuf *buf)
++{
++ struct hostapd_neighbor_entry *nr;
++ u8 *len_pos = gas_anqp_add_element(buf, ANQP_NEIGHBOR_REPORT);
++ if (dl_list_empty(&hapd->nr_db)) {
++ wpabuf_put_le16(buf, 0);
++ }
++ else {
++ dl_list_for_each(nr, &hapd->nr_db, struct hostapd_neighbor_entry, list ) {
++ wpabuf_put_u8(buf, WLAN_EID_NEIGHBOR_REPORT);
++ wpabuf_put_u8(buf, wpabuf_len(nr->nr));
++ wpabuf_put_buf(buf, nr->nr);
++ }
++ }
++ gas_anqp_set_element_len(buf, len_pos);
++}
++
+
+ static void anqp_add_roaming_consortium(struct hostapd_data *hapd,
+ struct wpabuf *buf)
+@@ -986,6 +1005,9 @@ gas_serv_build_gas_resp_payload(struct hostapd_data *hapd,
+ len += 1000;
+ if (request & ANQP_REQ_ICON_REQUEST)
+ len += 65536;
++ if (request & ANQP_REQ_NEIGHBOR_REPORT) {
++ len += (40 * hostapd_neighbor_count(hapd));
++ }
+ #ifdef CONFIG_FILS
+ if (request & ANQP_FILS_REALM_INFO)
+ len += 2 * dl_list_len(&hapd->conf->fils_realms);
+@@ -1028,6 +1050,8 @@ gas_serv_build_gas_resp_payload(struct hostapd_data *hapd,
+ anqp_add_elem(hapd, buf, ANQP_TDLS_CAPABILITY);
+ if (request & ANQP_REQ_EMERGENCY_NAI)
+ anqp_add_elem(hapd, buf, ANQP_EMERGENCY_NAI);
++ if (request & ANQP_REQ_NEIGHBOR_REPORT)
++ anqp_add_neighbor_report(hapd, buf);
+
+ for (i = 0; i < num_extra_req; i++) {
+ #ifdef CONFIG_FILS
+@@ -1172,6 +1196,11 @@ static void rx_anqp_query_list_id(struct hostapd_data *hapd, u16 info_id,
+ "Emergency NAI",
+ get_anqp_elem(hapd, info_id) != NULL, qi);
+ break;
++ case ANQP_NEIGHBOR_REPORT:
++ set_anqp_req(ANQP_REQ_NEIGHBOR_REPORT,
++ "Neighbor Report",
++ get_anqp_elem(hapd, info_id) != NULL, qi);
++ break;
+ default:
+ #ifdef CONFIG_FILS
+ if (info_id == ANQP_FILS_REALM_INFO &&
+diff --git a/src/ap/gas_serv.h b/src/ap/gas_serv.h
+index 7646a98a4..ce492b53f 100644
+--- a/src/ap/gas_serv.h
++++ b/src/ap/gas_serv.h
+@@ -40,6 +40,8 @@
+ (1 << (ANQP_TDLS_CAPABILITY - ANQP_QUERY_LIST))
+ #define ANQP_REQ_EMERGENCY_NAI \
+ (1 << (ANQP_EMERGENCY_NAI - ANQP_QUERY_LIST))
++#define ANQP_REQ_NEIGHBOR_REPORT \
++ (1 << (ANQP_NEIGHBOR_REPORT - ANQP_QUERY_LIST))
+ /*
+ * First 15 Hotspot 2.0 vendor specific ANQP-elements can be included in the
+ * optimized bitmap.
+diff --git a/src/ap/neighbor_db.c b/src/ap/neighbor_db.c
+index f7a7d83d4..d9216a5ae 100644
+--- a/src/ap/neighbor_db.c
++++ b/src/ap/neighbor_db.c
+@@ -89,6 +89,38 @@ int hostapd_neighbor_show(struct hostapd_data *hapd, char *buf, size_t buflen)
+ }
+
+
++int hostapd_neighbor_count(struct hostapd_data *hapd)
++{
++ struct hostapd_neighbor_entry *nr;
++ int count = 0;
++
++ dl_list_for_each(nr, &hapd->nr_db, struct hostapd_neighbor_entry,
++ list) {
++ count++;
++ }
++ return count;
++}
++
++
++int hostapd_neighbor_insert_buffer(struct hostapd_data *hapd, char *buf,
++ size_t buflen)
++{
++ struct hostapd_neighbor_entry *nr;
++ char *pos = buf;
++
++ dl_list_for_each(nr, &hapd->nr_db, struct hostapd_neighbor_entry,
++ list) {
++ /* For neighbor report IE, we only need bssid and nr*/
++ *pos++ = WLAN_EID_NEIGHBOR_REPORT;
++ *pos++ = wpabuf_len(nr->nr);
++ os_memcpy(pos, wpabuf_head(nr->nr), wpabuf_len(nr->nr));
++ pos += wpabuf_len(nr->nr);
++ }
++
++ return pos - buf;
++}
++
++
+ static void hostapd_neighbor_clear_entry(struct hostapd_neighbor_entry *nr)
+ {
+ wpabuf_free(nr->nr);
+@@ -364,3 +396,89 @@ int hostapd_neighbor_sync_own_report(struct hostapd_data *hapd)
+
+ return 0;
+ }
++
++void hostapd_neighbor_set_own_report_pref(struct hostapd_data *hapd, char *nei_buf,
++ size_t buflen, const int pref)
++{
++ struct hostapd_neighbor_entry *nr;
++ char *pos, *next_nr;
++
++ pos = nei_buf;
++ next_nr = nei_buf;
++
++ dl_list_for_each(nr, &hapd->nr_db, struct hostapd_neighbor_entry,
++ list) {
++ pos = next_nr;
++ next_nr = pos + 2 + wpabuf_len(nr->nr);
++ /* Shift 2 bytes for Element ID and Neighbor report length */
++ pos = pos + 2;
++ if(os_memcmp(pos, hapd->own_addr, ETH_ALEN) == 0) {
++ /* Shift for BSSID + BSSID info + Op_class + channel num + PHY type */
++ pos = pos + 6 + 4 + 1 + 1 + 1;
++
++ /* Iterate Subelement */
++ while (next_nr - pos > 0) {
++ if (*pos == 3) {
++ pos = pos + 2;
++ *pos = pref;
++ return;
++ } else {
++ pos++;
++ int shift_len = *pos++;
++ pos = pos + shift_len;
++ }
++ }
++ }
++ }
++}
++
++#ifdef CONFIG_MBO
++void hostapd_neighbor_set_pref_by_non_pref_chan(struct hostapd_data *hapd,
++ struct sta_info* sta, char *nei_buf, size_t buflen)
++{
++ struct hostapd_neighbor_entry *nr;
++ struct mbo_non_pref_chan_info *info;
++ u8 i;
++
++ for(info = sta->non_pref_chan; info; info = info->next) {
++ /* Check OP_Class and Channel num */
++ for(i = 0; i < info->num_channels; i++) {
++ char *pos, *next_nr;
++
++ pos = nei_buf;
++ next_nr = nei_buf;
++
++ /* Iterate Neighbor report database */
++ dl_list_for_each(nr, &hapd->nr_db, struct hostapd_neighbor_entry,
++ list) {
++ pos = next_nr;
++ next_nr = pos + 2 + wpabuf_len(nr->nr);
++ /**
++ * Shift 12 bytes for Element ID, Neighbor report length,
++ * BSSID and BSSID info.
++ */
++ pos = pos + 12;
++ int nr_op_class = *pos++;
++ int nr_channel = *pos;
++ if(info->op_class == nr_op_class && info->channels[i] == nr_channel) {
++ /* Shift for Channel Num + PHY type */
++ pos = pos + 1 + 1;
++
++ // Iterate Subelement
++ while(next_nr - pos > 0) {
++ if(*pos == 3) {
++ pos = pos + 2;
++ *pos = info->pref;
++ break;
++ }else {
++ pos++;
++ int shift_len = *pos++;
++ pos = pos + shift_len;
++ }
++ }
++ }
++ }
++ }
++ }
++}
++#endif
+diff --git a/src/ap/neighbor_db.h b/src/ap/neighbor_db.h
+index 53f714203..cf1400256 100644
+--- a/src/ap/neighbor_db.h
++++ b/src/ap/neighbor_db.h
+@@ -25,4 +25,13 @@ int hostapd_neighbor_remove(struct hostapd_data *hapd, const u8 *bssid,
+ const struct wpa_ssid_value *ssid);
+ void hostapd_free_neighbor_db(struct hostapd_data *hapd);
+
++int hostapd_neighbor_count(struct hostapd_data *hapd);
++int hostapd_neighbor_insert_buffer(struct hostapd_data *hapd, char *buf,
++ size_t buflen);
++void hostapd_neighbor_set_own_report_pref(struct hostapd_data *hapd, char *nei_buf,
++ size_t buflen, const int pref);
++#ifdef CONFIG_MBO
++void hostapd_neighbor_set_pref_by_non_pref_chan(struct hostapd_data *hapd,
++ struct sta_info* sta, char *nei_buf, size_t buflen);
++#endif
+ #endif /* NEIGHBOR_DB_H */
+diff --git a/src/ap/wnm_ap.c b/src/ap/wnm_ap.c
+index d68af2f49..0c2cdbb3f 100644
+--- a/src/ap/wnm_ap.c
++++ b/src/ap/wnm_ap.c
+@@ -20,6 +20,7 @@
+ #include "ap/wpa_auth.h"
+ #include "mbo_ap.h"
+ #include "wnm_ap.h"
++#include "ap/neighbor_db.h"
+
+ #define MAX_TFS_IE_LEN 1024
+
+@@ -390,13 +391,24 @@ static int ieee802_11_send_bss_trans_mgmt_request(struct hostapd_data *hapd,
+ u8 *pos;
+ int res;
+
+- mgmt = os_zalloc(sizeof(*mgmt));
+- if (mgmt == NULL)
++ int nr_num = hostapd_neighbor_count(hapd);
++ int nr_size = ETH_ALEN + 4 + 1 + 1 + 1 + 5;
++ int total_nr_size = nr_num * nr_size;
++ u8 *nr_data = os_malloc(total_nr_size);
++ int nr_data_len = 0;
++ if(nr_data == NULL) {
++ wpa_printf (MSG_ERROR, "Failed to allocate memory");
++ } else {
++ nr_data_len = hostapd_neighbor_insert_buffer(hapd, nr_data, total_nr_size);
++ }
++ mgmt = os_zalloc(sizeof(*mgmt) + nr_data_len);
++ if (mgmt == NULL) {
++ wpa_printf (MSG_ERROR, "Failed to allocate memory for mgmt frame");
+ return -1;
++ }
+
+ sta = ap_get_sta(hapd, addr);
+ own_addr = wnm_ap_get_own_addr(hapd, sta);
+-
+ os_memcpy(mgmt->da, addr, ETH_ALEN);
+ os_memcpy(mgmt->sa, own_addr, ETH_ALEN);
+ os_memcpy(mgmt->bssid, own_addr, ETH_ALEN);
+@@ -406,10 +418,18 @@ static int ieee802_11_send_bss_trans_mgmt_request(struct hostapd_data *hapd,
+ mgmt->u.action.u.bss_tm_req.action = WNM_BSS_TRANS_MGMT_REQ;
+ mgmt->u.action.u.bss_tm_req.dialog_token = dialog_token;
+ mgmt->u.action.u.bss_tm_req.req_mode = 0;
++ if(nr_num) {
++ mgmt->u.action.u.bss_tm_req.req_mode |= WNM_BSS_TM_REQ_PREF_CAND_LIST_INCLUDED;
++ }
+ mgmt->u.action.u.bss_tm_req.disassoc_timer = host_to_le16(0);
+ mgmt->u.action.u.bss_tm_req.validity_interval = 1;
+ pos = mgmt->u.action.u.bss_tm_req.variable;
+
++ if(nr_num) {
++ os_memcpy(pos, nr_data, nr_data_len);
++ pos += nr_data_len;
++ }
++
+ hapd->openwrt_stats.wnm.bss_transition_request_tx++;
+ wpa_printf(MSG_DEBUG, "WNM: Send BSS Transition Management Request to "
+ MACSTR " dialog_token=%u req_mode=0x%x disassoc_timer=%u "
+@@ -915,6 +935,22 @@ static void set_disassoc_timer(struct hostapd_data *hapd, struct sta_info *sta,
+ }
+
+
++void bss_termination_disable_iface(void *eloop_ctx, void *timeout_ctx)
++{
++ struct hostapd_data *hapd = eloop_ctx;
++ hostapd_disable_iface(hapd->iface);
++}
++
++
++static void set_disable_iface_timer(struct hostapd_data *hapd, struct sta_info *sta,
++ int disable_iface_timer)
++{
++ wpa_printf(MSG_DEBUG, "Disable interface timer set to %d secs", disable_iface_timer);
++ eloop_register_timeout(disable_iface_timer, 0,
++ bss_termination_disable_iface, hapd, NULL);
++}
++
++
+ int wnm_send_ess_disassoc_imminent(struct hostapd_data *hapd,
+ struct sta_info *sta, const char *url,
+ int disassoc_timer)
+@@ -1006,6 +1042,7 @@ int wnm_send_bss_tm_req(struct hostapd_data *hapd, struct sta_info *sta,
+ bss_term_dur) {
+ os_memcpy(pos, bss_term_dur, 12);
+ pos += 12;
++ set_disable_iface_timer(hapd, sta, hapd->conf->bss_termination_tsf);
+ }
+
+ if (url) {
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0009-mtk-hostapd-print-sae-groups-by-hostapd-ctrl.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0009-mtk-hostapd-print-sae-groups-by-hostapd-ctrl.patch
new file mode 100644
index 0000000..e83a862
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0009-mtk-hostapd-print-sae-groups-by-hostapd-ctrl.patch
@@ -0,0 +1,36 @@
+From b607ba9bbb2db2aa61e727831d42e56c16db29b9 Mon Sep 17 00:00:00 2001
+From: Shayne Chen <shayne.chen@mediatek.com>
+Date: Tue, 20 Sep 2022 19:33:45 +0800
+Subject: [PATCH 09/69] mtk: hostapd: print sae groups by hostapd ctrl
+
+---
+ hostapd/ctrl_iface.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index 478653ebf..2ae4f5484 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -1376,6 +1376,19 @@ static int hostapd_ctrl_iface_get(struct hostapd_data *hapd, char *cmd,
+ if (os_snprintf_error(buflen, res))
+ return -1;
+ return res;
++ } else if (os_strcmp(cmd, "sae_group_capability") == 0) {
++#ifdef CONFIG_SAE
++ /* see sae_set_group() */
++ res = os_snprintf(buf, buflen, "%s%s%s%s19 20 21",
++ dh_groups_get(15) ? "15 ": "",
++ dh_groups_get(16) ? "16 ": "",
++ dh_groups_get(17) ? "17 ": "",
++ dh_groups_get(18) ? "18 ": "");
++
++ if (os_snprintf_error(buflen, res))
++ return -1;
++ return res;
++#endif /* CONFIG_SAE */
+ }
+
+ return -1;
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0010-mtk-hostapd-add-support-for-runtime-set-in-band-disc.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0010-mtk-hostapd-add-support-for-runtime-set-in-band-disc.patch
new file mode 100644
index 0000000..a7fbaf9
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0010-mtk-hostapd-add-support-for-runtime-set-in-band-disc.patch
@@ -0,0 +1,199 @@
+From 61cadf85a2334804278617fd0a107b3b483ac2c6 Mon Sep 17 00:00:00 2001
+From: MeiChia Chiu <meichia.chiu@mediatek.com>
+Date: Tue, 31 May 2022 21:15:54 +0800
+Subject: [PATCH 10/69] mtk: hostapd: add support for runtime set in-band
+ discovery
+
+Usage:
+hostapd_cli unsolic_probe_resp [tx_type] [interval]
+
+0: disable all in-band discovery
+1: enable unsolicited probe response
+2: enable FILS discovery
+
+Signed-off-by: MeiChia Chiu <MeiChia.Chiu@mediatek.com>
+
+The mac80211 layer already has a new variable "update",
+so the redundant variable "disable" has been removed.
+
+CR-ID: WCNCR00240597
+Signed-off-by: MeiChia Chiu <MeiChia.Chiu@mediatek.com>
+---
+ hostapd/ctrl_iface.c | 66 ++++++++++++++++++++++++++++++++++++
+ hostapd/hostapd_cli.c | 20 +++++++++++
+ src/ap/beacon.c | 5 ++-
+ src/drivers/driver_nl80211.c | 6 ++--
+ 4 files changed, 94 insertions(+), 3 deletions(-)
+
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index 2ae4f5484..cb5c46ea7 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -772,6 +772,69 @@ static int hostapd_ctrl_iface_send_qos_map_conf(struct hostapd_data *hapd,
+
+ #endif /* CONFIG_INTERWORKING */
+
++static int hostapd_ctrl_iface_inband_discovery(struct hostapd_data *hapd,
++ const char *cmd)
++{
++ struct hostapd_bss_config *conf = hapd->conf;
++ const char *pos = cmd;
++ int tx_type, interval, ret;
++
++ tx_type = atoi(pos);
++ if (tx_type < 0 || tx_type > 2) {
++ wpa_printf(MSG_ERROR, "Invalid tx type\n");
++ return -1;
++ }
++
++ pos = os_strchr(pos, ' ');
++ if(!pos)
++ return -1;
++ pos++;
++ interval = atoi(pos);
++ if (interval < 0 || interval > 20) {
++ wpa_printf(MSG_ERROR, "Invalid interval value\n");
++ return -1;
++ }
++
++ wpa_printf(MSG_ERROR, "Set inband discovery type:%d, interval:%d\n",
++ tx_type, interval);
++
++#define DISABLE_INBAND_DISC 0
++#define UNSOL_PROBE_RESP 1
++#define FILS_DISCOVERY 2
++
++#ifdef CONFIG_FILS
++ conf->fils_discovery_max_int = 0;
++ conf->fils_discovery_min_int = 0;
++#endif /* CONFIG_FILS */
++ conf->unsol_bcast_probe_resp_interval = 0;
++
++ switch (tx_type) {
++ case DISABLE_INBAND_DISC:
++ default:
++ /* Disable both Unsolicited probe response and FILS discovery*/
++ break;
++ case UNSOL_PROBE_RESP:
++ /* Enable Unsolicited probe response */
++ conf->unsol_bcast_probe_resp_interval = interval;
++ break;
++#ifdef CONFIG_FILS
++ case FILS_DISCOVERY:
++ /* Enable FILS discovery */
++ conf->fils_discovery_min_int = interval;
++ conf->fils_discovery_max_int = interval;
++ break;
++#endif /* CONFIG_FILS */
++ }
++
++ ret = ieee802_11_update_beacons(hapd->iface);
++ if(ret) {
++ wpa_printf(MSG_DEBUG,
++ "Failed to update with inband discovery parameters\n");
++ return -1;
++ }
++
++ return 0;
++}
+
+ #ifdef CONFIG_WNM_AP
+
+@@ -4066,6 +4129,9 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ if (hostapd_ctrl_iface_coloc_intf_req(hapd, buf + 15))
+ reply_len = -1;
+ #endif /* CONFIG_WNM_AP */
++ } else if (os_strncmp(buf, "INBAND_DISCOVERY ", 17) == 0) {
++ if (hostapd_ctrl_iface_inband_discovery(hapd, buf + 17))
++ reply_len = -1;
+ } else if (os_strcmp(buf, "GET_CONFIG") == 0) {
+ reply_len = hostapd_ctrl_iface_get_config(hapd, reply,
+ reply_size);
+diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
+index a469b1f4d..1fb6d999e 100644
+--- a/hostapd/hostapd_cli.c
++++ b/hostapd/hostapd_cli.c
+@@ -655,6 +655,24 @@ static int hostapd_cli_cmd_wps_config(struct wpa_ctrl *ctrl, int argc,
+ return wpa_ctrl_command(ctrl, buf);
+ }
+
++static int hostapd_cli_cmd_inband_discovery(struct wpa_ctrl *ctrl, int argc,
++ char *argv[])
++{
++ char buf[300];
++ int res;
++
++ if (argc < 2) {
++ printf("Invalid 'inband_discovery' command - two arguments"
++ "tx_type interval\n");
++ return -1;
++ }
++
++ res = os_snprintf(buf, sizeof(buf), "INBAND_DISCOVERY %s %s",
++ argv[0], argv[1]);
++ if (os_snprintf_error(sizeof(buf), res))
++ return -1;
++ return wpa_ctrl_command(ctrl, buf);
++}
+
+ static int hostapd_cli_cmd_disassoc_imminent(struct wpa_ctrl *ctrl, int argc,
+ char *argv[])
+@@ -1851,6 +1869,8 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
+ { "driver", hostapd_cli_cmd_driver, NULL,
+ "<driver sub command> [<hex formatted data>] = send driver command data" },
+ #endif /* ANDROID */
++ { "inband_discovery", hostapd_cli_cmd_inband_discovery, NULL,
++ "<tx type(0/1/2)> <interval> = runtime set inband discovery" },
+ { NULL, NULL, NULL, NULL }
+ };
+
+diff --git a/src/ap/beacon.c b/src/ap/beacon.c
+index bec44c548..118418274 100644
+--- a/src/ap/beacon.c
++++ b/src/ap/beacon.c
+@@ -2063,6 +2063,8 @@ static u8 * hostapd_fils_discovery(struct hostapd_data *hapd,
+ struct wpa_driver_ap_params *params)
+ {
+ params->fd_max_int = hapd->conf->fils_discovery_max_int;
++ params->unsol_bcast_probe_resp_interval =
++ hapd->conf->unsol_bcast_probe_resp_interval;
+ if (is_6ghz_op_class(hapd->iconf->op_class) &&
+ params->fd_max_int > FD_MAX_INTERVAL_6GHZ)
+ params->fd_max_int = FD_MAX_INTERVAL_6GHZ;
+@@ -2071,7 +2073,8 @@ static u8 * hostapd_fils_discovery(struct hostapd_data *hapd,
+ if (params->fd_min_int > params->fd_max_int)
+ params->fd_min_int = params->fd_max_int;
+
+- if (params->fd_max_int)
++ if (params->fd_max_int || (is_6ghz_op_class(hapd->iconf->op_class) &&
++ !params->unsol_bcast_probe_resp_interval))
+ return hostapd_gen_fils_discovery(hapd,
+ ¶ms->fd_frame_tmpl_len);
+
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index 45c1ea9ce..200164058 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -4780,7 +4780,6 @@ static int nl80211_fils_discovery(struct i802_bss *bss, struct nl_msg *msg,
+ nla_put(msg, NL80211_FILS_DISCOVERY_ATTR_TMPL,
+ params->fd_frame_tmpl_len, params->fd_frame_tmpl)))
+ return -1;
+-
+ nla_nest_end(msg, attr);
+ return 0;
+ }
+@@ -5416,7 +5415,10 @@ static int wpa_driver_nl80211_set_ap(void *priv,
+ #endif /* CONFIG_SAE */
+
+ #ifdef CONFIG_FILS
+- if (params->fd_max_int && nl80211_fils_discovery(bss, msg, params) < 0)
++ if ((params->fd_max_int ||
++ ((params->freq->freq > 5950 && params->freq->freq <= 7115) &&
++ !(params->unsol_bcast_probe_resp_interval))) &&
++ nl80211_fils_discovery(bss, msg, params) < 0)
+ goto fail;
+ #endif /* CONFIG_FILS */
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0011-mtk-hostapd-Add-mtk_vendor.h.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0011-mtk-hostapd-Add-mtk_vendor.h.patch
new file mode 100644
index 0000000..7692dba
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0011-mtk-hostapd-Add-mtk_vendor.h.patch
@@ -0,0 +1,216 @@
+From a3d781419e81e6611174e4f580395ef2dc3c296a Mon Sep 17 00:00:00 2001
+From: Howard Hsu <howard-yh.hsu@mediatek.com>
+Date: Mon, 30 May 2022 15:04:57 +0800
+Subject: [PATCH 11/69] mtk: hostapd: Add mtk_vendor.h
+
+---
+ src/common/mtk_vendor.h | 197 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 197 insertions(+)
+ create mode 100644 src/common/mtk_vendor.h
+
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+new file mode 100644
+index 000000000..4a19d2fc9
+--- /dev/null
++++ b/src/common/mtk_vendor.h
+@@ -0,0 +1,197 @@
++// SPDX-License-Identifier: ISC
++/* Copyright (C) 2020 Felix Fietkau <nbd@nbd.name> */
++#ifndef MTK_VENDOR_H
++#define MTK_VENDOR_H
++
++#define OUI_MTK 0x000ce7
++
++enum mtk_nl80211_vendor_subcmds {
++ MTK_NL80211_VENDOR_SUBCMD_AMNT_CTRL = 0xae,
++ MTK_NL80211_VENDOR_SUBCMD_CSI_CTRL = 0xc2,
++ MTK_NL80211_VENDOR_SUBCMD_RFEATURE_CTRL = 0xc3,
++ MTK_NL80211_VENDOR_SUBCMD_WIRELESS_CTRL = 0xc4,
++ MTK_NL80211_VENDOR_SUBCMD_EDCCA_CTRL = 0xc7,
++};
++
++enum mtk_vendor_attr_edcca_ctrl {
++ MTK_VENDOR_ATTR_EDCCA_THRESHOLD_INVALID = 0,
++
++ MTK_VENDOR_ATTR_EDCCA_CTRL_MODE,
++ MTK_VENDOR_ATTR_EDCCA_CTRL_PRI20_VAL,
++ MTK_VENDOR_ATTR_EDCCA_CTRL_SEC20_VAL,
++ MTK_VENDOR_ATTR_EDCCA_CTRL_SEC40_VAL,
++ MTK_VENDOR_ATTR_EDCCA_CTRL_SEC80_VAL,
++ MTK_VENDOR_ATTR_EDCCA_CTRL_COMPENSATE,
++ MTK_VENDOR_ATTR_EDCCA_CTRL_SEC160_VAL,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_EDCCA_CTRL,
++ MTK_VENDOR_ATTR_EDCCA_CTRL_MAX =
++ NUM_MTK_VENDOR_ATTRS_EDCCA_CTRL - 1
++};
++
++enum mtk_vendor_attr_edcca_ctrl_mode {
++ EDCCA_CTRL_SET_EN = 0,
++ EDCCA_CTRL_SET_THERS,
++ EDCCA_CTRL_GET_EN,
++ EDCCA_CTRL_GET_THERS,
++ EDCCA_CTRL_NUM,
++};
++
++static struct nla_policy edcca_ctrl_policy[NUM_MTK_VENDOR_ATTRS_EDCCA_CTRL] = {
++ [MTK_VENDOR_ATTR_EDCCA_CTRL_MODE] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_EDCCA_CTRL_PRI20_VAL] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_EDCCA_CTRL_SEC20_VAL] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_EDCCA_CTRL_SEC40_VAL] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_EDCCA_CTRL_SEC80_VAL] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_EDCCA_CTRL_COMPENSATE] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_EDCCA_CTRL_SEC160_VAL] = { .type = NLA_U8 },
++};
++
++enum mtk_vendor_attr_csi_ctrl {
++ MTK_VENDOR_ATTR_CSI_CTRL_UNSPEC,
++
++ MTK_VENDOR_ATTR_CSI_CTRL_CFG,
++ MTK_VENDOR_ATTR_CSI_CTRL_CFG_MODE,
++ MTK_VENDOR_ATTR_CSI_CTRL_CFG_TYPE,
++ MTK_VENDOR_ATTR_CSI_CTRL_CFG_VAL1,
++ MTK_VENDOR_ATTR_CSI_CTRL_CFG_VAL2,
++ MTK_VENDOR_ATTR_CSI_CTRL_MAC_ADDR,
++ MTK_VENDOR_ATTR_CSI_CTRL_INTERVAL,
++
++ MTK_VENDOR_ATTR_CSI_CTRL_DUMP_NUM,
++
++ MTK_VENDOR_ATTR_CSI_CTRL_DATA,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_CSI_CTRL,
++ MTK_VENDOR_ATTR_CSI_CTRL_MAX =
++ NUM_MTK_VENDOR_ATTRS_CSI_CTRL - 1
++};
++
++enum mtk_vendor_attr_csi_data {
++ MTK_VENDOR_ATTR_CSI_DATA_UNSPEC,
++ MTK_VENDOR_ATTR_CSI_DATA_PAD,
++
++ MTK_VENDOR_ATTR_CSI_DATA_VER,
++ MTK_VENDOR_ATTR_CSI_DATA_TS,
++ MTK_VENDOR_ATTR_CSI_DATA_RSSI,
++ MTK_VENDOR_ATTR_CSI_DATA_SNR,
++ MTK_VENDOR_ATTR_CSI_DATA_BW,
++ MTK_VENDOR_ATTR_CSI_DATA_CH_IDX,
++ MTK_VENDOR_ATTR_CSI_DATA_TA,
++ MTK_VENDOR_ATTR_CSI_DATA_I,
++ MTK_VENDOR_ATTR_CSI_DATA_Q,
++ MTK_VENDOR_ATTR_CSI_DATA_INFO,
++ MTK_VENDOR_ATTR_CSI_DATA_RSVD1,
++ MTK_VENDOR_ATTR_CSI_DATA_RSVD2,
++ MTK_VENDOR_ATTR_CSI_DATA_RSVD3,
++ MTK_VENDOR_ATTR_CSI_DATA_RSVD4,
++ MTK_VENDOR_ATTR_CSI_DATA_TX_ANT,
++ MTK_VENDOR_ATTR_CSI_DATA_RX_ANT,
++ MTK_VENDOR_ATTR_CSI_DATA_MODE,
++ MTK_VENDOR_ATTR_CSI_DATA_H_IDX,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_CSI_DATA,
++ MTK_VENDOR_ATTR_CSI_DATA_MAX =
++ NUM_MTK_VENDOR_ATTRS_CSI_DATA - 1
++};
++
++enum mtk_vendor_attr_mnt_ctrl {
++ MTK_VENDOR_ATTR_AMNT_CTRL_UNSPEC,
++
++ MTK_VENDOR_ATTR_AMNT_CTRL_SET,
++ MTK_VENDOR_ATTR_AMNT_CTRL_DUMP,
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_AMNT_CTRL,
++ MTK_VENDOR_ATTR_AMNT_CTRL_MAX =
++ NUM_MTK_VENDOR_ATTRS_AMNT_CTRL - 1
++};
++
++enum mtk_vendor_attr_mnt_set {
++ MTK_VENDOR_ATTR_AMNT_SET_UNSPEC,
++
++ MTK_VENDOR_ATTR_AMNT_SET_INDEX,
++ MTK_VENDOR_ATTR_AMNT_SET_MACADDR,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_AMNT_SET,
++ MTK_VENDOR_ATTR_AMNT_SET_MAX =
++ NUM_MTK_VENDOR_ATTRS_AMNT_SET - 1
++};
++
++enum mtk_vendor_attr_mnt_dump {
++ MTK_VENDOR_ATTR_AMNT_DUMP_UNSPEC,
++
++ MTK_VENDOR_ATTR_AMNT_DUMP_INDEX,
++ MTK_VENDOR_ATTR_AMNT_DUMP_LEN,
++ MTK_VENDOR_ATTR_AMNT_DUMP_RESULT,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_AMNT_DUMP,
++ MTK_VENDOR_ATTR_AMNT_DUMP_MAX =
++ NUM_MTK_VENDOR_ATTRS_AMNT_DUMP - 1
++};
++
++enum mtk_vendor_attr_wireless_ctrl {
++ MTK_VENDOR_ATTR_WIRELESS_CTRL_UNSPEC,
++
++ MTK_VENDOR_ATTR_WIRELESS_CTRL_FIXED_MCS,
++ MTK_VENDOR_ATTR_WIRELESS_CTRL_FIXED_OFDMA,
++ MTK_VENDOR_ATTR_WIRELESS_CTRL_PPDU_TX_TYPE,
++ MTK_VENDOR_ATTR_WIRELESS_CTRL_NUSERS_OFDMA,
++ MTK_VENDOR_ATTR_WIRELESS_CTRL_BA_BUFFER_SIZE,
++ MTK_VENDOR_ATTR_WIRELESS_CTRL_MIMO,
++ MTK_VENDOR_ATTR_WIRELESS_CTRL_AMPDU,
++ MTK_VENDOR_ATTR_WIRELESS_CTRL_AMSDU,
++ MTK_VENDOR_ATTR_WIRELESS_CTRL_CERT,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_WIRELESS_CTRL,
++ MTK_VENDOR_ATTR_WIRELESS_CTRL_MAX =
++ NUM_MTK_VENDOR_ATTRS_WIRELESS_CTRL - 1
++};
++
++enum mtk_vendor_attr_rfeature_ctrl {
++ MTK_VENDOR_ATTR_RFEATURE_CTRL_UNSPEC,
++
++ MTK_VENDOR_ATTR_RFEATURE_CTRL_HE_GI,
++ MTK_VENDOR_ATTR_RFEATURE_CTRL_HE_LTF,
++ MTK_VENDOR_ATTR_RFEATURE_CTRL_TRIG_TYPE_CFG,
++ MTK_VENDOR_ATTR_RFEATURE_CTRL_TRIG_TYPE_EN,
++ MTK_VENDOR_ATTR_RFEATURE_CTRL_TRIG_TYPE,
++ MTK_VENDOR_ATTR_RFEATURE_CTRL_ACK_PLCY,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_RFEATURE_CTRL,
++ MTK_VENDOR_ATTR_RFEATURE_CTRL_MAX =
++ NUM_MTK_VENDOR_ATTRS_RFEATURE_CTRL - 1
++};
++
++#define CSI_MAX_COUNT 256
++#define ETH_ALEN 6
++
++struct csi_data {
++ s16 data_i[CSI_MAX_COUNT];
++ s16 data_q[CSI_MAX_COUNT];
++ s8 rssi;
++ u8 snr;
++ u32 ts;
++ u8 data_bw;
++ u8 pri_ch_idx;
++ u8 ta[ETH_ALEN];
++ u32 info;
++ u8 rx_mode;
++ u32 h_idx;
++ u16 tx_idx;
++ u16 rx_idx;
++};
++
++struct amnt_data {
++ u8 idx;
++ u8 addr[ETH_ALEN];
++ s8 rssi[4];
++ u32 last_seen;
++};
++#endif /* MTK_VENDOR_H */
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0012-mtk-hostapd-Support-EDCCA-hostapd-configuration.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0012-mtk-hostapd-Support-EDCCA-hostapd-configuration.patch
new file mode 100644
index 0000000..9c5cc47
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0012-mtk-hostapd-Support-EDCCA-hostapd-configuration.patch
@@ -0,0 +1,630 @@
+From bb95c587135a2cc3a73de87cbd82f7eda3d23fd1 Mon Sep 17 00:00:00 2001
+From: Howard Hsu <howard-yh.hsu@mediatek.com>
+Date: Mon, 30 May 2022 16:31:34 +0800
+Subject: [PATCH 12/69] mtk: hostapd: Support EDCCA hostapd configuration
+
+edcca_enable and edcca_compensation and implement edcca related handlers.
+---
+ hostapd/config_file.c | 34 ++++++
+ hostapd/ctrl_iface.c | 124 +++++++++++++++++++++
+ src/ap/ap_config.c | 4 +
+ src/ap/ap_config.h | 30 ++++++
+ src/ap/ap_drv_ops.c | 24 +++++
+ src/ap/ap_drv_ops.h | 4 +
+ src/ap/hostapd.c | 7 ++
+ src/common/mtk_vendor.h | 20 ++--
+ src/drivers/driver.h | 4 +
+ src/drivers/driver_nl80211.c | 174 ++++++++++++++++++++++++++++++
+ src/drivers/driver_nl80211.h | 1 +
+ src/drivers/driver_nl80211_capa.c | 7 ++
+ 12 files changed, 427 insertions(+), 6 deletions(-)
+
+diff --git a/hostapd/config_file.c b/hostapd/config_file.c
+index 0094db279..f8c1eec0a 100644
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -5348,6 +5348,40 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ bss->mld_indicate_disabled = atoi(pos);
+ #endif /* CONFIG_TESTING_OPTIONS */
+ #endif /* CONFIG_IEEE80211BE */
++ } else if (os_strcmp(buf, "edcca_threshold") == 0) {
++ if (hostapd_parse_intlist(&conf->edcca_threshold, pos) ||
++ conf->edcca_threshold[0] < EDCCA_MIN_CONFIG_THRES ||
++ conf->edcca_threshold[0] > EDCCA_MAX_CONFIG_THRES ||
++ conf->edcca_threshold[1] < EDCCA_MIN_CONFIG_THRES ||
++ conf->edcca_threshold[1] > EDCCA_MAX_CONFIG_THRES ||
++ conf->edcca_threshold[2] < EDCCA_MIN_CONFIG_THRES ||
++ conf->edcca_threshold[2] > EDCCA_MAX_CONFIG_THRES ||
++ conf->edcca_threshold[3] < EDCCA_MIN_CONFIG_THRES ||
++ conf->edcca_threshold[3] > EDCCA_MAX_CONFIG_THRES) {
++ wpa_printf(MSG_ERROR, "Line %d: invalid edcca threshold",
++ line);
++ return 1;
++ }
++ } else if (os_strcmp(buf, "edcca_enable") == 0) {
++ int mode = atoi(pos);
++ if (mode < EDCCA_MODE_FORCE_DISABLE || mode > EDCCA_MODE_AUTO) {
++ wpa_printf(MSG_ERROR, "Line %d: Invalid edcca_enable %d;"
++ " allowed value 0 (Force Disable) or 1(Auto) ",
++ line, mode);
++ return 1;
++ }
++ conf->edcca_enable = (u8) mode;
++ } else if (os_strcmp(buf, "edcca_compensation") == 0) {
++ int val = atoi(pos);
++ if (val < EDCCA_MIN_COMPENSATION ||
++ val > EDCCA_MAX_COMPENSATION) {
++ wpa_printf(MSG_ERROR, "Line %d: Invalid compensation"
++ " value %d; allowed value %d ~ %d.",
++ line, val, EDCCA_MIN_COMPENSATION,
++ EDCCA_MAX_COMPENSATION);
++ return 1;
++ }
++ conf->edcca_compensation = (s8) val;
+ } else {
+ wpa_printf(MSG_ERROR,
+ "Line %d: unknown configuration item '%s'",
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index cb5c46ea7..c9764ac71 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -544,6 +544,19 @@ static const char * pbc_status_str(enum pbc_status status)
+ }
+
+
++static const char *edcca_mode_str(enum edcca_mode status)
++{
++ switch (status) {
++ case EDCCA_MODE_FORCE_DISABLE:
++ return "Force Disable";
++ case EDCCA_MODE_AUTO:
++ return "Auto";
++ default:
++ return "Unknown";
++ }
++}
++
++
+ static int hostapd_ctrl_iface_wps_get_status(struct hostapd_data *hapd,
+ char *buf, size_t buflen)
+ {
+@@ -3665,6 +3678,111 @@ static int hostapd_ctrl_iface_link_remove(struct hostapd_data *hapd, char *cmd,
+ #endif /* CONFIG_TESTING_OPTIONS */
+ #endif /* CONFIG_IEEE80211BE */
+
++static int
++hostapd_ctrl_iface_set_edcca(struct hostapd_data *hapd, char *cmd,
++ char *buf, size_t buflen)
++{
++ char *pos, *config, *value;
++ config = cmd;
++ pos = os_strchr(config, ' ');
++ if (pos == NULL)
++ return -1;
++ *pos++ = '\0';
++
++ if (pos == NULL)
++ return -1;
++ value = pos;
++
++ if (os_strcmp(config, "enable") == 0) {
++ int mode = atoi(value);
++ if (mode < EDCCA_MODE_FORCE_DISABLE || mode > EDCCA_MODE_AUTO) {
++ wpa_printf(MSG_ERROR, "Invalid value for edcca enable");
++ return -1;
++ }
++ hapd->iconf->edcca_enable = (u8) mode;
++ if (hostapd_drv_configure_edcca_enable(hapd) != 0)
++ return -1;
++ } else if (os_strcmp(config, "compensation") == 0) {
++ int compensation = atoi(value);
++ if (compensation < EDCCA_MIN_COMPENSATION ||
++ compensation > EDCCA_MAX_COMPENSATION) {
++ wpa_printf(MSG_ERROR, "Invalid value for edcca compensation");
++ return -1;
++ }
++ hapd->iconf->edcca_compensation = (s8) compensation;
++ if (hostapd_drv_configure_edcca_enable(hapd) != 0)
++ return -1;
++ } else if (os_strcmp(config, "threshold") == 0) {
++ char *thres_value;
++ thres_value = os_strchr(value, ':');
++ if (thres_value == NULL)
++ return -1;
++ *thres_value++ = '\0';
++
++ if (thres_value == NULL)
++ return -1;
++ int bw_idx = atoi(value);
++ int threshold = atoi(thres_value);
++
++ if (bw_idx < EDCCA_BW_20 || bw_idx > EDCCA_BW_160) {
++ wpa_printf(MSG_ERROR,
++ "Unsupported Bandwidth idx %d for SET_EDCCA",
++ bw_idx);
++ return -1;
++ }
++ if (threshold < EDCCA_MIN_CONFIG_THRES ||
++ threshold > EDCCA_MAX_CONFIG_THRES) {
++ wpa_printf(MSG_ERROR,
++ "Unsupported threshold %d for SET_EDCCA",
++ threshold);
++ return -1;
++ }
++
++ int threshold_arr[EDCCA_MAX_BW_NUM];
++ /* 0x7f means keep the origival value in firmware */
++ os_memset(threshold_arr, 0x7f, sizeof(threshold_arr));
++ threshold_arr[bw_idx] = threshold;
++
++ if (hostapd_drv_configure_edcca_threshold(hapd, threshold_arr) != 0)
++ return -1;
++ } else {
++ wpa_printf(MSG_ERROR,
++ "Unsupported parameter %s for SET_EDCCA", config);
++ return -1;
++ }
++ return os_snprintf(buf, buflen, "OK\n");
++}
++
++
++static int
++hostapd_ctrl_iface_get_edcca(struct hostapd_data *hapd, char *cmd, char *buf,
++ size_t buflen)
++{
++ char *pos, *end;
++
++ pos = buf;
++ end = buf + buflen;
++ u8 value[EDCCA_MAX_BW_NUM] = {0};
++
++ if (os_strcmp(cmd, "enable") == 0) {
++ return os_snprintf(pos, end - pos, "Enable: %s\n",
++ edcca_mode_str(hapd->iconf->edcca_enable));
++ } else if (os_strcmp(cmd, "compensation") == 0) {
++ return os_snprintf(pos, end - pos, "Compensation: %d\n",
++ hapd->iconf->edcca_compensation);
++ } else if (os_strcmp(cmd, "threshold") == 0) {
++ if (hostapd_drv_get_edcca(hapd, EDCCA_CTRL_GET_THRES, &value) != 0)
++ return -1;
++ return os_snprintf(pos, end - pos,
++ "Threshold BW20: 0x%x, BW40: 0x%x, BW80: 0x%x, BW160: 0x%x\n",
++ value[0], value[1], value[2], value[3]);
++ } else {
++ wpa_printf(MSG_ERROR,
++ "Unsupported parameter %s for GET_EDCCA", cmd);
++ return -1;
++ }
++}
++
+
+ #ifdef CONFIG_NAN_USD
+
+@@ -4552,6 +4670,12 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ reply_len = -1;
+ #endif /* CONFIG_TESTING_OPTIONS */
+ #endif /* CONFIG_IEEE80211BE */
++ } else if (os_strncmp(buf, "SET_EDCCA ", 10) == 0) {
++ reply_len = hostapd_ctrl_iface_set_edcca(hapd, buf+10, reply,
++ reply_size);
++ } else if (os_strncmp(buf, "GET_EDCCA ", 10) == 0) {
++ reply_len = hostapd_ctrl_iface_get_edcca(hapd, buf+10, reply,
++ reply_size);
+ } else {
+ os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
+ reply_len = 16;
+diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
+index 6c8b10291..965600577 100644
+--- a/src/ap/ap_config.c
++++ b/src/ap/ap_config.c
+@@ -303,6 +303,9 @@ struct hostapd_config * hostapd_config_defaults(void)
+ conf->airtime_update_interval = AIRTIME_DEFAULT_UPDATE_INTERVAL;
+ #endif /* CONFIG_AIRTIME_POLICY */
+
++ conf->edcca_enable = EDCCA_MODE_AUTO;
++ conf->edcca_compensation = EDCCA_DEFAULT_COMPENSATION;
++
+ hostapd_set_and_check_bw320_offset(conf, 0);
+
+ return conf;
+@@ -1034,6 +1037,7 @@ void hostapd_config_free(struct hostapd_config *conf)
+ #ifdef CONFIG_ACS
+ os_free(conf->acs_chan_bias);
+ #endif /* CONFIG_ACS */
++ os_free(conf->edcca_threshold);
+ wpabuf_free(conf->lci);
+ wpabuf_free(conf->civic);
+ #ifdef CONFIG_AFC
+diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
+index 379dc22cf..09718fada 100644
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -1281,8 +1281,38 @@ struct hostapd_config {
+ int min_power;
+ } afc;
+ #endif /* CONFIG_AFC */
++
++ u8 edcca_enable;
++ s8 edcca_compensation;
++ int *edcca_threshold;
++};
++
++enum edcca_mode {
++ EDCCA_MODE_FORCE_DISABLE = 0,
++ EDCCA_MODE_AUTO = 1,
++};
++
++enum edcca_bw_id {
++ EDCCA_BW_20 = 0,
++ EDCCA_BW_40,
++ EDCCA_BW_80,
++ EDCCA_BW_160,
++ EDCCA_MAX_BW_NUM,
++};
++
++enum mtk_vendor_attr_edcca_ctrl_mode {
++ EDCCA_CTRL_SET_EN = 0,
++ EDCCA_CTRL_SET_THRES,
++ EDCCA_CTRL_GET_EN,
++ EDCCA_CTRL_GET_THRES,
++ EDCCA_CTRL_NUM,
+ };
+
++#define EDCCA_DEFAULT_COMPENSATION -6
++#define EDCCA_MIN_COMPENSATION -126
++#define EDCCA_MAX_COMPENSATION 126
++#define EDCCA_MIN_CONFIG_THRES -126
++#define EDCCA_MAX_CONFIG_THRES 0
+
+ static inline enum oper_chan_width
+ hostapd_get_oper_chwidth(struct hostapd_config *conf)
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index 57e20ee2f..ec95738a0 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -1216,3 +1216,27 @@ int hostapd_drv_set_secure_ranging_ctx(struct hostapd_data *hapd,
+ return hapd->driver->set_secure_ranging_ctx(hapd->drv_priv, ¶ms);
+ }
+ #endif /* CONFIG_PASN */
++
++int hostapd_drv_configure_edcca_enable(struct hostapd_data *hapd)
++{
++ if (!hapd->driver || !hapd->driver->configure_edcca_enable)
++ return 0;
++ return hapd->driver->configure_edcca_enable(hapd->drv_priv,
++ hapd->iconf->edcca_enable,
++ hapd->iconf->edcca_compensation);
++}
++
++int hostapd_drv_configure_edcca_threshold(struct hostapd_data *hapd,
++ const int *threshold)
++{
++ if (!hapd->driver || !hapd->driver->configure_edcca_threshold)
++ return 0;
++ return hapd->driver->configure_edcca_threshold(hapd->drv_priv, threshold);
++}
++
++int hostapd_drv_get_edcca(struct hostapd_data *hapd, const u8 mode, u8 *value)
++{
++ if (!hapd->driver || !hapd->driver->get_edcca)
++ return 0;
++ return hapd->driver->get_edcca(hapd->drv_priv, mode, value);
++}
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index 6ab1484ca..cb9d7b9ea 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -144,6 +144,10 @@ int hostapd_drv_set_secure_ranging_ctx(struct hostapd_data *hapd,
+ u8 ltf_keyseed_len,
+ const u8 *ltf_keyseed, u32 action);
+
++int hostapd_drv_configure_edcca_enable(struct hostapd_data *hapd);
++int hostapd_drv_configure_edcca_threshold(struct hostapd_data *hapd,
++ const int *threshold);
++int hostapd_drv_get_edcca(struct hostapd_data *hapd, const u8 mode, u8 *value);
+
+ #include "drivers/driver.h"
+
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index e42588497..39f447f89 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -2613,6 +2613,13 @@ dfs_offload:
+ }
+ #endif /* CONFIG_MESH */
+
++ if (hostapd_drv_configure_edcca_enable(hapd) < 0)
++ goto fail;
++
++ if (hostapd_drv_configure_edcca_threshold(hapd,
++ hapd->iconf->edcca_threshold) < 0)
++ goto fail;
++
+ wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
+ iface->bss[0]->conf->iface);
+ if (iface->interfaces && iface->interfaces->terminate_on_error > 0)
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+index 4a19d2fc9..6121857dd 100644
+--- a/src/common/mtk_vendor.h
++++ b/src/common/mtk_vendor.h
+@@ -30,14 +30,22 @@ enum mtk_vendor_attr_edcca_ctrl {
+ NUM_MTK_VENDOR_ATTRS_EDCCA_CTRL - 1
+ };
+
+-enum mtk_vendor_attr_edcca_ctrl_mode {
+- EDCCA_CTRL_SET_EN = 0,
+- EDCCA_CTRL_SET_THERS,
+- EDCCA_CTRL_GET_EN,
+- EDCCA_CTRL_GET_THERS,
+- EDCCA_CTRL_NUM,
++enum mtk_vendor_attr_edcca_dump {
++ MTK_VENDOR_ATTR_EDCCA_DUMP_UNSPEC = 0,
++
++ MTK_VENDOR_ATTR_EDCCA_DUMP_MODE,
++ MTK_VENDOR_ATTR_EDCCA_DUMP_PRI20_VAL,
++ MTK_VENDOR_ATTR_EDCCA_DUMP_SEC40_VAL,
++ MTK_VENDOR_ATTR_EDCCA_DUMP_SEC80_VAL,
++ MTK_VENDOR_ATTR_EDCCA_DUMP_SEC160_VAL,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_EDCCA_DUMP,
++ MTK_VENDOR_ATTR_EDCCA_DUMP_MAX =
++ NUM_MTK_VENDOR_ATTRS_EDCCA_DUMP - 1
+ };
+
++
+ static struct nla_policy edcca_ctrl_policy[NUM_MTK_VENDOR_ATTRS_EDCCA_CTRL] = {
+ [MTK_VENDOR_ATTR_EDCCA_CTRL_MODE] = { .type = NLA_U8 },
+ [MTK_VENDOR_ATTR_EDCCA_CTRL_PRI20_VAL] = { .type = NLA_U8 },
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index c1aa98b65..37aabc695 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -5183,6 +5183,10 @@ struct wpa_driver_ops {
+ const u8 *match, size_t match_len,
+ bool multicast);
+ #endif /* CONFIG_TESTING_OPTIONS */
++ int (*configure_edcca_enable)(void *priv, const u8 edcca_enable,
++ const s8 edcca_compensation);
++ int (*configure_edcca_threshold)(void *priv, const int *threshold);
++ int (*get_edcca)(void *priv, const u8 mode, u8 *value);
+ };
+
+ /**
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index 200164058..df6593cc1 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -42,6 +42,8 @@
+ #include "radiotap_iter.h"
+ #include "rfkill.h"
+ #include "driver_nl80211.h"
++#include "common/mtk_vendor.h"
++#include "ap/ap_config.h"
+
+
+ #ifndef NETLINK_CAP_ACK
+@@ -13959,6 +13961,174 @@ static int testing_nl80211_radio_disable(void *priv, int disabled)
+
+ #endif /* CONFIG_TESTING_OPTIONS */
+
++static int nl80211_configure_edcca_enable(void *priv,
++ const u8 edcca_enable,
++ const s8 edcca_compensation)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *data;
++ int ret;
++
++ if (!drv->mtk_edcca_vendor_cmd_avail) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Driver does not support setting EDCCA enable");
++ return 0;
++ }
++
++ if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
++ MTK_NL80211_VENDOR_SUBCMD_EDCCA_CTRL) ||
++ !(data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_EDCCA_CTRL_MODE, EDCCA_CTRL_SET_EN) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_EDCCA_CTRL_PRI20_VAL, edcca_enable) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_EDCCA_CTRL_COMPENSATE,
++ edcca_compensation)) {
++ wpa_printf (MSG_ERROR, "Prepare nl80211 msg fail");
++ nlmsg_free(msg);
++ return -ENOBUFS;
++ }
++ nla_nest_end(msg, data);
++ ret = send_and_recv_cmd(drv, msg);
++ if (ret) {
++ wpa_printf(MSG_ERROR, "Failed to configure EDCCA enable. ret=%d (%s) ",
++ ret, strerror(-ret));
++ }
++ return ret;
++}
++
++static int nl80211_configure_edcca_threshold(void *priv, const int *threshold)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *data;
++ int ret;
++
++ if (!drv->mtk_edcca_vendor_cmd_avail) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Driver does not support setting EDCCA threshold");
++ return 0;
++ }
++
++ if (!threshold) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Input EDCCA threshold is empty!");
++ return 0;
++ }
++
++ if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
++ MTK_NL80211_VENDOR_SUBCMD_EDCCA_CTRL) ||
++ !(data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_EDCCA_CTRL_MODE, EDCCA_CTRL_SET_THRES) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_EDCCA_CTRL_PRI20_VAL, threshold[0] & 0xff) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_EDCCA_CTRL_SEC40_VAL, threshold[1] & 0xff) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_EDCCA_CTRL_SEC80_VAL, threshold[2] & 0xff) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_EDCCA_CTRL_SEC160_VAL, threshold[3] & 0xff)) {
++ wpa_printf (MSG_ERROR, "Prepare nl80211 msg fail");
++ nlmsg_free(msg);
++ return -ENOBUFS;
++ }
++ nla_nest_end(msg, data);
++ ret = send_and_recv_cmd(drv, msg);
++ if (ret) {
++ wpa_printf(MSG_ERROR, "Failed to configure EDCCA threshold. ret=%d (%s) ",
++ ret, strerror(-ret));
++ }
++ return ret;
++}
++
++
++static int edcca_info_handler(struct nl_msg *msg, void *arg)
++{
++ u8 *info = (u8 *) arg;
++ struct nlattr *tb[NL80211_ATTR_MAX + 1];
++ struct nlattr *tb_vendor[MTK_VENDOR_ATTR_EDCCA_DUMP_MAX + 1];
++ struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
++ struct nlattr *nl_vend, *attr;
++
++ nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
++ genlmsg_attrlen(gnlh, 0), NULL);
++
++ nl_vend = tb[NL80211_ATTR_VENDOR_DATA];
++ if (!nl_vend)
++ return NL_SKIP;
++
++ nla_parse(tb_vendor, MTK_VENDOR_ATTR_EDCCA_DUMP_MAX,
++ nla_data(nl_vend), nla_len(nl_vend), NULL);
++
++ attr = tb_vendor[MTK_VENDOR_ATTR_EDCCA_DUMP_PRI20_VAL];
++ if (!attr) {
++ wpa_printf(MSG_ERROR, "nl80211: MTK_VENDOR_ATTR_EDCCA_DUMP_PRI20_VAL");
++ return NL_SKIP;
++ }
++
++ *info++ = nla_get_u8(attr);
++
++ attr = tb_vendor[MTK_VENDOR_ATTR_EDCCA_DUMP_SEC40_VAL];
++ if (!attr) {
++ wpa_printf(MSG_ERROR, "nl80211: MTK_VENDOR_ATTR_EDCCA_DUMP_SEC40_VAL");
++ return NL_SKIP;
++ }
++
++ *info++ = nla_get_u8(attr);
++
++ attr = tb_vendor[MTK_VENDOR_ATTR_EDCCA_DUMP_SEC80_VAL];
++ if (!attr) {
++ wpa_printf(MSG_ERROR, "nl80211: MTK_VENDOR_ATTR_EDCCA_DUMP_SEC80_VAL");
++ return NL_SKIP;
++ }
++
++ *info++ = nla_get_u8(attr);
++
++ attr = tb_vendor[MTK_VENDOR_ATTR_EDCCA_DUMP_SEC160_VAL];
++ if (!attr) {
++ wpa_printf(MSG_ERROR, "nl80211: MTK_VENDOR_ATTR_EDCCA_DUMP_SEC160_VAL");
++ return NL_SKIP;
++ }
++
++ *info = nla_get_u8(attr);
++ return NL_SKIP;
++}
++
++
++static int nl80211_get_edcca(void *priv, const u8 mode, u8 *value)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *data;
++ int ret;
++
++ if (!drv->mtk_edcca_vendor_cmd_avail) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Driver does not support setting EDCCA threshold");
++ return 0;
++ }
++
++ if (!(msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_VENDOR)) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
++ MTK_NL80211_VENDOR_SUBCMD_EDCCA_CTRL) ||
++ !(data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA | NLA_F_NESTED)) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_EDCCA_CTRL_MODE, mode)) {
++ wpa_printf (MSG_ERROR, "Prepare nl80211 msg fail");
++ nlmsg_free(msg);
++ return -ENOBUFS;
++ }
++ nla_nest_end(msg, data);
++ ret = send_and_recv_resp(drv, msg, edcca_info_handler, value);
++ if (ret) {
++ wpa_printf(MSG_ERROR, "Failed to get EDCCA configuration. ret=%d (%s)",
++ ret, strerror(-ret));
++ }
++ return ret;
++}
++
+
+ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .name = "nl80211",
+@@ -14115,4 +14285,8 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .register_frame = testing_nl80211_register_frame,
+ .radio_disable = testing_nl80211_radio_disable,
+ #endif /* CONFIG_TESTING_OPTIONS */
++/* Need ifdef CONFIG_DRIVER_NL80211_MTK */
++ .configure_edcca_enable = nl80211_configure_edcca_enable,
++ .configure_edcca_threshold = nl80211_configure_edcca_threshold,
++ .get_edcca = nl80211_get_edcca,
+ };
+diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
+index 32a1c8b1f..08ab00de3 100644
+--- a/src/drivers/driver_nl80211.h
++++ b/src/drivers/driver_nl80211.h
+@@ -199,6 +199,7 @@ struct wpa_driver_nl80211_data {
+ unsigned int secure_ranging_ctx_vendor_cmd_avail:1;
+ unsigned int puncturing:1;
+ unsigned int qca_ap_allowed_freqs:1;
++ unsigned int mtk_edcca_vendor_cmd_avail:1;
+
+ u32 ignore_next_local_disconnect;
+ u32 ignore_next_local_deauth;
+diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
+index 305e4ab5b..76377fe8c 100644
+--- a/src/drivers/driver_nl80211_capa.c
++++ b/src/drivers/driver_nl80211_capa.c
+@@ -18,6 +18,7 @@
+ #include "common/qca-vendor-attr.h"
+ #include "common/brcm_vendor.h"
+ #include "driver_nl80211.h"
++#include "common/mtk_vendor.h"
+
+
+ static int protocol_feature_handler(struct nl_msg *msg, void *arg)
+@@ -1134,6 +1135,12 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
+ break;
+ }
+ #endif /* CONFIG_DRIVER_NL80211_BRCM */
++ } else if (vinfo->vendor_id == OUI_MTK) {
++ switch (vinfo->subcmd) {
++ case MTK_NL80211_VENDOR_SUBCMD_EDCCA_CTRL:
++ drv->mtk_edcca_vendor_cmd_avail = 1;
++ break;
++ }
+ }
+
+ wpa_printf(MSG_DEBUG, "nl80211: Supported vendor command: vendor_id=0x%x subcmd=%u",
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0013-mtk-hostapd-Add-hostapd-MU-SET-GET-control.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0013-mtk-hostapd-Add-hostapd-MU-SET-GET-control.patch
new file mode 100644
index 0000000..b87e945
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0013-mtk-hostapd-Add-hostapd-MU-SET-GET-control.patch
@@ -0,0 +1,454 @@
+From 2d182d0ee69c6d962ee4fa96e30952f8810a0fce Mon Sep 17 00:00:00 2001
+From: TomLiu <tomml.liu@mediatek.com>
+Date: Tue, 9 Aug 2022 10:23:44 -0700
+Subject: [PATCH 13/69] mtk: hostapd: Add hostapd MU SET/GET control
+
+---
+ hostapd/config_file.c | 9 +++
+ hostapd/ctrl_iface.c | 66 ++++++++++++++++++
+ hostapd/hostapd_cli.c | 18 +++++
+ src/ap/ap_config.c | 1 +
+ src/ap/ap_config.h | 1 +
+ src/ap/ap_drv_ops.c | 14 ++++
+ src/ap/ap_drv_ops.h | 2 +
+ src/ap/hostapd.c | 2 +
+ src/common/mtk_vendor.h | 15 ++++
+ src/drivers/driver.h | 13 ++++
+ src/drivers/driver_nl80211.c | 110 ++++++++++++++++++++++++++++++
+ src/drivers/driver_nl80211.h | 1 +
+ src/drivers/driver_nl80211_capa.c | 3 +
+ 13 files changed, 255 insertions(+)
+
+diff --git a/hostapd/config_file.c b/hostapd/config_file.c
+index f8c1eec0a..637c2df9f 100644
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -4159,6 +4159,15 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ return 1;
+ }
+ conf->mbssid = mbssid;
++ } else if (os_strcmp(buf, "mu_onoff") == 0) {
++ int val = atoi(pos);
++ if (val < 0 || val > 15) {
++ wpa_printf(MSG_ERROR,
++ "Line %d: invalid mu_onoff value",
++ line);
++ return 1;
++ }
++ conf->mu_onoff = val;
+ #endif /* CONFIG_IEEE80211AX */
+ } else if (os_strcmp(buf, "max_listen_interval") == 0) {
+ bss->max_listen_interval = atoi(pos);
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index c9764ac71..ef406da42 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -4070,6 +4070,67 @@ fail:
+ #endif /* CONFIG_NAN_USD */
+
+
++static int
++hostapd_ctrl_iface_set_mu(struct hostapd_data *hapd, char *cmd,
++ char *buf, size_t buflen)
++{
++ char *pos, *config, *value;
++ config = cmd;
++ pos = os_strchr(config, ' ');
++ if (pos == NULL)
++ return -1;
++ *pos++ = '\0';
++
++ if(pos == NULL)
++ return -1;
++ value = pos;
++
++ if (os_strcmp(config, "onoff") == 0) {
++ int mu = atoi(value);
++ if (mu < 0 || mu > 15) {
++ wpa_printf(MSG_ERROR, "Invalid value for mu");
++ return -1;
++ }
++ hapd->iconf->mu_onoff = (u8) mu;
++ } else {
++ wpa_printf(MSG_ERROR,
++ "Unsupported parameter %s for SET_MU", config);
++ return -1;
++ }
++
++ if(hostapd_drv_mu_ctrl(hapd) == 0) {
++ return os_snprintf(buf, buflen, "OK\n");
++ } else {
++ return -1;
++ }
++}
++
++
++static int
++hostapd_ctrl_iface_get_mu(struct hostapd_data *hapd, char *buf,
++ size_t buflen)
++{
++ u8 mu_onoff;
++ char *pos, *end;
++
++ pos = buf;
++ end = buf + buflen;
++
++ if (hapd->iface->state != HAPD_IFACE_ENABLED)
++ return os_snprintf(pos, end - pos, "Not allowed to get_mu when current state is %s\n",
++ hostapd_state_text(hapd->iface->state));
++
++ if (hostapd_drv_mu_dump(hapd, &mu_onoff) == 0) {
++ hapd->iconf->mu_onoff = mu_onoff;
++ return os_snprintf(pos, end - pos, "[hostapd_cli] = UL MU-MIMO: %d, DL MU-MIMO: %d, UL OFDMA: %d, DL OFDMA: %d\n",
++ !!(mu_onoff&BIT(3)), !!(mu_onoff&BIT(2)), !!(mu_onoff&BIT(1)), !!(mu_onoff&BIT(0)));
++ } else {
++ wpa_printf(MSG_INFO, "ctrl iface failed to call");
++ return -1;
++ }
++}
++
++
+ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ char *buf, char *reply,
+ int reply_size,
+@@ -4676,6 +4737,11 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ } else if (os_strncmp(buf, "GET_EDCCA ", 10) == 0) {
+ reply_len = hostapd_ctrl_iface_get_edcca(hapd, buf+10, reply,
+ reply_size);
++ } else if (os_strncmp(buf, "SET_MU ", 7) == 0) {
++ reply_len = hostapd_ctrl_iface_set_mu(hapd, buf + 7, reply,
++ reply_size);
++ } else if (os_strncmp(buf, "GET_MU", 6) == 0) {
++ reply_len = hostapd_ctrl_iface_get_mu(hapd, reply, reply_size);
+ } else {
+ os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
+ reply_len = 16;
+diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
+index 1fb6d999e..da9dabd6f 100644
+--- a/hostapd/hostapd_cli.c
++++ b/hostapd/hostapd_cli.c
+@@ -1442,6 +1442,20 @@ static int hostapd_cli_cmd_driver_flags2(struct wpa_ctrl *ctrl, int argc,
+ }
+
+
++static int hostapd_cli_cmd_set_mu(struct wpa_ctrl *ctrl, int argc,
++ char *argv[])
++{
++ return hostapd_cli_cmd(ctrl, "SET_MU", 1, argc, argv);
++}
++
++
++static int hostapd_cli_cmd_get_mu(struct wpa_ctrl *ctrl, int argc,
++ char *argv[])
++{
++ return hostapd_cli_cmd(ctrl, "GET_MU", 0, NULL, NULL);
++}
++
++
+ #ifdef CONFIG_DPP
+
+ static int hostapd_cli_cmd_dpp_qr_code(struct wpa_ctrl *ctrl, int argc,
+@@ -1801,6 +1815,10 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
+ " = show supported driver flags"},
+ { "driver_flags2", hostapd_cli_cmd_driver_flags2, NULL,
+ " = show supported driver flags2"},
++ { "set_mu", hostapd_cli_cmd_set_mu, NULL,
++ "<value> [0-15] bitmap- UL MU-MIMO(bit3), DL MU-MIMO(bit2), UL OFDMA(bit1), DL OFDMA(bit0)"},
++ { "get_mu", hostapd_cli_cmd_get_mu, NULL,
++ " = show mu onoff value in 0-15 bitmap"},
+ #ifdef CONFIG_DPP
+ { "dpp_qr_code", hostapd_cli_cmd_dpp_qr_code, NULL,
+ "report a scanned DPP URI from a QR Code" },
+diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
+index 965600577..9b3ef0b5b 100644
+--- a/src/ap/ap_config.c
++++ b/src/ap/ap_config.c
+@@ -289,6 +289,7 @@ struct hostapd_config * hostapd_config_defaults(void)
+ conf->reg_def_cli_eirp_psd = -1;
+ conf->reg_sub_cli_eirp_psd = -1;
+ conf->reg_def_cli_eirp = -1;
++ conf->mu_onoff = 15;
+ #endif /* CONFIG_IEEE80211AX */
+
+ /* The third octet of the country string uses an ASCII space character
+diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
+index 09718fada..f7dbbbec3 100644
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -1185,6 +1185,7 @@ struct hostapd_config {
+ int reg_def_cli_eirp;
+
+ bool require_he;
++ u8 mu_onoff;
+ #endif /* CONFIG_IEEE80211AX */
+
+ /* VHT enable/disable config from CHAN_SWITCH */
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index ec95738a0..5e29b802f 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -1240,3 +1240,17 @@ int hostapd_drv_get_edcca(struct hostapd_data *hapd, const u8 mode, u8 *value)
+ return 0;
+ return hapd->driver->get_edcca(hapd->drv_priv, mode, value);
+ }
++
++int hostapd_drv_mu_ctrl(struct hostapd_data *hapd)
++{
++ if (!hapd->driver || !hapd->driver->mu_ctrl)
++ return 0;
++ return hapd->driver->mu_ctrl(hapd->drv_priv, hapd->iconf->mu_onoff);
++}
++
++int hostapd_drv_mu_dump(struct hostapd_data *hapd, u8 *mu_onoff)
++{
++ if (!hapd->driver || !hapd->driver->mu_dump)
++ return 0;
++ return hapd->driver->mu_dump(hapd->drv_priv, mu_onoff);
++}
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index cb9d7b9ea..8a7a5ddfa 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -148,6 +148,8 @@ int hostapd_drv_configure_edcca_enable(struct hostapd_data *hapd);
+ int hostapd_drv_configure_edcca_threshold(struct hostapd_data *hapd,
+ const int *threshold);
+ int hostapd_drv_get_edcca(struct hostapd_data *hapd, const u8 mode, u8 *value);
++int hostapd_drv_mu_ctrl(struct hostapd_data *hapd);
++int hostapd_drv_mu_dump(struct hostapd_data *hapd, u8 *mu_onoff);
+
+ #include "drivers/driver.h"
+
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index 39f447f89..eff9b53f7 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -2619,6 +2619,8 @@ dfs_offload:
+ if (hostapd_drv_configure_edcca_threshold(hapd,
+ hapd->iconf->edcca_threshold) < 0)
+ goto fail;
++ if (hostapd_drv_mu_ctrl(hapd) < 0)
++ goto fail;
+
+ wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
+ iface->bss[0]->conf->iface);
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+index 6121857dd..60bc4cd4c 100644
+--- a/src/common/mtk_vendor.h
++++ b/src/common/mtk_vendor.h
+@@ -10,6 +10,8 @@ enum mtk_nl80211_vendor_subcmds {
+ MTK_NL80211_VENDOR_SUBCMD_CSI_CTRL = 0xc2,
+ MTK_NL80211_VENDOR_SUBCMD_RFEATURE_CTRL = 0xc3,
+ MTK_NL80211_VENDOR_SUBCMD_WIRELESS_CTRL = 0xc4,
++ MTK_NL80211_VENDOR_SUBCMD_MU_CTRL = 0xc5,
++ MTK_NL80211_VENDOR_SUBCMD_PHY_CAPA_CTRL= 0xc6,
+ MTK_NL80211_VENDOR_SUBCMD_EDCCA_CTRL = 0xc7,
+ };
+
+@@ -177,6 +179,19 @@ enum mtk_vendor_attr_rfeature_ctrl {
+ NUM_MTK_VENDOR_ATTRS_RFEATURE_CTRL - 1
+ };
+
++enum mtk_vendor_attr_mu_ctrl {
++ MTK_VENDOR_ATTR_MU_CTRL_UNSPEC,
++
++ MTK_VENDOR_ATTR_MU_CTRL_ONOFF,
++ MTK_VENDOR_ATTR_MU_CTRL_DUMP,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_MU_CTRL,
++ MTK_VENDOR_ATTR_MU_CTRL_MAX =
++ NUM_MTK_VENDOR_ATTRS_MU_CTRL - 1
++};
++
++
+ #define CSI_MAX_COUNT 256
+ #define ETH_ALEN 6
+
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index 37aabc695..4fa5006bc 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -176,6 +176,11 @@ struct hostapd_channel_data {
+ * punct_bitmap - RU puncturing bitmap
+ */
+ u16 punct_bitmap;
++
++ /**
++ * mu onoff=<val> (bitmap- UL MU-MIMO(bit3), DL MU-MIMO(bit2), UL OFDMA(bit1), DL OFDMA(bit0))
++ */
++ u8 mu_onoff;
+ };
+
+ #define HE_MAC_CAPAB_0 0
+@@ -5187,6 +5192,14 @@ struct wpa_driver_ops {
+ const s8 edcca_compensation);
+ int (*configure_edcca_threshold)(void *priv, const int *threshold);
+ int (*get_edcca)(void *priv, const u8 mode, u8 *value);
++
++ /**
++ * mu_ctrl - ctrl on off for UL/DL MURU
++ * @priv: Private driver interface data
++ *
++ */
++ int (*mu_ctrl)(void *priv, u8 mu_onoff);
++ int (*mu_dump)(void *priv, u8 *mu_onoff);
+ };
+
+ /**
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index df6593cc1..561b48072 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -13829,6 +13829,114 @@ fail:
+ }
+
+
++#ifdef CONFIG_IEEE80211AX
++static int nl80211_mu_onoff(void *priv, u8 mu_onoff)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *data;
++ int ret;
++
++ if (!drv->mtk_mu_vendor_cmd_avail) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Driver does not support setting mu control");
++ return 0;
++ }
++
++ if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, MTK_NL80211_VENDOR_SUBCMD_MU_CTRL) ||
++ !(data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_MU_CTRL_ONOFF, mu_onoff)) {
++ nlmsg_free(msg);
++ return -ENOBUFS;
++ }
++ nla_nest_end(msg, data);
++ ret = send_and_recv_cmd(drv, msg);
++ if(ret){
++ wpa_printf(MSG_ERROR, "Failed to set mu_onoff. ret=%d (%s)", ret, strerror(-ret));
++ }
++ return ret;
++}
++
++
++static int mu_dump_handler(struct nl_msg *msg, void *arg)
++{
++ u8 *mu_onoff = (u8 *) arg;
++ struct nlattr *tb[NL80211_ATTR_MAX + 1];
++ struct nlattr *tb_vendor[MTK_VENDOR_ATTR_MU_CTRL_MAX + 1];
++ struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
++ struct nlattr *nl_vend, *attr;
++
++ static const struct nla_policy
++ mu_ctrl_policy[NUM_MTK_VENDOR_ATTRS_MU_CTRL + 1] = {
++ [MTK_VENDOR_ATTR_MU_CTRL_ONOFF] = {.type = NLA_U8 },
++ [MTK_VENDOR_ATTR_MU_CTRL_DUMP] = {.type = NLA_U8 },
++ };
++
++ nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
++ genlmsg_attrlen(gnlh, 0), NULL);
++
++ nl_vend = tb[NL80211_ATTR_VENDOR_DATA];
++ if (!nl_vend)
++ return NL_SKIP;
++
++ nla_parse(tb_vendor, MTK_VENDOR_ATTR_MU_CTRL_MAX,
++ nla_data(nl_vend), nla_len(nl_vend), NULL);
++
++ attr = tb_vendor[MTK_VENDOR_ATTR_MU_CTRL_DUMP];
++ if (!attr) {
++ wpa_printf(MSG_ERROR, "nl80211: cannot find MTK_VENDOR_ATTR_MU_CTRL_DUMP");
++ return NL_SKIP;
++ }
++
++ *mu_onoff = nla_get_u8(attr);
++ wpa_printf(MSG_DEBUG, "nla_get mu_onoff: %d\n", *mu_onoff);
++
++ return 0;
++}
++
++static int nl80211_mu_dump(void *priv, u8 *mu_onoff)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *attr;
++ int ret;
++
++ if (!drv->mtk_mu_vendor_cmd_avail) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Driver does not support setting mu control");
++ return 0;
++ }
++
++ if (!(msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_VENDOR)) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, MTK_NL80211_VENDOR_SUBCMD_MU_CTRL)) {
++ nlmsg_free(msg);
++ return -ENOBUFS;
++ }
++
++ attr = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA);
++ if (!attr) {
++ nlmsg_free(msg);
++ return -1;
++ }
++
++ nla_nest_end(msg, attr);
++
++ ret = send_and_recv_resp(drv, msg, mu_dump_handler, mu_onoff);
++
++ if(ret){
++ wpa_printf(MSG_ERROR, "Failed to get mu_onoff. ret=%d (%s)", ret, strerror(-ret));
++ }
++
++ return ret;
++}
++#endif /* CONFIG_IEEE80211AX */
++
++
+ #ifdef CONFIG_DPP
+ static int nl80211_dpp_listen(void *priv, bool enable)
+ {
+@@ -14276,6 +14384,8 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .update_connect_params = nl80211_update_connection_params,
+ .send_external_auth_status = nl80211_send_external_auth_status,
+ .set_4addr_mode = nl80211_set_4addr_mode,
++ .mu_ctrl = nl80211_mu_onoff,
++ .mu_dump = nl80211_mu_dump,
+ #ifdef CONFIG_DPP
+ .dpp_listen = nl80211_dpp_listen,
+ #endif /* CONFIG_DPP */
+diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
+index 08ab00de3..eb9f92b45 100644
+--- a/src/drivers/driver_nl80211.h
++++ b/src/drivers/driver_nl80211.h
+@@ -200,6 +200,7 @@ struct wpa_driver_nl80211_data {
+ unsigned int puncturing:1;
+ unsigned int qca_ap_allowed_freqs:1;
+ unsigned int mtk_edcca_vendor_cmd_avail:1;
++ unsigned int mtk_mu_vendor_cmd_avail:1;
+
+ u32 ignore_next_local_disconnect;
+ u32 ignore_next_local_deauth;
+diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
+index 76377fe8c..02491f33b 100644
+--- a/src/drivers/driver_nl80211_capa.c
++++ b/src/drivers/driver_nl80211_capa.c
+@@ -1140,6 +1140,9 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
+ case MTK_NL80211_VENDOR_SUBCMD_EDCCA_CTRL:
+ drv->mtk_edcca_vendor_cmd_avail = 1;
+ break;
++ case MTK_NL80211_VENDOR_SUBCMD_MU_CTRL :
++ drv->mtk_mu_vendor_cmd_avail = 1;
++ break;
+ }
+ }
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0014-mtk-hostapd-Add-three-wire-PTA-ctrl-hostapd-vendor-c.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0014-mtk-hostapd-Add-three-wire-PTA-ctrl-hostapd-vendor-c.patch
new file mode 100644
index 0000000..ddf1641
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0014-mtk-hostapd-Add-three-wire-PTA-ctrl-hostapd-vendor-c.patch
@@ -0,0 +1,247 @@
+From 02fca6027ae7dc35f2305bfaaa71fab29c40c794 Mon Sep 17 00:00:00 2001
+From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+Date: Fri, 2 Sep 2022 01:03:23 +0800
+Subject: [PATCH 14/69] mtk: hostapd: Add three wire PTA ctrl hostapd vendor
+ command
+
+Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+---
+ hostapd/config_file.c | 4 ++++
+ src/ap/ap_config.c | 1 +
+ src/ap/ap_config.h | 13 ++++++++++++
+ src/ap/ap_drv_ops.c | 11 +++++++++++
+ src/ap/ap_drv_ops.h | 1 +
+ src/ap/hostapd.c | 2 ++
+ src/common/mtk_vendor.h | 16 +++++++++++++++
+ src/drivers/driver.h | 8 ++++++++
+ src/drivers/driver_nl80211.c | 33 +++++++++++++++++++++++++++++++
+ src/drivers/driver_nl80211.h | 1 +
+ src/drivers/driver_nl80211_capa.c | 3 +++
+ 11 files changed, 93 insertions(+)
+
+diff --git a/hostapd/config_file.c b/hostapd/config_file.c
+index 637c2df9f..3d9923692 100644
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -5391,6 +5391,10 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ return 1;
+ }
+ conf->edcca_compensation = (s8) val;
++ } else if (os_strcmp(buf, "three_wire_enable") == 0) {
++ u8 en = atoi(pos);
++
++ conf->three_wire_enable = en;
+ } else {
+ wpa_printf(MSG_ERROR,
+ "Line %d: unknown configuration item '%s'",
+diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
+index 9b3ef0b5b..79fd3a24b 100644
+--- a/src/ap/ap_config.c
++++ b/src/ap/ap_config.c
+@@ -306,6 +306,7 @@ struct hostapd_config * hostapd_config_defaults(void)
+
+ conf->edcca_enable = EDCCA_MODE_AUTO;
+ conf->edcca_compensation = EDCCA_DEFAULT_COMPENSATION;
++ conf->three_wire_enable = THREE_WIRE_MODE_DISABLE;
+
+ hostapd_set_and_check_bw320_offset(conf, 0);
+
+diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
+index f7dbbbec3..d1bbd238c 100644
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -1286,6 +1286,19 @@ struct hostapd_config {
+ u8 edcca_enable;
+ s8 edcca_compensation;
+ int *edcca_threshold;
++ u8 three_wire_enable;
++};
++
++enum three_wire_mode {
++ THREE_WIRE_MODE_DISABLE,
++ THREE_WIRE_MODE_EXT0_ENABLE,
++ THREE_WIRE_MODE_EXT1_ENABLE,
++ THREE_WIRE_MODE_ALL_ENABLE,
++
++ /* keep last */
++ NUM_THREE_WIRE_MODE,
++ THREE_WIRE_MODE_MAX =
++ NUM_THREE_WIRE_MODE - 1
+ };
+
+ enum edcca_mode {
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index 5e29b802f..22a727890 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -1254,3 +1254,14 @@ int hostapd_drv_mu_dump(struct hostapd_data *hapd, u8 *mu_onoff)
+ return 0;
+ return hapd->driver->mu_dump(hapd->drv_priv, mu_onoff);
+ }
++
++int hostapd_drv_three_wire_ctrl(struct hostapd_data *hapd)
++{
++ if (!hapd->driver || !hapd->driver->three_wire_ctrl)
++ return 0;
++ if (hapd->iconf->three_wire_enable > THREE_WIRE_MODE_MAX) {
++ wpa_printf(MSG_INFO, "Invalid value for three wire enable\n");
++ return 0;
++ }
++ return hapd->driver->three_wire_ctrl(hapd->drv_priv, hapd->iconf->three_wire_enable);
++}
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index 8a7a5ddfa..48495edd7 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -150,6 +150,7 @@ int hostapd_drv_configure_edcca_threshold(struct hostapd_data *hapd,
+ int hostapd_drv_get_edcca(struct hostapd_data *hapd, const u8 mode, u8 *value);
+ int hostapd_drv_mu_ctrl(struct hostapd_data *hapd);
+ int hostapd_drv_mu_dump(struct hostapd_data *hapd, u8 *mu_onoff);
++int hostapd_drv_three_wire_ctrl(struct hostapd_data *hapd);
+
+ #include "drivers/driver.h"
+
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index eff9b53f7..0a9f7999e 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -2621,6 +2621,8 @@ dfs_offload:
+ goto fail;
+ if (hostapd_drv_mu_ctrl(hapd) < 0)
+ goto fail;
++ if (hostapd_drv_three_wire_ctrl(hapd) < 0)
++ goto fail;
+
+ wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
+ iface->bss[0]->conf->iface);
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+index 60bc4cd4c..99ecbaf71 100644
+--- a/src/common/mtk_vendor.h
++++ b/src/common/mtk_vendor.h
+@@ -13,6 +13,7 @@ enum mtk_nl80211_vendor_subcmds {
+ MTK_NL80211_VENDOR_SUBCMD_MU_CTRL = 0xc5,
+ MTK_NL80211_VENDOR_SUBCMD_PHY_CAPA_CTRL= 0xc6,
+ MTK_NL80211_VENDOR_SUBCMD_EDCCA_CTRL = 0xc7,
++ MTK_NL80211_VENDOR_SUBCMD_3WIRE_CTRL = 0xc8
+ };
+
+ enum mtk_vendor_attr_edcca_ctrl {
+@@ -58,6 +59,21 @@ static struct nla_policy edcca_ctrl_policy[NUM_MTK_VENDOR_ATTRS_EDCCA_CTRL] = {
+ [MTK_VENDOR_ATTR_EDCCA_CTRL_SEC160_VAL] = { .type = NLA_U8 },
+ };
+
++enum mtk_vendor_attr_3wire_ctrl {
++ MTK_VENDOR_ATTR_3WIRE_CTRL_UNSPEC,
++
++ MTK_VENDOR_ATTR_3WIRE_CTRL_MODE,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_3WIRE_CTRL,
++ MTK_VENDOR_ATTR_3WIRE_CTRL_MAX =
++ NUM_MTK_VENDOR_ATTRS_3WIRE_CTRL - 1
++};
++
++static struct nla_policy three_wire_ctrl_policy[NUM_MTK_VENDOR_ATTRS_3WIRE_CTRL] = {
++ [MTK_VENDOR_ATTR_3WIRE_CTRL_MODE] = {.type = NLA_U8 },
++};
++
+ enum mtk_vendor_attr_csi_ctrl {
+ MTK_VENDOR_ATTR_CSI_CTRL_UNSPEC,
+
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index 4fa5006bc..f26492577 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -5200,6 +5200,14 @@ struct wpa_driver_ops {
+ */
+ int (*mu_ctrl)(void *priv, u8 mu_onoff);
+ int (*mu_dump)(void *priv, u8 *mu_onoff);
++
++ /**
++ * three_wire_ctrl - set three_wire_ctrl mode
++ * @priv: Private driver interface data
++ * @three_wire_enable: three_wire_ctrl mode
++ *
++ */
++ int (*three_wire_ctrl)(void *priv, u8 three_wire_enable);
+ };
+
+ /**
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index 561b48072..7d6ce153d 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -14237,6 +14237,38 @@ static int nl80211_get_edcca(void *priv, const u8 mode, u8 *value)
+ return ret;
+ }
+
++static int nl80211_enable_three_wire(void *priv, const u8 three_wire_enable)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ /* Prepare nl80211 cmd */
++ struct nl_msg *msg;
++ struct nlattr *data;
++ int ret;
++
++ if (!drv->mtk_3wire_vendor_cmd_avail) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Driver does not support setting three wire control");
++ return 0;
++ }
++
++ if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
++ MTK_NL80211_VENDOR_SUBCMD_3WIRE_CTRL) ||
++ !(data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_3WIRE_CTRL_MODE, three_wire_enable)) {
++ nlmsg_free(msg);
++ return -ENOBUFS;
++ }
++ nla_nest_end(msg, data);
++ ret = send_and_recv_cmd(drv, msg);
++ if (ret) {
++ wpa_printf(MSG_ERROR, "Failed to enable three wire. ret=%d (%s) ",
++ ret, strerror(-ret));
++ }
++ return ret;
++}
+
+ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .name = "nl80211",
+@@ -14399,4 +14431,5 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .configure_edcca_enable = nl80211_configure_edcca_enable,
+ .configure_edcca_threshold = nl80211_configure_edcca_threshold,
+ .get_edcca = nl80211_get_edcca,
++ .three_wire_ctrl = nl80211_enable_three_wire,
+ };
+diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
+index eb9f92b45..9b25720ce 100644
+--- a/src/drivers/driver_nl80211.h
++++ b/src/drivers/driver_nl80211.h
+@@ -201,6 +201,7 @@ struct wpa_driver_nl80211_data {
+ unsigned int qca_ap_allowed_freqs:1;
+ unsigned int mtk_edcca_vendor_cmd_avail:1;
+ unsigned int mtk_mu_vendor_cmd_avail:1;
++ unsigned int mtk_3wire_vendor_cmd_avail:1;
+
+ u32 ignore_next_local_disconnect;
+ u32 ignore_next_local_deauth;
+diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
+index 02491f33b..23c92eb89 100644
+--- a/src/drivers/driver_nl80211_capa.c
++++ b/src/drivers/driver_nl80211_capa.c
+@@ -1143,6 +1143,9 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
+ case MTK_NL80211_VENDOR_SUBCMD_MU_CTRL :
+ drv->mtk_mu_vendor_cmd_avail = 1;
+ break;
++ case MTK_NL80211_VENDOR_SUBCMD_3WIRE_CTRL :
++ drv->mtk_3wire_vendor_cmd_avail = 1;
++ break;
+ }
+ }
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0015-mtk-hostapd-Add-hostapd-iBF-control.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0015-mtk-hostapd-Add-hostapd-iBF-control.patch
new file mode 100644
index 0000000..6f7b22c
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0015-mtk-hostapd-Add-hostapd-iBF-control.patch
@@ -0,0 +1,431 @@
+From a955e404fc79d02b6f9a219ceed2e8e2fe3f57a0 Mon Sep 17 00:00:00 2001
+From: mtk27835 <shurong.wen@mediatek.com>
+Date: Wed, 7 Sep 2022 14:41:51 -0700
+Subject: [PATCH 15/69] mtk: hostapd: Add hostapd iBF control
+
+Signed-off-by: mtk27835 <shurong.wen@mediatek.com>
+---
+ hostapd/config_file.c | 3 +
+ hostapd/ctrl_iface.c | 26 +++++++
+ hostapd/hostapd_cli.c | 9 +++
+ src/ap/ap_config.c | 1 +
+ src/ap/ap_config.h | 2 +
+ src/ap/ap_drv_ops.c | 14 ++++
+ src/ap/ap_drv_ops.h | 2 +
+ src/ap/hostapd.c | 2 +
+ src/common/mtk_vendor.h | 35 +++++++++-
+ src/drivers/driver.h | 19 ++++++
+ src/drivers/driver_nl80211.c | 108 ++++++++++++++++++++++++++++++
+ src/drivers/driver_nl80211.h | 1 +
+ src/drivers/driver_nl80211_capa.c | 3 +
+ 13 files changed, 224 insertions(+), 1 deletion(-)
+
+diff --git a/hostapd/config_file.c b/hostapd/config_file.c
+index 3d9923692..247d68811 100644
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -5395,6 +5395,9 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ u8 en = atoi(pos);
+
+ conf->three_wire_enable = en;
++ } else if (os_strcmp(buf, "ibf_enable") == 0) { /*ibf setting is per device*/
++ int val = atoi(pos);
++ conf->ibf_enable = !!val;
+ } else {
+ wpa_printf(MSG_ERROR,
+ "Line %d: unknown configuration item '%s'",
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index ef406da42..cf1a194a9 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -4131,6 +4131,30 @@ hostapd_ctrl_iface_get_mu(struct hostapd_data *hapd, char *buf,
+ }
+
+
++static int
++hostapd_ctrl_iface_get_ibf(struct hostapd_data *hapd, char *buf,
++ size_t buflen)
++{
++ u8 ibf_enable;
++ int ret;
++ char *pos, *end;
++
++ pos = buf;
++ end = buf + buflen;
++
++ if (hostapd_drv_ibf_dump(hapd, &ibf_enable) == 0) {
++ hapd->iconf->ibf_enable = ibf_enable;
++ ret = os_snprintf(pos, end - pos, "ibf_enable: %u\n",
++ ibf_enable);
++ }
++
++ if (os_snprintf_error(end - pos, ret))
++ return 0;
++
++ return ret;
++}
++
++
+ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ char *buf, char *reply,
+ int reply_size,
+@@ -4742,6 +4766,8 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ reply_size);
+ } else if (os_strncmp(buf, "GET_MU", 6) == 0) {
+ reply_len = hostapd_ctrl_iface_get_mu(hapd, reply, reply_size);
++ } else if (os_strncmp(buf, "GET_IBF", 7) == 0) {
++ reply_len = hostapd_ctrl_iface_get_ibf(hapd, reply, reply_size);
+ } else {
+ os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
+ reply_len = 16;
+diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
+index da9dabd6f..276ca578c 100644
+--- a/hostapd/hostapd_cli.c
++++ b/hostapd/hostapd_cli.c
+@@ -1666,6 +1666,13 @@ static int hostapd_cli_cmd_driver(struct wpa_ctrl *ctrl, int argc, char *argv[])
+ #endif /* ANDROID */
+
+
++static int hostapd_cli_cmd_get_ibf(struct wpa_ctrl *ctrl, int argc,
++ char *argv[])
++{
++ return hostapd_cli_cmd(ctrl, "GET_IBF", 0, NULL, NULL);
++}
++
++
+ struct hostapd_cli_cmd {
+ const char *cmd;
+ int (*handler)(struct wpa_ctrl *ctrl, int argc, char *argv[]);
+@@ -1889,6 +1896,8 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
+ #endif /* ANDROID */
+ { "inband_discovery", hostapd_cli_cmd_inband_discovery, NULL,
+ "<tx type(0/1/2)> <interval> = runtime set inband discovery" },
++ { "get_ibf", hostapd_cli_cmd_get_ibf, NULL,
++ " = show iBF state (enabled/disabled)"},
+ { NULL, NULL, NULL, NULL }
+ };
+
+diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
+index 79fd3a24b..04e263167 100644
+--- a/src/ap/ap_config.c
++++ b/src/ap/ap_config.c
+@@ -307,6 +307,7 @@ struct hostapd_config * hostapd_config_defaults(void)
+ conf->edcca_enable = EDCCA_MODE_AUTO;
+ conf->edcca_compensation = EDCCA_DEFAULT_COMPENSATION;
+ conf->three_wire_enable = THREE_WIRE_MODE_DISABLE;
++ conf->ibf_enable = IBF_DEFAULT_ENABLE;
+
+ hostapd_set_and_check_bw320_offset(conf, 0);
+
+diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
+index d1bbd238c..5f084796d 100644
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -1287,6 +1287,7 @@ struct hostapd_config {
+ s8 edcca_compensation;
+ int *edcca_threshold;
+ u8 three_wire_enable;
++ u8 ibf_enable;
+ };
+
+ enum three_wire_mode {
+@@ -1450,6 +1451,7 @@ hostapd_set_and_check_bw320_offset(struct hostapd_config *conf,
+ #endif /* CONFIG_IEEE80211BE */
+ }
+
++#define IBF_DEFAULT_ENABLE 0
+
+ int hostapd_mac_comp(const void *a, const void *b);
+ struct hostapd_config * hostapd_config_defaults(void);
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index 22a727890..d194dd59c 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -1265,3 +1265,17 @@ int hostapd_drv_three_wire_ctrl(struct hostapd_data *hapd)
+ }
+ return hapd->driver->three_wire_ctrl(hapd->drv_priv, hapd->iconf->three_wire_enable);
+ }
++
++int hostapd_drv_ibf_ctrl(struct hostapd_data *hapd)
++{
++ if (!hapd->driver || !hapd->driver->ibf_ctrl)
++ return 0;
++ return hapd->driver->ibf_ctrl(hapd->drv_priv, hapd->iconf->ibf_enable);
++}
++
++int hostapd_drv_ibf_dump(struct hostapd_data *hapd, u8 *ibf_enable)
++{
++ if (!hapd->driver || !hapd->driver->ibf_dump)
++ return 0;
++ return hapd->driver->ibf_dump(hapd->drv_priv, ibf_enable);
++}
+\ No newline at end of file
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index 48495edd7..96ff11ff9 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -151,6 +151,8 @@ int hostapd_drv_get_edcca(struct hostapd_data *hapd, const u8 mode, u8 *value);
+ int hostapd_drv_mu_ctrl(struct hostapd_data *hapd);
+ int hostapd_drv_mu_dump(struct hostapd_data *hapd, u8 *mu_onoff);
+ int hostapd_drv_three_wire_ctrl(struct hostapd_data *hapd);
++int hostapd_drv_ibf_ctrl(struct hostapd_data *hapd);
++int hostapd_drv_ibf_dump(struct hostapd_data *hapd, u8 *ibf_enable);
+
+ #include "drivers/driver.h"
+
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index 0a9f7999e..a0e28a2f8 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -2623,6 +2623,8 @@ dfs_offload:
+ goto fail;
+ if (hostapd_drv_three_wire_ctrl(hapd) < 0)
+ goto fail;
++ if (hostapd_drv_ibf_ctrl(hapd) < 0)
++ goto fail;
+
+ wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
+ iface->bss[0]->conf->iface);
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+index 99ecbaf71..9811f266e 100644
+--- a/src/common/mtk_vendor.h
++++ b/src/common/mtk_vendor.h
+@@ -13,7 +13,8 @@ enum mtk_nl80211_vendor_subcmds {
+ MTK_NL80211_VENDOR_SUBCMD_MU_CTRL = 0xc5,
+ MTK_NL80211_VENDOR_SUBCMD_PHY_CAPA_CTRL= 0xc6,
+ MTK_NL80211_VENDOR_SUBCMD_EDCCA_CTRL = 0xc7,
+- MTK_NL80211_VENDOR_SUBCMD_3WIRE_CTRL = 0xc8
++ MTK_NL80211_VENDOR_SUBCMD_3WIRE_CTRL = 0xc8,
++ MTK_NL80211_VENDOR_SUBCMD_IBF_CTRL = 0xc9,
+ };
+
+ enum mtk_vendor_attr_edcca_ctrl {
+@@ -207,6 +208,38 @@ enum mtk_vendor_attr_mu_ctrl {
+ NUM_MTK_VENDOR_ATTRS_MU_CTRL - 1
+ };
+
++enum mtk_vendor_attr_ibf_ctrl {
++ MTK_VENDOR_ATTR_IBF_CTRL_UNSPEC,
++
++ MTK_VENDOR_ATTR_IBF_CTRL_ENABLE,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_IBF_CTRL,
++ MTK_VENDOR_ATTR_IBF_CTRL_MAX =
++ NUM_MTK_VENDOR_ATTRS_IBF_CTRL - 1
++};
++
++enum mtk_vendor_attr_ibf_dump {
++ MTK_VENDOR_ATTR_IBF_DUMP_UNSPEC,
++
++ MTK_VENDOR_ATTR_IBF_DUMP_ENABLE,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_IBF_DUMP,
++ MTK_VENDOR_ATTR_IBF_DUMP_MAX =
++ NUM_MTK_VENDOR_ATTRS_IBF_DUMP - 1
++};
++
++static struct nla_policy
++ibf_ctrl_policy[NUM_MTK_VENDOR_ATTRS_IBF_CTRL] = {
++ [MTK_VENDOR_ATTR_IBF_CTRL_ENABLE] = { .type = NLA_U8 },
++};
++
++static struct nla_policy
++ibf_dump_policy[NUM_MTK_VENDOR_ATTRS_IBF_DUMP] = {
++ [MTK_VENDOR_ATTR_IBF_DUMP_ENABLE] = { .type = NLA_U8 },
++};
++
+
+ #define CSI_MAX_COUNT 256
+ #define ETH_ALEN 6
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index f26492577..d9387c01b 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -181,6 +181,11 @@ struct hostapd_channel_data {
+ * mu onoff=<val> (bitmap- UL MU-MIMO(bit3), DL MU-MIMO(bit2), UL OFDMA(bit1), DL OFDMA(bit0))
+ */
+ u8 mu_onoff;
++
++ /**
++ * ibf_enable=<val>
++ */
++ u8 ibf_enable;
+ };
+
+ #define HE_MAC_CAPAB_0 0
+@@ -5208,6 +5213,20 @@ struct wpa_driver_ops {
+ *
+ */
+ int (*three_wire_ctrl)(void *priv, u8 three_wire_enable);
++
++ /**
++ * ibf_ctrl - ctrl disable/enable for ibf
++ * @priv: Private driver interface data
++ *
++ */
++ int (*ibf_ctrl)(void *priv, u8 ibf_enable);
++
++ /**
++ * ibf_dump - dump ibf
++ * @priv: Private driver interface data
++ *
++ */
++ int (*ibf_dump)(void *priv, u8 *ibf_enable);
+ };
+
+ /**
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index 7d6ce153d..fa7507fbb 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -14270,6 +14270,112 @@ static int nl80211_enable_three_wire(void *priv, const u8 three_wire_enable)
+ return ret;
+ }
+
++static int nl80211_ibf_enable(void *priv, u8 ibf_enable)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *data;
++ int ret;
++
++ if (!drv->mtk_ibf_vendor_cmd_avail) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Driver does not support setting ibf control");
++ return 0;
++ }
++
++ msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR);
++ if (!msg)
++ goto fail;
++
++ if (nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, MTK_NL80211_VENDOR_SUBCMD_IBF_CTRL))
++ goto fail;
++
++ data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA);
++ if (!data)
++ goto fail;
++
++ nla_put_u8(msg, MTK_VENDOR_ATTR_IBF_CTRL_ENABLE, ibf_enable);
++
++ nla_nest_end(msg, data);
++ ret = send_and_recv_cmd(drv, msg);
++ if (ret) {
++ wpa_printf(MSG_ERROR, "Failed to set ibf_enable. ret=%d (%s)", ret, strerror(-ret));
++ }
++
++ return ret;
++
++fail:
++ nlmsg_free(msg);
++ return -ENOBUFS;
++}
++
++static int ibf_dump_handler(struct nl_msg *msg, void *arg)
++{
++ u8 *ibf_enable = (u8 *) arg;
++ struct nlattr *tb[NL80211_ATTR_MAX + 1];
++ struct nlattr *tb_vendor[MTK_VENDOR_ATTR_IBF_DUMP_MAX + 1];
++ struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
++ struct nlattr *nl_vend, *attr;
++
++ nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
++ genlmsg_attrlen(gnlh, 0), NULL);
++
++ nl_vend = tb[NL80211_ATTR_VENDOR_DATA];
++ if (!nl_vend)
++ return NL_SKIP;
++
++ nla_parse(tb_vendor, MTK_VENDOR_ATTR_IBF_DUMP_MAX,
++ nla_data(nl_vend), nla_len(nl_vend), NULL);
++
++ attr = tb_vendor[MTK_VENDOR_ATTR_IBF_DUMP_ENABLE];
++ if (!attr) {
++ wpa_printf(MSG_ERROR, "nl80211: cannot find MTK_VENDOR_ATTR_IBF_DUMP_ENABLE");
++ return NL_SKIP;
++ }
++
++ *ibf_enable = nla_get_u8(attr);
++
++ return NL_SKIP;
++}
++
++static int
++nl80211_ibf_dump(void *priv, u8 *ibf_enable)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *data;
++ int ret;
++
++ msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_VENDOR);
++ if (!msg)
++ goto fail;
++
++ if (nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, MTK_NL80211_VENDOR_SUBCMD_IBF_CTRL))
++ goto fail;
++
++ data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA | NLA_F_NESTED);
++ if (!data)
++ goto fail;
++
++ nla_nest_end(msg, data);
++
++ ret = send_and_recv_resp(drv, msg, ibf_dump_handler, ibf_enable);
++
++ if (ret) {
++ wpa_printf(MSG_ERROR, "Failed to dump ibf_enable. ret=%d (%s)", ret, strerror(-ret));
++ }
++
++ return ret;
++
++fail:
++ nlmsg_free(msg);
++ return -ENOBUFS;
++}
++
+ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .name = "nl80211",
+ .desc = "Linux nl80211/cfg80211",
+@@ -14432,4 +14538,6 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .configure_edcca_threshold = nl80211_configure_edcca_threshold,
+ .get_edcca = nl80211_get_edcca,
+ .three_wire_ctrl = nl80211_enable_three_wire,
++ .ibf_ctrl = nl80211_ibf_enable,
++ .ibf_dump = nl80211_ibf_dump,
+ };
+diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
+index 9b25720ce..2133e0dd6 100644
+--- a/src/drivers/driver_nl80211.h
++++ b/src/drivers/driver_nl80211.h
+@@ -202,6 +202,7 @@ struct wpa_driver_nl80211_data {
+ unsigned int mtk_edcca_vendor_cmd_avail:1;
+ unsigned int mtk_mu_vendor_cmd_avail:1;
+ unsigned int mtk_3wire_vendor_cmd_avail:1;
++ unsigned int mtk_ibf_vendor_cmd_avail:1;
+
+ u32 ignore_next_local_disconnect;
+ u32 ignore_next_local_deauth;
+diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
+index 23c92eb89..4afc277dc 100644
+--- a/src/drivers/driver_nl80211_capa.c
++++ b/src/drivers/driver_nl80211_capa.c
+@@ -1146,6 +1146,9 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
+ case MTK_NL80211_VENDOR_SUBCMD_3WIRE_CTRL :
+ drv->mtk_3wire_vendor_cmd_avail = 1;
+ break;
++ case MTK_NL80211_VENDOR_SUBCMD_IBF_CTRL:
++ drv->mtk_ibf_vendor_cmd_avail = 1;
++ break;
+ }
+ }
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0016-mtk-hostapd-Do-not-include-HE-capab-IE-if-associated.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0016-mtk-hostapd-Do-not-include-HE-capab-IE-if-associated.patch
new file mode 100644
index 0000000..25718ba
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0016-mtk-hostapd-Do-not-include-HE-capab-IE-if-associated.patch
@@ -0,0 +1,34 @@
+From c00f971d14d1fa43e226ae889337fee14fe327f8 Mon Sep 17 00:00:00 2001
+From: Howard Hsu <howard-yh.hsu@mediatek.com>
+Date: Thu, 22 Sep 2022 16:08:09 +0800
+Subject: [PATCH 16/69] mtk: hostapd: Do not include HE capab IE if associated
+ sta's HE capab IE is invalid
+
+The parameter 'sta' passed to send_assoc_resp() might be NULL, so an
+NULL check is necessary before access the 'sta'.
+Only one such check was missed in this function, and this patch fixs it.
+
+CR-Id: WCNCR00289305
+Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
+Change-Id: I028b7779acfbce5292a60c9f800a83c57c999943
+---
+ src/ap/ieee802_11.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+index a774426c2..875054196 100644
+--- a/src/ap/ieee802_11.c
++++ b/src/ap/ieee802_11.c
+@@ -4935,7 +4935,8 @@ static u16 send_assoc_resp(struct hostapd_data *hapd, struct sta_info *sta,
+ #endif /* CONFIG_IEEE80211AC */
+
+ #ifdef CONFIG_IEEE80211AX
+- if (hapd->iconf->ieee80211ax && !hapd->conf->disable_11ax) {
++ if (hapd->iconf->ieee80211ax && !hapd->conf->disable_11ax && sta &&
++ sta->flags & WLAN_STA_HE) {
+ p = hostapd_eid_he_capab(hapd, p, IEEE80211_MODE_AP);
+ p = hostapd_eid_he_operation(hapd, p);
+ p = hostapd_eid_cca(hapd, p);
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0017-mtk-hostapd-Add-DFS-detection-mode.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0017-mtk-hostapd-Add-DFS-detection-mode.patch
new file mode 100644
index 0000000..27b6e9e
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0017-mtk-hostapd-Add-DFS-detection-mode.patch
@@ -0,0 +1,136 @@
+From 9c33aea73b6d8a375e6163abbb8b285308640287 Mon Sep 17 00:00:00 2001
+From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+Date: Mon, 20 Feb 2023 14:55:49 +0800
+Subject: [PATCH 17/69] mtk: hostapd: Add DFS detection mode
+
+Add DFS detection mode for testing radar detection rate.
+If DFS detection mode is on, AP will not switch channels when receiving
+a radar signal.
+This detection mode also supports background chain.
+
+Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+---
+ hostapd/config_file.c | 4 ++++
+ hostapd/ctrl_iface.c | 23 +++++++++++++++++++++++
+ src/ap/ap_config.h | 13 +++++++++++++
+ src/ap/dfs.c | 10 ++++++++++
+ 4 files changed, 50 insertions(+)
+
+diff --git a/hostapd/config_file.c b/hostapd/config_file.c
+index 247d68811..40ade89c0 100644
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -5398,6 +5398,10 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ } else if (os_strcmp(buf, "ibf_enable") == 0) { /*ibf setting is per device*/
+ int val = atoi(pos);
+ conf->ibf_enable = !!val;
++ } else if (os_strcmp(buf, "dfs_detect_mode") == 0) { /*bypass channel switch*/
++ u8 en = strtol(pos, NULL, 10);
++
++ conf->dfs_detect_mode = en;
+ } else {
+ wpa_printf(MSG_ERROR,
+ "Line %d: unknown configuration item '%s'",
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index cf1a194a9..3f2fd8d06 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -4155,6 +4155,26 @@ hostapd_ctrl_iface_get_ibf(struct hostapd_data *hapd, char *buf,
+ }
+
+
++static int
++hostapd_ctrl_iface_set_dfs_detect_mode(struct hostapd_data *hapd, char *value,
++ char *buf, size_t buflen)
++{
++ u8 dfs_detect_mode;
++
++ if (!value)
++ return -1;
++
++ dfs_detect_mode = strtol(value, NULL, 10);
++ if (dfs_detect_mode > DFS_DETECT_MODE_MAX) {
++ wpa_printf(MSG_ERROR, "Invalid value for dfs detect mode");
++ return -1;
++ }
++ hapd->iconf->dfs_detect_mode = dfs_detect_mode;
++
++ return os_snprintf(buf, buflen, "OK\n");
++}
++
++
+ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ char *buf, char *reply,
+ int reply_size,
+@@ -4768,6 +4788,9 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ reply_len = hostapd_ctrl_iface_get_mu(hapd, reply, reply_size);
+ } else if (os_strncmp(buf, "GET_IBF", 7) == 0) {
+ reply_len = hostapd_ctrl_iface_get_ibf(hapd, reply, reply_size);
++ } else if (os_strncmp(buf, "DFS_DETECT_MODE ", 16) == 0) {
++ reply_len = hostapd_ctrl_iface_set_dfs_detect_mode(hapd, buf + 16,
++ reply, reply_size);
+ } else {
+ os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
+ reply_len = 16;
+diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
+index 5f084796d..7607c63e1 100644
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -1288,6 +1288,7 @@ struct hostapd_config {
+ int *edcca_threshold;
+ u8 three_wire_enable;
+ u8 ibf_enable;
++ u8 dfs_detect_mode;
+ };
+
+ enum three_wire_mode {
+@@ -1302,6 +1303,18 @@ enum three_wire_mode {
+ NUM_THREE_WIRE_MODE - 1
+ };
+
++enum dfs_mode {
++ DFS_DETECT_MODE_DISABLE,
++ DFS_DETECT_MODE_AP_ENABLE,
++ DFS_DETECT_MODE_BACKGROUND_ENABLE,
++ DFS_DETECT_MODE_ALL_ENABLE,
++
++ /* keep last */
++ NUM_DFS_DETECT_MODE,
++ DFS_DETECT_MODE_MAX =
++ NUM_DFS_DETECT_MODE - 1
++};
++
+ enum edcca_mode {
+ EDCCA_MODE_FORCE_DISABLE = 0,
+ EDCCA_MODE_AUTO = 1,
+diff --git a/src/ap/dfs.c b/src/ap/dfs.c
+index d14fad136..1df4de6b8 100644
+--- a/src/ap/dfs.c
++++ b/src/ap/dfs.c
+@@ -1336,6 +1336,11 @@ hostapd_dfs_background_start_channel_switch(struct hostapd_iface *iface,
+ __func__, iface->radar_background.cac_started ? "yes" : "no",
+ hostapd_csa_in_progress(iface) ? "yes" : "no");
+
++ /* Skip channel switch when background dfs detect mode is on */
++ if (iface->conf->dfs_detect_mode == DFS_DETECT_MODE_BACKGROUND_ENABLE ||
++ iface->conf->dfs_detect_mode == DFS_DETECT_MODE_ALL_ENABLE)
++ return 0;
++
+ /* Check if CSA in progress */
+ if (hostapd_csa_in_progress(iface))
+ return 0;
+@@ -1384,6 +1389,11 @@ static int hostapd_dfs_start_channel_switch(struct hostapd_iface *iface)
+ __func__, iface->cac_started ? "yes" : "no",
+ hostapd_csa_in_progress(iface) ? "yes" : "no");
+
++ /* Skip channel switch when dfs detect mode is on */
++ if (iface->conf->dfs_detect_mode == DFS_DETECT_MODE_AP_ENABLE ||
++ iface->conf->dfs_detect_mode == DFS_DETECT_MODE_ALL_ENABLE)
++ return 0;
++
+ /* Check if CSA in progress */
+ if (hostapd_csa_in_progress(iface))
+ return 0;
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0018-mtk-hostapd-Add-DFS-offchan-channel-switch.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0018-mtk-hostapd-Add-DFS-offchan-channel-switch.patch
new file mode 100644
index 0000000..cb66783
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0018-mtk-hostapd-Add-DFS-offchan-channel-switch.patch
@@ -0,0 +1,192 @@
+From a90d1786a4b0266648c78bb5d676671e19e60f69 Mon Sep 17 00:00:00 2001
+From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+Date: Mon, 20 Feb 2023 14:56:55 +0800
+Subject: [PATCH 18/69] mtk: hostapd: Add DFS offchan channel switch
+
+Add DFS background chain channel switch command for testing purpose.
+This feature is implemented via hostapd_cli command.
+Command format:
+hostapd_cli -i <interface> raw SET_OFFCHAN_CTRL chan=<dfs_channel>
+
+Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+---
+ hostapd/ctrl_iface.c | 72 ++++++++++++++++++++++++++++++++++++++++++++
+ src/ap/dfs.c | 25 ++++++---------
+ src/ap/dfs.h | 15 +++++++++
+ 3 files changed, 96 insertions(+), 16 deletions(-)
+
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index 3f2fd8d06..1eb2379bd 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -4175,6 +4175,76 @@ hostapd_ctrl_iface_set_dfs_detect_mode(struct hostapd_data *hapd, char *value,
+ }
+
+
++static int
++hostapd_ctrl_iface_set_offchan_ctrl(struct hostapd_data *hapd, char *cmd,
++ char *buf, size_t buflen)
++{
++ struct hostapd_iface *iface = hapd->iface;
++ char *pos, *param;
++ enum hostapd_hw_mode hw_mode;
++ bool chan_found = false;
++ int i, num_available_chandefs, channel, chan_width, sec = 0;
++ int sec_chan_idx_80p80 = -1;
++ u8 oper_centr_freq_seg0_idx, oper_centr_freq_seg1_idx;
++ struct hostapd_channel_data *chan;
++ enum dfs_channel_type type = DFS_NO_CAC_YET;
++
++ param = os_strchr(cmd, ' ');
++ if (!param)
++ return -1;
++ *param++ = '\0';
++
++ pos = os_strstr(param, "chan=");
++ if (pos)
++ channel = strtol(pos + 5, NULL, 10);
++ else
++ return -1;
++
++ num_available_chandefs = dfs_find_channel(iface, NULL, 0, type);
++ for (i = 0; i < num_available_chandefs; i++) {
++ dfs_find_channel(iface, &chan, i, type);
++ if (chan->chan == channel) {
++ chan_found = true;
++ break;
++ }
++ }
++
++ if (!chan_found)
++ return -1;
++
++ if (iface->conf->secondary_channel)
++ sec = 1;
++
++ dfs_adjust_center_freq(iface, chan,
++ sec,
++ sec_chan_idx_80p80,
++ &oper_centr_freq_seg0_idx,
++ &oper_centr_freq_seg1_idx);
++
++ if (hostapd_start_dfs_cac(iface, iface->conf->hw_mode,
++ chan->freq, chan->chan,
++ iface->conf->ieee80211n,
++ iface->conf->ieee80211ac,
++ iface->conf->ieee80211ax,
++ iface->conf->ieee80211be,
++ sec, hostapd_get_oper_chwidth(iface->conf),
++ oper_centr_freq_seg0_idx,
++ oper_centr_freq_seg1_idx, true)) {
++ wpa_printf(MSG_ERROR, "DFS failed to start CAC offchannel");
++ iface->radar_background.channel = -1;
++ return -1;
++ }
++
++ iface->radar_background.channel = chan->chan;
++ iface->radar_background.freq = chan->freq;
++ iface->radar_background.secondary_channel = sec;
++ iface->radar_background.centr_freq_seg0_idx = oper_centr_freq_seg0_idx;
++ iface->radar_background.centr_freq_seg1_idx = oper_centr_freq_seg1_idx;
++
++ return os_snprintf(buf, buflen, "OK\n");
++}
++
++
+ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ char *buf, char *reply,
+ int reply_size,
+@@ -4791,6 +4861,8 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ } else if (os_strncmp(buf, "DFS_DETECT_MODE ", 16) == 0) {
+ reply_len = hostapd_ctrl_iface_set_dfs_detect_mode(hapd, buf + 16,
+ reply, reply_size);
++ } else if (os_strncmp(buf, "SET_OFFCHAN_CTRL", 16) == 0) {
++ reply_len = hostapd_ctrl_iface_set_offchan_ctrl(hapd, buf + 16, reply, reply_size);
+ } else {
+ os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
+ reply_len = 16;
+diff --git a/src/ap/dfs.c b/src/ap/dfs.c
+index 1df4de6b8..ece27d070 100644
+--- a/src/ap/dfs.c
++++ b/src/ap/dfs.c
+@@ -19,13 +19,6 @@
+ #include "dfs.h"
+ #include "crypto/crypto.h"
+
+-
+-enum dfs_channel_type {
+- DFS_ANY_CHANNEL,
+- DFS_AVAILABLE, /* non-radar or radar-available */
+- DFS_NO_CAC_YET, /* radar-not-yet-available */
+-};
+-
+ static struct hostapd_channel_data *
+ dfs_downgrade_bandwidth(struct hostapd_iface *iface, int *secondary_channel,
+ u8 *oper_centr_freq_seg0_idx,
+@@ -238,9 +231,9 @@ static int is_in_chanlist(struct hostapd_iface *iface,
+ * - hapd->vht/he_oper_centr_freq_seg0_idx
+ * - hapd->vht/he_oper_centr_freq_seg1_idx
+ */
+-static int dfs_find_channel(struct hostapd_iface *iface,
+- struct hostapd_channel_data **ret_chan,
+- int idx, enum dfs_channel_type type)
++int dfs_find_channel(struct hostapd_iface *iface,
++ struct hostapd_channel_data **ret_chan,
++ int idx, enum dfs_channel_type type)
+ {
+ struct hostapd_hw_modes *mode;
+ struct hostapd_channel_data *chan;
+@@ -300,12 +293,12 @@ static int dfs_find_channel(struct hostapd_iface *iface,
+ }
+
+
+-static void dfs_adjust_center_freq(struct hostapd_iface *iface,
+- struct hostapd_channel_data *chan,
+- int secondary_channel,
+- int sec_chan_idx_80p80,
+- u8 *oper_centr_freq_seg0_idx,
+- u8 *oper_centr_freq_seg1_idx)
++void dfs_adjust_center_freq(struct hostapd_iface *iface,
++ struct hostapd_channel_data *chan,
++ int secondary_channel,
++ int sec_chan_idx_80p80,
++ u8 *oper_centr_freq_seg0_idx,
++ u8 *oper_centr_freq_seg1_idx)
+ {
+ if (!iface->conf->ieee80211ac && !iface->conf->ieee80211ax)
+ return;
+diff --git a/src/ap/dfs.h b/src/ap/dfs.h
+index 606c1b393..c2556d2d9 100644
+--- a/src/ap/dfs.h
++++ b/src/ap/dfs.h
+@@ -9,6 +9,12 @@
+ #ifndef DFS_H
+ #define DFS_H
+
++enum dfs_channel_type {
++ DFS_ANY_CHANNEL,
++ DFS_AVAILABLE, /* non-radar or radar-available */
++ DFS_NO_CAC_YET, /* radar-not-yet-available */
++};
++
+ int hostapd_handle_dfs(struct hostapd_iface *iface);
+
+ int hostapd_dfs_complete_cac(struct hostapd_iface *iface, int success, int freq,
+@@ -32,5 +38,14 @@ int hostapd_dfs_start_cac(struct hostapd_iface *iface, int freq,
+ int hostapd_handle_dfs_offload(struct hostapd_iface *iface);
+ int hostapd_is_dfs_overlap(struct hostapd_iface *iface, enum chan_width width,
+ int center_freq);
++int dfs_find_channel(struct hostapd_iface *iface,
++ struct hostapd_channel_data **ret_chan,
++ int idx, enum dfs_channel_type type);
++void dfs_adjust_center_freq(struct hostapd_iface *iface,
++ struct hostapd_channel_data *chan,
++ int secondary_channel,
++ int sec_chan_idx_80p80,
++ u8 *oper_centr_freq_seg0_idx,
++ u8 *oper_centr_freq_seg1_idx);
+
+ #endif /* DFS_H */
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0019-mtk-hostapd-Add-amsdu-set-get-ctrl.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0019-mtk-hostapd-Add-amsdu-set-get-ctrl.patch
new file mode 100644
index 0000000..775513f
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0019-mtk-hostapd-Add-amsdu-set-get-ctrl.patch
@@ -0,0 +1,400 @@
+From 99b5616ad72bc3a2ecbacdfa1ddb411ba7db7734 Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Fri, 16 Dec 2022 03:57:11 +0800
+Subject: [PATCH 19/69] mtk: hostapd: Add amsdu set get ctrl
+
+---
+ hostapd/config_file.c | 9 +++
+ hostapd/ctrl_iface.c | 26 +++++++
+ hostapd/hostapd_cli.c | 9 +++
+ src/ap/ap_config.c | 1 +
+ src/ap/ap_config.h | 1 +
+ src/ap/ap_drv_ops.c | 14 ++++
+ src/ap/ap_drv_ops.h | 2 +
+ src/ap/hostapd.c | 2 +
+ src/common/mtk_vendor.h | 17 ++++-
+ src/drivers/driver.h | 9 +++
+ src/drivers/driver_nl80211.c | 114 ++++++++++++++++++++++++++++++
+ src/drivers/driver_nl80211.h | 1 +
+ src/drivers/driver_nl80211_capa.c | 3 +
+ 13 files changed, 207 insertions(+), 1 deletion(-)
+
+diff --git a/hostapd/config_file.c b/hostapd/config_file.c
+index 40ade89c0..7695ab196 100644
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -5402,6 +5402,15 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ u8 en = strtol(pos, NULL, 10);
+
+ conf->dfs_detect_mode = en;
++ } else if (os_strcmp(buf, "amsdu") == 0) {
++ int val = atoi(pos);
++ if (val < 0 || val > 1) {
++ wpa_printf(MSG_ERROR,
++ "Line %d: invalid amsdu value",
++ line);
++ return 1;
++ }
++ conf->amsdu = val;
+ } else {
+ wpa_printf(MSG_ERROR,
+ "Line %d: unknown configuration item '%s'",
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index 1eb2379bd..e1c8d4693 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -4245,6 +4245,30 @@ hostapd_ctrl_iface_set_offchan_ctrl(struct hostapd_data *hapd, char *cmd,
+ }
+
+
++static int
++hostapd_ctrl_iface_get_amsdu(struct hostapd_data *hapd, char *buf,
++ size_t buflen)
++{
++ u8 amsdu;
++ int ret;
++ char *pos, *end;
++
++ pos = buf;
++ end = buf + buflen;
++
++ if (hostapd_drv_amsdu_dump(hapd, &amsdu) == 0) {
++ hapd->iconf->amsdu = amsdu;
++ ret = os_snprintf(pos, end - pos, "[hostapd_cli] AMSDU: %u\n",
++ hapd->iconf->amsdu);
++ }
++
++ if (os_snprintf_error(end - pos, ret))
++ return 0;
++
++ return ret;
++}
++
++
+ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ char *buf, char *reply,
+ int reply_size,
+@@ -4863,6 +4887,8 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ reply, reply_size);
+ } else if (os_strncmp(buf, "SET_OFFCHAN_CTRL", 16) == 0) {
+ reply_len = hostapd_ctrl_iface_set_offchan_ctrl(hapd, buf + 16, reply, reply_size);
++ } else if (os_strncmp(buf, "GET_AMSDU", 9) == 0) {
++ reply_len = hostapd_ctrl_iface_get_amsdu(hapd, reply, reply_size);
+ } else {
+ os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
+ reply_len = 16;
+diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
+index 276ca578c..847f867ab 100644
+--- a/hostapd/hostapd_cli.c
++++ b/hostapd/hostapd_cli.c
+@@ -1673,6 +1673,13 @@ static int hostapd_cli_cmd_get_ibf(struct wpa_ctrl *ctrl, int argc,
+ }
+
+
++static int hostapd_cli_cmd_get_amsdu(struct wpa_ctrl *ctrl, int argc,
++ char *argv[])
++{
++ return hostapd_cli_cmd(ctrl, "GET_AMSDU", 0, NULL, NULL);
++}
++
++
+ struct hostapd_cli_cmd {
+ const char *cmd;
+ int (*handler)(struct wpa_ctrl *ctrl, int argc, char *argv[]);
+@@ -1898,6 +1905,8 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
+ "<tx type(0/1/2)> <interval> = runtime set inband discovery" },
+ { "get_ibf", hostapd_cli_cmd_get_ibf, NULL,
+ " = show iBF state (enabled/disabled)"},
++ { "get_amsdu", hostapd_cli_cmd_get_amsdu, NULL,
++ " = show AMSDU state"},
+ { NULL, NULL, NULL, NULL }
+ };
+
+diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
+index 04e263167..2420a251e 100644
+--- a/src/ap/ap_config.c
++++ b/src/ap/ap_config.c
+@@ -308,6 +308,7 @@ struct hostapd_config * hostapd_config_defaults(void)
+ conf->edcca_compensation = EDCCA_DEFAULT_COMPENSATION;
+ conf->three_wire_enable = THREE_WIRE_MODE_DISABLE;
+ conf->ibf_enable = IBF_DEFAULT_ENABLE;
++ conf->amsdu = 1;
+
+ hostapd_set_and_check_bw320_offset(conf, 0);
+
+diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
+index 7607c63e1..123e12c8f 100644
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -1289,6 +1289,7 @@ struct hostapd_config {
+ u8 three_wire_enable;
+ u8 ibf_enable;
+ u8 dfs_detect_mode;
++ u8 amsdu;
+ };
+
+ enum three_wire_mode {
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index d194dd59c..07c1fa61d 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -1278,4 +1278,18 @@ int hostapd_drv_ibf_dump(struct hostapd_data *hapd, u8 *ibf_enable)
+ if (!hapd->driver || !hapd->driver->ibf_dump)
+ return 0;
+ return hapd->driver->ibf_dump(hapd->drv_priv, ibf_enable);
++}
++
++int hostapd_drv_amsdu_ctrl(struct hostapd_data *hapd)
++{
++ if (!hapd->driver || !hapd->driver->amsdu_ctrl)
++ return 0;
++ return hapd->driver->amsdu_ctrl(hapd->drv_priv, hapd->iconf->amsdu);
++}
++
++int hostapd_drv_amsdu_dump(struct hostapd_data *hapd, u8 *amsdu)
++{
++ if (!hapd->driver || !hapd->driver->amsdu_dump)
++ return 0;
++ return hapd->driver->amsdu_dump(hapd->drv_priv, amsdu);
+ }
+\ No newline at end of file
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index 96ff11ff9..ec880f375 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -153,6 +153,8 @@ int hostapd_drv_mu_dump(struct hostapd_data *hapd, u8 *mu_onoff);
+ int hostapd_drv_three_wire_ctrl(struct hostapd_data *hapd);
+ int hostapd_drv_ibf_ctrl(struct hostapd_data *hapd);
+ int hostapd_drv_ibf_dump(struct hostapd_data *hapd, u8 *ibf_enable);
++int hostapd_drv_amsdu_ctrl(struct hostapd_data *hapd);
++int hostapd_drv_amsdu_dump(struct hostapd_data *hapd, u8 *amsdu);
+
+ #include "drivers/driver.h"
+
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index a0e28a2f8..5cfbf2e2b 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -2625,6 +2625,8 @@ dfs_offload:
+ goto fail;
+ if (hostapd_drv_ibf_ctrl(hapd) < 0)
+ goto fail;
++ if (hostapd_drv_amsdu_ctrl(hapd) < 0)
++ goto fail;
+
+ wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
+ iface->bss[0]->conf->iface);
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+index 9811f266e..7b4d7c11a 100644
+--- a/src/common/mtk_vendor.h
++++ b/src/common/mtk_vendor.h
+@@ -170,7 +170,6 @@ enum mtk_vendor_attr_wireless_ctrl {
+ MTK_VENDOR_ATTR_WIRELESS_CTRL_NUSERS_OFDMA,
+ MTK_VENDOR_ATTR_WIRELESS_CTRL_BA_BUFFER_SIZE,
+ MTK_VENDOR_ATTR_WIRELESS_CTRL_MIMO,
+- MTK_VENDOR_ATTR_WIRELESS_CTRL_AMPDU,
+ MTK_VENDOR_ATTR_WIRELESS_CTRL_AMSDU,
+ MTK_VENDOR_ATTR_WIRELESS_CTRL_CERT,
+
+@@ -180,6 +179,22 @@ enum mtk_vendor_attr_wireless_ctrl {
+ NUM_MTK_VENDOR_ATTRS_WIRELESS_CTRL - 1
+ };
+
++enum mtk_vendor_attr_wireless_dump {
++ MTK_VENDOR_ATTR_WIRELESS_DUMP_UNSPEC,
++
++ MTK_VENDOR_ATTR_WIRELESS_DUMP_AMSDU,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_WIRELESS_DUMP,
++ MTK_VENDOR_ATTR_WIRELESS_DUMP_MAX =
++ NUM_MTK_VENDOR_ATTRS_WIRELESS_DUMP - 1
++};
++
++static const struct nla_policy
++wireless_dump_policy[NUM_MTK_VENDOR_ATTRS_WIRELESS_DUMP] = {
++ [MTK_VENDOR_ATTR_WIRELESS_DUMP_AMSDU] = { .type = NLA_U8 },
++};
++
+ enum mtk_vendor_attr_rfeature_ctrl {
+ MTK_VENDOR_ATTR_RFEATURE_CTRL_UNSPEC,
+
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index d9387c01b..08556271e 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -5227,6 +5227,15 @@ struct wpa_driver_ops {
+ *
+ */
+ int (*ibf_dump)(void *priv, u8 *ibf_enable);
++
++ /**
++ * amsdu_ctrl - enable/disable amsdu
++ * amsdu_dump - get current amsdu status
++ * @priv: Private driver interface data
++ *
++ */
++ int (*amsdu_ctrl)(void *priv, u8 amsdu);
++ int (*amsdu_dump)(void *priv, u8 *amsdu);
+ };
+
+ /**
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index fa7507fbb..48faf2217 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -14376,6 +14376,118 @@ fail:
+ return -ENOBUFS;
+ }
+
++static int nl80211_enable_amsdu(void *priv, u8 amsdu)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *data;
++ int ret;
++
++ if (!drv->mtk_wireless_vendor_cmd_avail) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Driver does not support setting ap wireless control");
++ return 0;
++ }
++
++ msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR);
++ if (!msg)
++ goto fail;
++
++ if (nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, MTK_NL80211_VENDOR_SUBCMD_WIRELESS_CTRL))
++ goto fail;
++
++ data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA);
++ if (!data)
++ goto fail;
++
++ nla_put_u8(msg, MTK_VENDOR_ATTR_WIRELESS_CTRL_AMSDU, amsdu);
++
++ nla_nest_end(msg, data);
++ ret = send_and_recv_cmd(drv, msg);
++ if (ret) {
++ wpa_printf(MSG_ERROR, "Failed to set amsdu. ret=%d (%s)", ret, strerror(-ret));
++ }
++
++ return ret;
++
++fail:
++ nlmsg_free(msg);
++ return -ENOBUFS;
++}
++
++static int dump_amsdu_handler(struct nl_msg *msg, void *arg)
++{
++ u8 *amsdu = (u8 *) arg;
++ struct nlattr *tb[NL80211_ATTR_MAX + 1];
++ struct nlattr *tb_vendor[MTK_VENDOR_ATTR_WIRELESS_DUMP_MAX + 1];
++ struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
++ struct nlattr *nl_vend, *attr_amsdu;
++
++ nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
++ genlmsg_attrlen(gnlh, 0), NULL);
++
++ nl_vend = tb[NL80211_ATTR_VENDOR_DATA];
++ if (!nl_vend)
++ return NL_SKIP;
++
++ nla_parse(tb_vendor, MTK_VENDOR_ATTR_WIRELESS_DUMP_MAX,
++ nla_data(nl_vend), nla_len(nl_vend), NULL);
++
++ attr_amsdu = tb_vendor[MTK_VENDOR_ATTR_WIRELESS_DUMP_AMSDU];
++ if (!attr_amsdu ){
++ wpa_printf(MSG_ERROR, "nl80211: cannot find vendor attributes");
++ return NL_SKIP;
++ }
++
++ *amsdu = nla_get_u8(attr_amsdu);
++
++ return NL_SKIP;
++}
++
++static int
++nl80211_dump_amsdu(void *priv, u8 *amsdu)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *data;
++ int ret;
++
++ if (!drv->mtk_wireless_vendor_cmd_avail) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Driver does not support ap_wireless control");
++ return 0;
++ }
++
++ msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_VENDOR);
++ if (!msg)
++ goto fail;
++
++ if (nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, MTK_NL80211_VENDOR_SUBCMD_WIRELESS_CTRL))
++ goto fail;
++
++ data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA);
++ if (!data)
++ goto fail;
++
++ nla_nest_end(msg, data);
++
++ ret = send_and_recv_resp(drv, msg, dump_amsdu_handler, amsdu);
++
++ if (ret) {
++ wpa_printf(MSG_ERROR, "Failed to dump amsdu. ret=%d (%s)", ret, strerror(-ret));
++ }
++
++ return ret;
++
++fail:
++ nlmsg_free(msg);
++ return -ENOBUFS;
++}
++
+ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .name = "nl80211",
+ .desc = "Linux nl80211/cfg80211",
+@@ -14540,4 +14652,6 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .three_wire_ctrl = nl80211_enable_three_wire,
+ .ibf_ctrl = nl80211_ibf_enable,
+ .ibf_dump = nl80211_ibf_dump,
++ .amsdu_ctrl = nl80211_enable_amsdu,
++ .amsdu_dump = nl80211_dump_amsdu,
+ };
+diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
+index 2133e0dd6..b6c3b85cc 100644
+--- a/src/drivers/driver_nl80211.h
++++ b/src/drivers/driver_nl80211.h
+@@ -203,6 +203,7 @@ struct wpa_driver_nl80211_data {
+ unsigned int mtk_mu_vendor_cmd_avail:1;
+ unsigned int mtk_3wire_vendor_cmd_avail:1;
+ unsigned int mtk_ibf_vendor_cmd_avail:1;
++ unsigned int mtk_wireless_vendor_cmd_avail:1;
+
+ u32 ignore_next_local_disconnect;
+ u32 ignore_next_local_deauth;
+diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
+index 4afc277dc..9fbcc6923 100644
+--- a/src/drivers/driver_nl80211_capa.c
++++ b/src/drivers/driver_nl80211_capa.c
+@@ -1149,6 +1149,9 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
+ case MTK_NL80211_VENDOR_SUBCMD_IBF_CTRL:
+ drv->mtk_ibf_vendor_cmd_avail = 1;
+ break;
++ case MTK_NL80211_VENDOR_SUBCMD_WIRELESS_CTRL:
++ drv->mtk_wireless_vendor_cmd_avail = 1;
++ break;
+ }
+ }
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0020-mtk-hostapd-Add-he_ldpc-configuration.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0020-mtk-hostapd-Add-he_ldpc-configuration.patch
new file mode 100644
index 0000000..279891a
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0020-mtk-hostapd-Add-he_ldpc-configuration.patch
@@ -0,0 +1,102 @@
+From 11596bf8060aed4340d898d4495c298d2fe02ac2 Mon Sep 17 00:00:00 2001
+From: MeiChia Chiu <meichia.chiu@mediatek.com>
+Date: Thu, 12 Jan 2023 15:18:19 +0800
+Subject: [PATCH 20/69] mtk: hostapd: Add he_ldpc configuration
+
+---
+ hostapd/config_file.c | 2 ++
+ hostapd/hostapd.conf | 5 +++++
+ src/ap/ap_config.c | 1 +
+ src/ap/ap_config.h | 1 +
+ src/ap/ieee802_11_he.c | 7 +++++++
+ src/common/ieee802_11_defs.h | 3 +++
+ 6 files changed, 19 insertions(+)
+
+diff --git a/hostapd/config_file.c b/hostapd/config_file.c
+index 7695ab196..dadc8f108 100644
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -3908,6 +3908,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ conf->he_phy_capab.he_su_beamformee = atoi(pos);
+ } else if (os_strcmp(buf, "he_mu_beamformer") == 0) {
+ conf->he_phy_capab.he_mu_beamformer = atoi(pos);
++ } else if (os_strcmp(buf, "he_ldpc") == 0) {
++ conf->he_phy_capab.he_ldpc = atoi(pos);
+ } else if (os_strcmp(buf, "he_bss_color") == 0) {
+ conf->he_op.he_bss_color = atoi(pos) & 0x3f;
+ conf->he_op.he_bss_color_disabled = 0;
+diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
+index 0d10998af..f988b17b2 100644
+--- a/hostapd/hostapd.conf
++++ b/hostapd/hostapd.conf
+@@ -833,6 +833,11 @@ wmm_ac_vo_acm=0
+ # 1 = supported
+ #he_mu_beamformer=1
+
++#he_ldpc: HE LDPC support
++# 0 = not supported
++# 1 = supported (default)
++#he_ldpc=1
++
+ # he_bss_color: BSS color (1-63)
+ #he_bss_color=1
+
+diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
+index 2420a251e..ba1b2a7a3 100644
+--- a/src/ap/ap_config.c
++++ b/src/ap/ap_config.c
+@@ -273,6 +273,7 @@ struct hostapd_config * hostapd_config_defaults(void)
+ #endif /* CONFIG_ACS */
+
+ #ifdef CONFIG_IEEE80211AX
++ conf->he_phy_capab.he_ldpc = 1;
+ conf->he_op.he_rts_threshold = HE_OPERATION_RTS_THRESHOLD_MASK >>
+ HE_OPERATION_RTS_THRESHOLD_OFFSET;
+ /* Set default basic MCS/NSS set to single stream MCS 0-7 */
+diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
+index 123e12c8f..d995b8d9c 100644
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -985,6 +985,7 @@ struct hostapd_bss_config {
+ * struct he_phy_capabilities_info - HE PHY capabilities
+ */
+ struct he_phy_capabilities_info {
++ bool he_ldpc;
+ bool he_su_beamformer;
+ bool he_su_beamformee;
+ bool he_mu_beamformer;
+diff --git a/src/ap/ieee802_11_he.c b/src/ap/ieee802_11_he.c
+index a2deda6c4..3c6ee72fe 100644
+--- a/src/ap/ieee802_11_he.c
++++ b/src/ap/ieee802_11_he.c
+@@ -139,6 +139,13 @@ u8 * hostapd_eid_he_capab(struct hostapd_data *hapd, u8 *eid,
+ os_memcpy(&cap->optional[mcs_nss_size],
+ mode->he_capab[opmode].ppet, ppet_size);
+
++ if (hapd->iface->conf->he_phy_capab.he_ldpc)
++ cap->he_phy_capab_info[HE_PHYCAP_LDPC_CODING_IN_PAYLOAD_IDX] |=
++ HE_PHYCAP_LDPC_CODING_IN_PAYLOAD;
++ else
++ cap->he_phy_capab_info[HE_PHYCAP_LDPC_CODING_IN_PAYLOAD_IDX] &=
++ ~HE_PHYCAP_LDPC_CODING_IN_PAYLOAD;
++
+ if (hapd->iface->conf->he_phy_capab.he_su_beamformer)
+ cap->he_phy_capab_info[HE_PHYCAP_SU_BEAMFORMER_CAPAB_IDX] |=
+ HE_PHYCAP_SU_BEAMFORMER_CAPAB;
+diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h
+index 7a1da3252..a289c2d87 100644
+--- a/src/common/ieee802_11_defs.h
++++ b/src/common/ieee802_11_defs.h
+@@ -2452,6 +2452,9 @@ struct ieee80211_spatial_reuse {
+ #define HE_PHYCAP_CHANNEL_WIDTH_SET_160MHZ_IN_5G ((u8) BIT(3))
+ #define HE_PHYCAP_CHANNEL_WIDTH_SET_80PLUS80MHZ_IN_5G ((u8) BIT(4))
+
++#define HE_PHYCAP_LDPC_CODING_IN_PAYLOAD_IDX 1
++#define HE_PHYCAP_LDPC_CODING_IN_PAYLOAD ((u8) BIT(5))
++
+ #define HE_PHYCAP_SU_BEAMFORMER_CAPAB_IDX 3
+ #define HE_PHYCAP_SU_BEAMFORMER_CAPAB ((u8) BIT(7))
+ #define HE_PHYCAP_SU_BEAMFORMEE_CAPAB_IDX 4
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0021-mtk-hostapd-Add-vendor-command-attribute-for-RTS-BW-.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0021-mtk-hostapd-Add-vendor-command-attribute-for-RTS-BW-.patch
new file mode 100644
index 0000000..7cc27a3
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0021-mtk-hostapd-Add-vendor-command-attribute-for-RTS-BW-.patch
@@ -0,0 +1,26 @@
+From f2ad38c5c502d4bbe6084a761a5350ce4d4fa911 Mon Sep 17 00:00:00 2001
+From: "himanshu.goyal" <himanshu.goyal@mediatek.com>
+Date: Tue, 24 Jan 2023 19:06:44 +0800
+Subject: [PATCH 21/69] mtk: hostapd: Add vendor command attribute for RTS BW
+ signaling.
+
+Signed-off-by: himanshu.goyal <himanshu.goyal@mediatek.com>
+---
+ src/common/mtk_vendor.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+index 7b4d7c11a..ace993bc8 100644
+--- a/src/common/mtk_vendor.h
++++ b/src/common/mtk_vendor.h
+@@ -172,6 +172,7 @@ enum mtk_vendor_attr_wireless_ctrl {
+ MTK_VENDOR_ATTR_WIRELESS_CTRL_MIMO,
+ MTK_VENDOR_ATTR_WIRELESS_CTRL_AMSDU,
+ MTK_VENDOR_ATTR_WIRELESS_CTRL_CERT,
++ MTK_VENDOR_ATTR_WIRELESS_CTRL_RTS_SIGTA,
+
+ /* keep last */
+ NUM_MTK_VENDOR_ATTRS_WIRELESS_CTRL,
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0022-mtk-hostapd-6G-band-does-not-require-DFS.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0022-mtk-hostapd-6G-band-does-not-require-DFS.patch
new file mode 100644
index 0000000..57b2819
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0022-mtk-hostapd-6G-band-does-not-require-DFS.patch
@@ -0,0 +1,24 @@
+From 484508974ac2d448b620a002db087d5106ce9c31 Mon Sep 17 00:00:00 2001
+From: Peter Chiu <chui-hao.chiu@mediatek.com>
+Date: Mon, 13 Feb 2023 11:03:53 +0800
+Subject: [PATCH 22/69] mtk: hostapd: 6G band does not require DFS
+
+---
+ src/ap/dfs.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ap/dfs.c b/src/ap/dfs.c
+index ece27d070..44f3a2cb1 100644
+--- a/src/ap/dfs.c
++++ b/src/ap/dfs.c
+@@ -1525,6 +1525,7 @@ int hostapd_is_dfs_required(struct hostapd_iface *iface)
+ if ((!(iface->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD) &&
+ !iface->conf->ieee80211h) ||
+ !iface->current_mode ||
++ is_6ghz_freq(iface->freq) ||
+ iface->current_mode->mode != HOSTAPD_MODE_IEEE80211A)
+ return 0;
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0023-mtk-hostapd-Fix-sending-wrong-VHT-operation-IE-in-CS.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0023-mtk-hostapd-Fix-sending-wrong-VHT-operation-IE-in-CS.patch
new file mode 100644
index 0000000..748503f
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0023-mtk-hostapd-Fix-sending-wrong-VHT-operation-IE-in-CS.patch
@@ -0,0 +1,46 @@
+From f9f57386771f9adc86b1f4083ad498c78e7095b2 Mon Sep 17 00:00:00 2001
+From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+Date: Mon, 20 Feb 2023 11:01:18 +0800
+Subject: [PATCH 23/69] mtk: hostapd: Fix sending wrong VHT operation IE in CSA
+ while using ZWDFS
+
+Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+---
+ src/ap/dfs.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/ap/dfs.c b/src/ap/dfs.c
+index 44f3a2cb1..c703d2fb8 100644
+--- a/src/ap/dfs.c
++++ b/src/ap/dfs.c
+@@ -1129,6 +1129,14 @@ static int
+ hostapd_dfs_start_channel_switch_background(struct hostapd_iface *iface)
+ {
+ u8 current_vht_oper_chwidth = hostapd_get_oper_chwidth(iface->conf);
++ int ret;
++
++ ret = hostapd_dfs_request_channel_switch(iface, iface->radar_background.channel,
++ iface->radar_background.freq,
++ iface->radar_background.secondary_channel,
++ current_vht_oper_chwidth,
++ iface->radar_background.centr_freq_seg0_idx,
++ iface->radar_background.centr_freq_seg1_idx);
+
+ iface->conf->channel = iface->radar_background.channel;
+ iface->freq = iface->radar_background.freq;
+@@ -1141,11 +1149,7 @@ hostapd_dfs_start_channel_switch_background(struct hostapd_iface *iface)
+
+ hostapd_dfs_update_background_chain(iface);
+
+- return hostapd_dfs_request_channel_switch(
+- iface, iface->conf->channel, iface->freq,
+- iface->conf->secondary_channel, current_vht_oper_chwidth,
+- hostapd_get_oper_centr_freq_seg0_idx(iface->conf),
+- hostapd_get_oper_centr_freq_seg1_idx(iface->conf));
++ return ret;
+ }
+
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0024-mtk-hostapd-Add-sta-assisted-DFS-state-update-mechan.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0024-mtk-hostapd-Add-sta-assisted-DFS-state-update-mechan.patch
new file mode 100644
index 0000000..16d1637
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0024-mtk-hostapd-Add-sta-assisted-DFS-state-update-mechan.patch
@@ -0,0 +1,189 @@
+From d8c34836763642995d9bc30299e751a485333843 Mon Sep 17 00:00:00 2001
+From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+Date: Mon, 20 Feb 2023 10:51:47 +0800
+Subject: [PATCH 24/69] mtk: hostapd: Add sta-assisted DFS state update
+ mechanism
+
+Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+---
+ src/ap/dfs.c | 20 ++++++++++++++++++++
+ src/ap/dfs.h | 3 +++
+ src/ap/drv_callbacks.c | 28 ++++++++++++++++++++++++++++
+ src/common/wpa_ctrl.h | 1 +
+ src/drivers/driver.h | 14 ++++++++++++++
+ src/drivers/driver_nl80211_event.c | 6 ++++++
+ src/drivers/nl80211_copy.h | 6 ++++++
+ 7 files changed, 78 insertions(+)
+
+diff --git a/src/ap/dfs.c b/src/ap/dfs.c
+index c703d2fb8..3e036441b 100644
+--- a/src/ap/dfs.c
++++ b/src/ap/dfs.c
+@@ -1522,6 +1522,26 @@ int hostapd_dfs_nop_finished(struct hostapd_iface *iface, int freq,
+ }
+
+
++int hostapd_dfs_sta_update_state(struct hostapd_iface *iface, int freq,
++ int ht_enabled, int chan_offset, int chan_width,
++ int cf1, int cf2, u32 state)
++{
++ wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, DFS_EVENT_STA_UPDATE
++ "freq=%d ht_enabled=%d chan_offset=%d chan_width=%d cf1=%d cf2=%d state=%s",
++ freq, ht_enabled, chan_offset, chan_width, cf1, cf2,
++ (state == HOSTAPD_CHAN_DFS_AVAILABLE) ? "available" : "usable");
++
++ /* Proceed only if DFS is not offloaded to the driver */
++ if (iface->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD)
++ return 0;
++
++ set_dfs_state(iface, freq, ht_enabled, chan_offset, chan_width,
++ cf1, cf2, state);
++
++ return 0;
++}
++
++
+ int hostapd_is_dfs_required(struct hostapd_iface *iface)
+ {
+ int n_chans, n_chans1, start_chan_idx, start_chan_idx1, res;
+diff --git a/src/ap/dfs.h b/src/ap/dfs.h
+index c2556d2d9..25ba29ca1 100644
+--- a/src/ap/dfs.h
++++ b/src/ap/dfs.h
+@@ -30,6 +30,9 @@ int hostapd_dfs_radar_detected(struct hostapd_iface *iface, int freq,
+ int hostapd_dfs_nop_finished(struct hostapd_iface *iface, int freq,
+ int ht_enabled,
+ int chan_offset, int chan_width, int cf1, int cf2);
++int hostapd_dfs_sta_update_state(struct hostapd_iface *iface, int freq,
++ int ht_enabled, int chan_offset, int chan_width,
++ int cf1, int cf2, u32 state);
+ int hostapd_is_dfs_required(struct hostapd_iface *iface);
+ int hostapd_is_dfs_chan_available(struct hostapd_iface *iface);
+ int hostapd_dfs_start_cac(struct hostapd_iface *iface, int freq,
+diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
+index 2a8262727..773a70878 100644
+--- a/src/ap/drv_callbacks.c
++++ b/src/ap/drv_callbacks.c
+@@ -2243,6 +2243,24 @@ static void hostapd_event_dfs_cac_started(struct hostapd_data *hapd,
+ radar->cf1, radar->cf2);
+ }
+
++static void hostapd_event_dfs_sta_cac_skipped(struct hostapd_data *hapd,
++ struct dfs_event *radar)
++{
++ wpa_printf(MSG_DEBUG, "DFS CAC skipped (by STA) on %d MHz", radar->freq);
++ hostapd_dfs_sta_update_state(hapd->iface, radar->freq, radar->ht_enabled,
++ radar->chan_offset, radar->chan_width,
++ radar->cf1, radar->cf2, HOSTAPD_CHAN_DFS_AVAILABLE);
++}
++
++static void hostapd_event_dfs_sta_cac_expired(struct hostapd_data *hapd,
++ struct dfs_event *radar)
++{
++ wpa_printf(MSG_DEBUG, "DFS CAC expired (by STA) on %d MHz", radar->freq);
++ hostapd_dfs_sta_update_state(hapd->iface, radar->freq, radar->ht_enabled,
++ radar->chan_offset, radar->chan_width,
++ radar->cf1, radar->cf2, HOSTAPD_CHAN_DFS_USABLE);
++}
++
+ #endif /* NEED_AP_MLME */
+
+
+@@ -2591,6 +2609,16 @@ void hostapd_wpa_event(void *ctx, enum wpa_event_type event,
+ hapd = switch_link_hapd(hapd, data->dfs_event.link_id);
+ hostapd_event_dfs_nop_finished(hapd, &data->dfs_event);
+ break;
++ case EVENT_DFS_STA_CAC_SKIPPED:
++ if (!data)
++ break;
++ hostapd_event_dfs_sta_cac_skipped(hapd, &data->dfs_event);
++ break;
++ case EVENT_DFS_STA_CAC_EXPIRED:
++ if (!data)
++ break;
++ hostapd_event_dfs_sta_cac_expired(hapd, &data->dfs_event);
++ break;
+ case EVENT_CHANNEL_LIST_CHANGED:
+ /* channel list changed (regulatory?), update channel list */
+ /* TODO: check this. hostapd_get_hw_features() initializes
+diff --git a/src/common/wpa_ctrl.h b/src/common/wpa_ctrl.h
+index c5bb9abd7..88ad54d6f 100644
+--- a/src/common/wpa_ctrl.h
++++ b/src/common/wpa_ctrl.h
+@@ -383,6 +383,7 @@ extern "C" {
+ #define DFS_EVENT_CAC_COMPLETED "DFS-CAC-COMPLETED "
+ #define DFS_EVENT_NOP_FINISHED "DFS-NOP-FINISHED "
+ #define DFS_EVENT_PRE_CAC_EXPIRED "DFS-PRE-CAC-EXPIRED "
++#define DFS_EVENT_STA_UPDATE "DFS-STA-UPDATE "
+
+ #define AP_CSA_FINISHED "AP-CSA-FINISHED "
+
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index 08556271e..041d103d2 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -5863,6 +5863,20 @@ enum wpa_event_type {
+ * EVENT_LINK_RECONFIG - Notification that AP links removed
+ */
+ EVENT_LINK_RECONFIG,
++
++ /**
++ * EVENT_DFS_STA_CAC_SKIPPED - Notification that CAC has been skipped
++ *
++ * The channel in the notification is now marked as available.
++ */
++ EVENT_DFS_STA_CAC_SKIPPED,
++
++ /**
++ * EVENT_DFS_STA_CAC_EXPIRED - Notification that CAC has expired
++ *
++ * The channel in the notification is now marked as usable.
++ */
++ EVENT_DFS_STA_CAC_EXPIRED,
+ };
+
+
+diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c
+index 601e75a87..13977ec19 100644
+--- a/src/drivers/driver_nl80211_event.c
++++ b/src/drivers/driver_nl80211_event.c
+@@ -2518,6 +2518,12 @@ static void nl80211_radar_event(struct wpa_driver_nl80211_data *drv,
+ case NL80211_RADAR_CAC_STARTED:
+ wpa_supplicant_event(drv->ctx, EVENT_DFS_CAC_STARTED, &data);
+ break;
++ case NL80211_RADAR_STA_CAC_SKIPPED:
++ wpa_supplicant_event(drv->ctx, EVENT_DFS_STA_CAC_SKIPPED, &data);
++ break;
++ case NL80211_RADAR_STA_CAC_EXPIRED:
++ wpa_supplicant_event(drv->ctx, EVENT_DFS_STA_CAC_EXPIRED, &data);
++ break;
+ default:
+ wpa_printf(MSG_DEBUG, "nl80211: Unknown radar event %d "
+ "received", event_type);
+diff --git a/src/drivers/nl80211_copy.h b/src/drivers/nl80211_copy.h
+index dced2c49d..8917d565b 100644
+--- a/src/drivers/nl80211_copy.h
++++ b/src/drivers/nl80211_copy.h
+@@ -6699,6 +6699,10 @@ enum nl80211_smps_mode {
+ * applicable for ETSI dfs domain where pre-CAC is valid for ever.
+ * @NL80211_RADAR_CAC_STARTED: Channel Availability Check has been started,
+ * should be generated by HW if NL80211_EXT_FEATURE_DFS_OFFLOAD is enabled.
++ * @NL80211_RADAR_STA_CAC_SKIPPED: STA set the DFS state to available
++ * when receiving CSA/assoc resp
++ * @NL80211_RADAR_STA_CAC_EXPIRED: STA set the DFS state to usable
++ * when STA is disconnected or leaving the channel
+ */
+ enum nl80211_radar_event {
+ NL80211_RADAR_DETECTED,
+@@ -6707,6 +6711,8 @@ enum nl80211_radar_event {
+ NL80211_RADAR_NOP_FINISHED,
+ NL80211_RADAR_PRE_CAC_EXPIRED,
+ NL80211_RADAR_CAC_STARTED,
++ NL80211_RADAR_STA_CAC_SKIPPED,
++ NL80211_RADAR_STA_CAC_EXPIRED,
+ };
+
+ /**
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0025-mtk-hostapd-Mark-DFS-channel-as-available-for-CSA.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0025-mtk-hostapd-Mark-DFS-channel-as-available-for-CSA.patch
new file mode 100644
index 0000000..e0da050
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0025-mtk-hostapd-Mark-DFS-channel-as-available-for-CSA.patch
@@ -0,0 +1,60 @@
+From bb978b9e6148d2bcf81b2a09c282a9c40cfc855d Mon Sep 17 00:00:00 2001
+From: "himanshu.goyal" <himanshu.goyal@mediatek.com>
+Date: Fri, 3 Mar 2023 12:45:42 +0800
+Subject: [PATCH 25/69] mtk: hostapd: Mark DFS channel as available for CSA.
+
+---
+ hostapd/ctrl_iface.c | 10 ++++++++++
+ hostapd/hostapd_cli.c | 2 +-
+ src/ap/ctrl_iface_ap.c | 1 +
+ 3 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index e1c8d4693..f9cac5fbb 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -2776,6 +2776,16 @@ static int hostapd_ctrl_iface_chan_switch(struct hostapd_iface *iface,
+ break;
+ }
+
++ if (settings.freq_params.radar_background) {
++ hostapd_dfs_sta_update_state(iface,
++ settings.freq_params.freq,
++ settings.freq_params.ht_enabled,
++ settings.freq_params.sec_channel_offset,
++ bandwidth, settings.freq_params.center_freq1,
++ settings.freq_params.center_freq2,
++ HOSTAPD_CHAN_DFS_AVAILABLE);
++ }
++
+ if (settings.freq_params.center_freq1)
+ dfs_range += hostapd_is_dfs_overlap(
+ iface, bandwidth, settings.freq_params.center_freq1);
+diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
+index 847f867ab..da9c0f931 100644
+--- a/hostapd/hostapd_cli.c
++++ b/hostapd/hostapd_cli.c
+@@ -1775,7 +1775,7 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
+ "<addr> = send QoS Map Configure frame" },
+ { "chan_switch", hostapd_cli_cmd_chan_switch, NULL,
+ "<cs_count> <freq> [sec_channel_offset=] [center_freq1=]\n"
+- " [center_freq2=] [bandwidth=] [blocktx] [ht|vht]\n"
++ " [center_freq2=] [bandwidth=] [blocktx] [ht|vht] [skip_cac]\n"
+ " = initiate channel switch announcement" },
+ { "notify_cw_change", hostapd_cli_cmd_notify_cw_change, NULL,
+ "<channel_width> = 0 - 20 MHz, 1 - 40 MHz, 2 - 80 MHz, 3 - 160 MHz" },
+diff --git a/src/ap/ctrl_iface_ap.c b/src/ap/ctrl_iface_ap.c
+index fbceb859d..66dce41eb 100644
+--- a/src/ap/ctrl_iface_ap.c
++++ b/src/ap/ctrl_iface_ap.c
+@@ -1081,6 +1081,7 @@ int hostapd_parse_csa_settings(const char *pos,
+ settings->freq_params.vht_enabled = !!os_strstr(pos, " vht");
+ settings->freq_params.he_enabled = !!os_strstr(pos, " he");
+ settings->freq_params.eht_enabled = !!os_strstr(pos, " eht");
++ settings->freq_params.radar_background = !!os_strstr(pos, " skip_cac");
+ settings->block_tx = !!os_strstr(pos, " blocktx");
+ #undef SET_CSA_SETTING
+ #undef SET_CSA_SETTING_EXT
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0026-mtk-hostapd-Add-available-color-bitmap.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0026-mtk-hostapd-Add-available-color-bitmap.patch
new file mode 100644
index 0000000..78cef9e
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0026-mtk-hostapd-Add-available-color-bitmap.patch
@@ -0,0 +1,476 @@
+From 114da6c3383f41b8d0f8aca3556caf75df517550 Mon Sep 17 00:00:00 2001
+From: Yi-Chia Hsieh <yi-chia.hsieh@mediatek.com>
+Date: Thu, 26 Jan 2023 09:16:00 +0800
+Subject: [PATCH 26/69] mtk: hostapd: Add available color bitmap
+
+Signed-off-by: Yi-Chia Hsieh <yi-chia.hsieh@mediatek.com>
+---
+ hostapd/ctrl_iface.c | 74 +++++++++++
+ hostapd/hostapd_cli.c | 18 +++
+ src/ap/ap_drv_ops.c | 10 +-
+ src/ap/ap_drv_ops.h | 2 +
+ src/common/mtk_vendor.h | 11 ++
+ src/drivers/driver.h | 8 ++
+ src/drivers/driver_nl80211.c | 198 +++++++++++++++++++++++++++++-
+ src/drivers/driver_nl80211.h | 1 +
+ src/drivers/driver_nl80211_capa.c | 3 +
+ 9 files changed, 323 insertions(+), 2 deletions(-)
+
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index f9cac5fbb..42a3c6c20 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -4278,6 +4278,76 @@ hostapd_ctrl_iface_get_amsdu(struct hostapd_data *hapd, char *buf,
+ return ret;
+ }
+
++static int
++hostapd_ctrl_iface_get_bss_color(struct hostapd_data *hapd, char *buf,
++ size_t buflen)
++{
++ int ret;
++ char *pos, *end;
++ int i;
++
++ pos = buf;
++ end = buf + buflen;
++
++ if (hapd->iface->conf->he_op.he_bss_color_disabled)
++ ret = os_snprintf(buf, buflen, "BSS Color disabled\n");
++ else
++ ret = os_snprintf(buf, buflen, "BSS Color=%u\n",
++ hapd->iface->conf->he_op.he_bss_color);
++
++ pos += ret;
++
++ return pos - buf;
++}
++
++
++static int
++hostapd_ctrl_iface_get_aval_color_bmp(struct hostapd_data *hapd, char *buf,
++ size_t buflen)
++{
++ int ret;
++ char *pos, *end;
++ int i;
++ u64 aval_color_bmp = 0;
++
++ hostapd_drv_get_aval_bss_color_bmp(hapd, &aval_color_bmp);
++ hapd->color_collision_bitmap = ~aval_color_bmp;
++
++ pos = buf;
++ end = buf + buflen;
++
++ ret = os_snprintf(buf, buflen,
++ "available color bitmap=0x%llx\n",
++ aval_color_bmp);
++ if (os_snprintf_error(end - pos, ret))
++ return pos - buf;
++ pos += ret;
++
++ for (i = 0; i < HE_OPERATION_BSS_COLOR_MAX; i++) {
++ int bit = !!((aval_color_bmp >> i) & 1LLU);
++
++ if (i % 8 == 0) {
++ ret = os_snprintf(pos, end - pos, "%2d: ", i);
++ if (os_snprintf_error(end - pos, ret))
++ return pos - buf;
++ pos += ret;
++ }
++
++ ret = os_snprintf(pos, end - pos, "%d ", bit);
++ if (os_snprintf_error(end - pos, ret))
++ return pos - buf;
++ pos += ret;
++
++ if (i % 8 == 7) {
++ ret = os_snprintf(pos, end - pos, "\n");
++ if (os_snprintf_error(end - pos, ret))
++ return pos - buf;
++ pos += ret;
++ }
++ }
++ return pos - buf;
++}
++
+
+ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ char *buf, char *reply,
+@@ -4899,6 +4969,10 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ reply_len = hostapd_ctrl_iface_set_offchan_ctrl(hapd, buf + 16, reply, reply_size);
+ } else if (os_strncmp(buf, "GET_AMSDU", 9) == 0) {
+ reply_len = hostapd_ctrl_iface_get_amsdu(hapd, reply, reply_size);
++ } else if (os_strncmp(buf, "GET_BSS_COLOR", 13) == 0) {
++ reply_len = hostapd_ctrl_iface_get_bss_color(hapd, reply, reply_size);
++ } else if (os_strncmp(buf, "AVAL_COLOR_BMP", 14) == 0) {
++ reply_len = hostapd_ctrl_iface_get_aval_color_bmp(hapd, reply, reply_size);
+ } else {
+ os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
+ reply_len = 16;
+diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
+index da9c0f931..865c11432 100644
+--- a/hostapd/hostapd_cli.c
++++ b/hostapd/hostapd_cli.c
+@@ -1658,6 +1658,20 @@ static int hostapd_cli_cmd_reload_rxkhs(struct wpa_ctrl *ctrl, int argc,
+ #endif /* CONFIG_IEEE80211R_AP */
+
+
++static int hostapd_cli_cmd_get_bss_color(struct wpa_ctrl *ctrl, int argc,
++ char *argv[])
++{
++ return wpa_ctrl_command(ctrl, "GET_BSS_COLOR");
++}
++
++
++static int hostapd_cli_cmd_get_aval_color_bmp(struct wpa_ctrl *ctrl, int argc,
++ char *argv[])
++{
++ return wpa_ctrl_command(ctrl, "AVAL_COLOR_BMP");
++}
++
++
+ #ifdef ANDROID
+ static int hostapd_cli_cmd_driver(struct wpa_ctrl *ctrl, int argc, char *argv[])
+ {
+@@ -1897,6 +1911,10 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
+ { "get_rxkhs", hostapd_cli_cmd_get_rxkhs, NULL,
+ "= get R0KHs and R1KHs" },
+ #endif /* CONFIG_IEEE80211R_AP */
++ { "get_bss_color", hostapd_cli_cmd_get_bss_color, NULL,
++ "= get current BSS color" },
++ { "get_color_bmp", hostapd_cli_cmd_get_aval_color_bmp, NULL,
++ "= get available BSS color bitmap" },
+ #ifdef ANDROID
+ { "driver", hostapd_cli_cmd_driver, NULL,
+ "<driver sub command> [<hex formatted data>] = send driver command data" },
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index 07c1fa61d..683f2c359 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -1292,4 +1292,12 @@ int hostapd_drv_amsdu_dump(struct hostapd_data *hapd, u8 *amsdu)
+ if (!hapd->driver || !hapd->driver->amsdu_dump)
+ return 0;
+ return hapd->driver->amsdu_dump(hapd->drv_priv, amsdu);
+-}
+\ No newline at end of file
++}
++
++int hostapd_drv_get_aval_bss_color_bmp(struct hostapd_data *hapd, u64 *aval_color_bmp)
++{
++ if (!hapd->driver || !hapd->driver->get_aval_color_bmp ||
++ hapd->iface->conf->he_op.he_bss_color_disabled)
++ return 0;
++ return hapd->driver->get_aval_color_bmp(hapd->drv_priv, aval_color_bmp);
++}
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index ec880f375..b76cad458 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -155,6 +155,8 @@ int hostapd_drv_ibf_ctrl(struct hostapd_data *hapd);
+ int hostapd_drv_ibf_dump(struct hostapd_data *hapd, u8 *ibf_enable);
+ int hostapd_drv_amsdu_ctrl(struct hostapd_data *hapd);
+ int hostapd_drv_amsdu_dump(struct hostapd_data *hapd, u8 *amsdu);
++int hostapd_drv_get_aval_bss_color_bmp(struct hostapd_data *hapd,
++ u64 *aval_color_bmp);
+
+ #include "drivers/driver.h"
+
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+index ace993bc8..e27fe69b3 100644
+--- a/src/common/mtk_vendor.h
++++ b/src/common/mtk_vendor.h
+@@ -15,6 +15,7 @@ enum mtk_nl80211_vendor_subcmds {
+ MTK_NL80211_VENDOR_SUBCMD_EDCCA_CTRL = 0xc7,
+ MTK_NL80211_VENDOR_SUBCMD_3WIRE_CTRL = 0xc8,
+ MTK_NL80211_VENDOR_SUBCMD_IBF_CTRL = 0xc9,
++ MTK_NL80211_VENDOR_SUBCMD_BSS_COLOR_CTRL = 0xca,
+ };
+
+ enum mtk_vendor_attr_edcca_ctrl {
+@@ -256,6 +257,16 @@ ibf_dump_policy[NUM_MTK_VENDOR_ATTRS_IBF_DUMP] = {
+ [MTK_VENDOR_ATTR_IBF_DUMP_ENABLE] = { .type = NLA_U8 },
+ };
+
++enum mtk_vendor_attr_bss_color_ctrl {
++ MTK_VENDOR_ATTR_BSS_COLOR_CTRL_UNSPEC,
++
++ MTK_VENDOR_ATTR_AVAL_BSS_COLOR_BMP,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_BSS_COLOR_CTRL,
++ MTK_VENDOR_ATTR_BSS_COLOR_CTRL_MAX =
++ NUM_MTK_VENDOR_ATTRS_BSS_COLOR_CTRL - 1
++};
+
+ #define CSI_MAX_COUNT 256
+ #define ETH_ALEN 6
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index 041d103d2..49ab4d799 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -5236,6 +5236,14 @@ struct wpa_driver_ops {
+ */
+ int (*amsdu_ctrl)(void *priv, u8 amsdu);
+ int (*amsdu_dump)(void *priv, u8 *amsdu);
++
++ /**
++ * get_aval_color_bmp - get available BSS color bitmap
++ * @priv: Private driver interface data
++ * @aval_color_bmp: available bss color bitmap
++ *
++ */
++ int (*get_aval_color_bmp)(void *priv, u64 *aval_color_bmp);
+ };
+
+ /**
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index 48faf2217..bbaaeb719 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -13065,7 +13065,6 @@ static void nl80211_parse_btm_candidate_info(struct candidate_list *candidate,
+ num, MAC2STR(candidate->bssid), buf);
+ }
+
+-
+ static int
+ nl80211_get_bss_transition_status_handler(struct nl_msg *msg, void *arg)
+ {
+@@ -14488,6 +14487,202 @@ fail:
+ return -ENOBUFS;
+ }
+
++static int nl80211_get_aval_color_bmp_handler(struct nl_msg *msg, void *arg)
++{
++ u64 *aval_color_bmp = arg;
++ struct nlattr *tb[NL80211_ATTR_MAX + 1];
++ struct nlattr *tb_vendor[MTK_VENDOR_ATTR_BSS_COLOR_CTRL_MAX + 1];
++ struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
++ struct nlattr *nl_vend, *attr;
++
++ static const struct nla_policy
++ bss_color_ctrl_policy[NUM_MTK_VENDOR_ATTRS_BSS_COLOR_CTRL + 1] = {
++ [MTK_VENDOR_ATTR_AVAL_BSS_COLOR_BMP] = { .type = NLA_U64 },
++ };
++
++ nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
++ genlmsg_attrlen(gnlh, 0), NULL);
++
++ nl_vend = tb[NL80211_ATTR_VENDOR_DATA];
++ if (!nl_vend)
++ return NL_SKIP;
++
++ nla_parse(tb_vendor, MTK_VENDOR_ATTR_BSS_COLOR_CTRL_MAX,
++ nla_data(nl_vend), nla_len(nl_vend), NULL);
++
++ *aval_color_bmp = nla_get_u64(tb_vendor[MTK_VENDOR_ATTR_AVAL_BSS_COLOR_BMP]);
++
++ return 0;
++}
++
++static int nl80211_get_aval_color_bmp(void *priv, u64 *aval_color_bmp)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *attr;
++ int ret;
++
++ if (!drv->mtk_bss_color_vendor_cmd_avail) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Driver does not support BSS COLOR vendor cmd");
++ return 0;
++ }
++
++ if (!(msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_VENDOR)) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
++ MTK_NL80211_VENDOR_SUBCMD_BSS_COLOR_CTRL))
++ return -ENOBUFS;
++
++ attr = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA);
++ if (!attr) {
++ nlmsg_free(msg);
++ return -1;
++ }
++
++ nla_nest_end(msg, attr);
++
++ ret = send_and_recv_resp(drv, msg, nl80211_get_aval_color_bmp_handler, aval_color_bmp);
++
++ if (ret) {
++ wpa_printf(MSG_ERROR, "Failed to send BSS COLOR vendor cmd. ret=%d (%s) ",
++ ret, strerror(-ret));
++ }
++ return ret;
++}
++
++static int nl80211_ap_wireless(void *priv, u8 sub_vendor_id, int value)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *data;
++ int ret;
++
++ if (!drv->mtk_wireless_vendor_cmd_avail) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Driver does not support setting ap wireless control");
++ return 0;
++ }
++
++ msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR);
++ if (!msg)
++ goto fail;
++
++ if (nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, MTK_NL80211_VENDOR_SUBCMD_WIRELESS_CTRL))
++ goto fail;
++
++ data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA);
++ if (!data)
++ goto fail;
++
++ if (sub_vendor_id == MTK_VENDOR_ATTR_WIRELESS_CTRL_BA_BUFFER_SIZE)
++ nla_put_u16(msg, sub_vendor_id, (u16) value);
++ else
++ nla_put_u8(msg, sub_vendor_id, (u8) value);
++
++ nla_nest_end(msg, data);
++ ret = send_and_recv_cmd(drv, msg);
++ if (ret)
++ wpa_printf(MSG_ERROR, "Failed to set ap_wireless. ret=%d (%s)", ret, strerror(-ret));
++
++ return ret;
++
++fail:
++ nlmsg_free(msg);
++ return -ENOBUFS;
++}
++
++static int nl80211_ap_rfeatures(void *priv, u8 sub_vendor_id, int value)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *data;
++ int ret;
++
++ if (!drv->mtk_rfeatures_vendor_cmd_avail) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Driver does not support setting ap rfeatures control");
++ return 0;
++ }
++
++ msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR);
++ if (!msg)
++ goto fail;
++
++ if (nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, MTK_NL80211_VENDOR_SUBCMD_RFEATURE_CTRL))
++ goto fail;
++
++ data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA);
++ if (!data)
++ goto fail;
++
++ nla_put_u8(msg, sub_vendor_id, (u8) value);
++
++ nla_nest_end(msg, data);
++
++ ret = send_and_recv_cmd(drv, msg);
++ if (ret)
++ wpa_printf(MSG_ERROR, "Failed to set rf_features. ret=%d (%s)", ret, strerror(-ret));
++
++ return ret;
++
++fail:
++ nlmsg_free(msg);
++ return -ENOBUFS;
++}
++
++static int nl80211_ap_trigtype(void *priv, u8 enable, u8 type)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *data, *data2;
++ int ret;
++
++ if (!drv->mtk_rfeatures_vendor_cmd_avail) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Driver does not support setting ap rfeatures control");
++ return 0;
++ }
++
++ msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR);
++ if (!msg)
++ goto fail;
++
++ if (nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, MTK_NL80211_VENDOR_SUBCMD_RFEATURE_CTRL))
++ goto fail;
++
++ data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA);
++ if (!data)
++ goto fail;
++
++ data2 = nla_nest_start(msg, MTK_VENDOR_ATTR_RFEATURE_CTRL_TRIG_TYPE_CFG);
++ if (!data2)
++ goto fail;
++
++ nla_put_u8(msg, MTK_VENDOR_ATTR_RFEATURE_CTRL_TRIG_TYPE_EN, enable);
++ nla_put_u8(msg, MTK_VENDOR_ATTR_RFEATURE_CTRL_TRIG_TYPE, type);
++
++ nla_nest_end(msg, data2);
++ nla_nest_end(msg, data);
++
++ ret = send_and_recv_cmd(drv, msg);
++ if (ret)
++ wpa_printf(MSG_ERROR, "Failed to set trig_type. ret=%d (%s)", ret, strerror(-ret));
++
++ return ret;
++
++fail:
++ nlmsg_free(msg);
++ return -ENOBUFS;
++}
++
+ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .name = "nl80211",
+ .desc = "Linux nl80211/cfg80211",
+@@ -14654,4 +14849,5 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .ibf_dump = nl80211_ibf_dump,
+ .amsdu_ctrl = nl80211_enable_amsdu,
+ .amsdu_dump = nl80211_dump_amsdu,
++ .get_aval_color_bmp = nl80211_get_aval_color_bmp,
+ };
+diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
+index b6c3b85cc..7a6dfef93 100644
+--- a/src/drivers/driver_nl80211.h
++++ b/src/drivers/driver_nl80211.h
+@@ -204,6 +204,7 @@ struct wpa_driver_nl80211_data {
+ unsigned int mtk_3wire_vendor_cmd_avail:1;
+ unsigned int mtk_ibf_vendor_cmd_avail:1;
+ unsigned int mtk_wireless_vendor_cmd_avail:1;
++ unsigned int mtk_bss_color_vendor_cmd_avail:1;
+
+ u32 ignore_next_local_disconnect;
+ u32 ignore_next_local_deauth;
+diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
+index 9fbcc6923..32e51906b 100644
+--- a/src/drivers/driver_nl80211_capa.c
++++ b/src/drivers/driver_nl80211_capa.c
+@@ -1152,6 +1152,9 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
+ case MTK_NL80211_VENDOR_SUBCMD_WIRELESS_CTRL:
+ drv->mtk_wireless_vendor_cmd_avail = 1;
+ break;
++ case MTK_NL80211_VENDOR_SUBCMD_BSS_COLOR_CTRL :
++ drv->mtk_bss_color_vendor_cmd_avail = 1;
++ break;
+ }
+ }
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0027-mtk-hostapd-Fix-ZWDFS-issue-in-BW-160.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0027-mtk-hostapd-Fix-ZWDFS-issue-in-BW-160.patch
new file mode 100644
index 0000000..130944d
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0027-mtk-hostapd-Fix-ZWDFS-issue-in-BW-160.patch
@@ -0,0 +1,210 @@
+From 582966e5a855f513eac7b9bc3df975c856a8ce39 Mon Sep 17 00:00:00 2001
+From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+Date: Mon, 20 Mar 2023 16:08:30 +0800
+Subject: [PATCH 27/69] mtk: hostapd: Fix ZWDFS issue in BW 160
+
+When background radar is enabled and bandwidth is set to 160, AP will
+fail to startup due to the lack of non-DFS channel.
+Under this circumstance, AP should perform CAC itself, and the background
+chain could also perform CAC simultaneously.
+
+Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+---
+ src/ap/dfs.c | 98 ++++++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 79 insertions(+), 19 deletions(-)
+
+diff --git a/src/ap/dfs.c b/src/ap/dfs.c
+index 3e036441b..f5794753e 100644
+--- a/src/ap/dfs.c
++++ b/src/ap/dfs.c
+@@ -69,15 +69,22 @@ static int dfs_get_used_n_chans(struct hostapd_iface *iface, int *seg1)
+ static int dfs_channel_available(struct hostapd_channel_data *chan,
+ enum dfs_channel_type type)
+ {
++ int dfs_status = chan->flag & HOSTAPD_CHAN_DFS_MASK;
++
++ if (chan->flag & HOSTAPD_CHAN_DISABLED)
++ return -1;
++
+ if (type == DFS_NO_CAC_YET) {
+ /* Select only radar channel where CAC has not been
+ * performed yet
+ */
+- if ((chan->flag & HOSTAPD_CHAN_RADAR) &&
+- (chan->flag & HOSTAPD_CHAN_DFS_MASK) ==
+- HOSTAPD_CHAN_DFS_USABLE)
++ if (!(chan->flag & HOSTAPD_CHAN_RADAR))
++ return 0;
++
++ if (dfs_status == HOSTAPD_CHAN_DFS_USABLE)
+ return 1;
+- return 0;
++
++ return -1;
+ }
+
+ /*
+@@ -86,16 +93,14 @@ static int dfs_channel_available(struct hostapd_channel_data *chan,
+ * channel for CSA, unless they are available for immediate use.
+ */
+ if (type == DFS_AVAILABLE && (chan->flag & HOSTAPD_CHAN_RADAR) &&
+- ((chan->flag & HOSTAPD_CHAN_DFS_MASK) !=
+- HOSTAPD_CHAN_DFS_AVAILABLE))
+- return 0;
++ (dfs_status != HOSTAPD_CHAN_DFS_AVAILABLE))
++ return -1;
+
+- if (chan->flag & HOSTAPD_CHAN_DISABLED)
+- return 0;
+ if ((chan->flag & HOSTAPD_CHAN_RADAR) &&
+- ((chan->flag & HOSTAPD_CHAN_DFS_MASK) ==
+- HOSTAPD_CHAN_DFS_UNAVAILABLE))
+- return 0;
++ ((dfs_status == HOSTAPD_CHAN_DFS_UNAVAILABLE) ||
++ (dfs_status == HOSTAPD_CHAN_DFS_UNKNOWN)))
++ return -1;
++
+ return 1;
+ }
+
+@@ -167,7 +172,7 @@ static int dfs_chan_range_available(struct hostapd_hw_modes *mode,
+ enum dfs_channel_type type)
+ {
+ struct hostapd_channel_data *first_chan, *chan;
+- int i;
++ int i, available = 0, ret = 0;
+ u32 bw = num_chan_to_bw(num_chans);
+
+ if (first_chan_idx + num_chans > mode->num_channels) {
+@@ -203,14 +208,17 @@ static int dfs_chan_range_available(struct hostapd_hw_modes *mode,
+ return 0;
+ }
+
+- if (!dfs_channel_available(chan, type)) {
++ ret = dfs_channel_available(chan, type);
++ if (ret < 0) {
+ wpa_printf(MSG_DEBUG, "DFS: channel not available %d",
+ first_chan->freq + i * 20);
+ return 0;
+ }
++
++ available |= ret;
+ }
+
+- return 1;
++ return available;
+ }
+
+
+@@ -838,8 +846,12 @@ static unsigned int dfs_get_cac_time(struct hostapd_iface *iface,
+ */
+ int hostapd_handle_dfs(struct hostapd_iface *iface)
+ {
++ struct hostapd_channel_data *channel;
+ int res, n_chans, n_chans1, start_chan_idx, start_chan_idx1;
+- int skip_radar = 0;
++ int sec = 0, skip_radar = 0;
++ u8 cf1 = 0, cf2 = 0;
++ bool use_radar_background = dfs_use_radar_background(iface);
++ enum dfs_channel_type channel_type = DFS_NO_CAC_YET;
+
+ if (is_6ghz_freq(iface->freq))
+ return 1;
+@@ -902,7 +914,7 @@ int hostapd_handle_dfs(struct hostapd_iface *iface)
+ /* Finally start CAC */
+ hostapd_set_state(iface, HAPD_IFACE_DFS);
+ wpa_printf(MSG_DEBUG, "DFS start CAC on %d MHz%s", iface->freq,
+- dfs_use_radar_background(iface) ? " (background)" : "");
++ use_radar_background ? " (background)" : "");
+ wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, DFS_EVENT_CAC_START
+ "freq=%d chan=%d sec_chan=%d, width=%d, seg0=%d, seg1=%d, cac_time=%ds",
+ iface->freq,
+@@ -912,6 +924,16 @@ int hostapd_handle_dfs(struct hostapd_iface *iface)
+ hostapd_get_oper_centr_freq_seg1_idx(iface->conf),
+ iface->dfs_cac_ms / 1000);
+
++ if (use_radar_background) {
++ channel = dfs_get_valid_channel(iface, &sec, &cf1, &cf2, DFS_AVAILABLE);
++ /*
++ * AP cannot get any random available channel.
++ * Let AP and dedicated radar chain both perform CAC.
++ */
++ if (!channel)
++ use_radar_background = false;
++ }
++
+ res = hostapd_start_dfs_cac(
+ iface, iface->conf->hw_mode, iface->freq, iface->conf->channel,
+ iface->conf->ieee80211n, iface->conf->ieee80211ac,
+@@ -920,14 +942,14 @@ int hostapd_handle_dfs(struct hostapd_iface *iface)
+ hostapd_get_oper_chwidth(iface->conf),
+ hostapd_get_oper_centr_freq_seg0_idx(iface->conf),
+ hostapd_get_oper_centr_freq_seg1_idx(iface->conf),
+- dfs_use_radar_background(iface));
++ use_radar_background);
+
+ if (res) {
+ wpa_printf(MSG_ERROR, "DFS start_dfs_cac() failed, %d", res);
+ return -1;
+ }
+
+- if (dfs_use_radar_background(iface)) {
++ if (use_radar_background) {
+ /* Cache background radar parameters. */
+ iface->radar_background.channel = iface->conf->channel;
+ iface->radar_background.secondary_channel =
+@@ -948,6 +970,35 @@ int hostapd_handle_dfs(struct hostapd_iface *iface)
+
+ iface->radar_background.temp_ch = 1;
+ return 1;
++ } else if (dfs_use_radar_background(iface)) {
++ if (iface->dfs_domain == HOSTAPD_DFS_REGION_ETSI)
++ channel_type = DFS_ANY_CHANNEL;
++
++ channel = dfs_get_valid_channel(iface, &sec, &cf1, &cf2, channel_type);
++
++ if (!channel ||
++ (channel->chan == iface->conf->channel &&
++ cf1 == hostapd_get_oper_centr_freq_seg0_idx(iface->conf) &&
++ cf2 == hostapd_get_oper_centr_freq_seg1_idx(iface->conf))) {
++ wpa_printf(MSG_ERROR, "Background radar could not get valid channel\n");
++ iface->radar_background.channel = -1;
++ return 0;
++ }
++
++ hostapd_start_dfs_cac(iface, iface->conf->hw_mode,
++ channel->freq, channel->chan,
++ iface->conf->ieee80211n,
++ iface->conf->ieee80211ac,
++ iface->conf->ieee80211ax,
++ iface->conf->ieee80211be,
++ sec, hostapd_get_oper_chwidth(iface->conf),
++ cf1, cf2, true);
++
++ iface->radar_background.channel = channel->chan;
++ iface->radar_background.freq = channel->freq;
++ iface->radar_background.secondary_channel = sec;
++ iface->radar_background.centr_freq_seg0_idx = cf1;
++ iface->radar_background.centr_freq_seg1_idx = cf2;
+ }
+
+ return 0;
+@@ -1204,6 +1255,15 @@ int hostapd_dfs_complete_cac(struct hostapd_iface *iface, int success, int freq,
+ hostapd_setup_interface_complete(iface, 0);
+ iface->cac_started = 0;
+ }
++
++ /*
++ * When background radar is enabled but the CAC completion
++ * is not received from the background chain.
++ * Then, reset radar background chain.
++ */
++ if (dfs_use_radar_background(iface) &&
++ iface->radar_background.channel == -1)
++ hostapd_dfs_update_background_chain(iface);
+ }
+ } else if (hostapd_dfs_is_background_event(iface, freq)) {
+ iface->radar_background.cac_started = 0;
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0028-mtk-hostapd-Add-vendor-for-CAPI-certification-comman.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0028-mtk-hostapd-Add-vendor-for-CAPI-certification-comman.patch
new file mode 100644
index 0000000..146c114
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0028-mtk-hostapd-Add-vendor-for-CAPI-certification-comman.patch
@@ -0,0 +1,396 @@
+From d91fb39cfb9826f4147de48cb35ec47d80add185 Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Fri, 17 Mar 2023 16:17:14 +0800
+Subject: [PATCH 28/69] mtk: hostapd: Add vendor for CAPI certification
+ commands
+
+---
+ hostapd/ctrl_iface.c | 99 +++++++++++++++++++++++++++++++
+ src/ap/ap_drv_ops.c | 21 +++++++
+ src/ap/ap_drv_ops.h | 3 +
+ src/common/mtk_vendor.h | 33 +----------
+ src/drivers/driver.h | 22 +++++++
+ src/drivers/driver_nl80211.c | 55 +++++++++++++++++
+ src/drivers/driver_nl80211.h | 1 +
+ src/drivers/driver_nl80211_capa.c | 3 +
+ 8 files changed, 206 insertions(+), 31 deletions(-)
+
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index 42a3c6c20..57de8ebfa 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -71,6 +71,7 @@
+ #include "config_file.h"
+ #include "ctrl_iface.h"
+
++#include "common/mtk_vendor.h"
+
+ #define HOSTAPD_CLI_DUP_VALUE_MAX_LEN 256
+
+@@ -4348,6 +4349,100 @@ hostapd_ctrl_iface_get_aval_color_bmp(struct hostapd_data *hapd, char *buf,
+ return pos - buf;
+ }
+
++static int
++hostapd_ctrl_iface_ap_wireless(struct hostapd_data *hapd, char *cmd,
++ char *buf, size_t buflen)
++{
++ char *pos, *value, *config = cmd;
++ enum mtk_vendor_attr_wireless_ctrl sub_cmd;
++
++ pos = os_strchr(config, '=');
++ if (pos == NULL)
++ return -1;
++ *pos++ = '\0';
++
++ if(pos == NULL)
++ return -1;
++ value = pos;
++
++ if (os_strncmp(config, "fixed_mcs", 9) == 0)
++ sub_cmd = MTK_VENDOR_ATTR_WIRELESS_CTRL_FIXED_MCS;
++ else if (os_strncmp(config, "ofdma", 5) == 0)
++ sub_cmd = MTK_VENDOR_ATTR_WIRELESS_CTRL_FIXED_OFDMA;
++ else if (os_strncmp(config, "ppdu_type", 9) == 0)
++ sub_cmd = MTK_VENDOR_ATTR_WIRELESS_CTRL_PPDU_TX_TYPE;
++ else if (os_strncmp(config, "nusers_ofdma", 12) == 0)
++ sub_cmd = MTK_VENDOR_ATTR_WIRELESS_CTRL_NUSERS_OFDMA;
++ else if (os_strncmp(config, "add_ba_req_bufsize", 18) == 0)
++ sub_cmd = MTK_VENDOR_ATTR_WIRELESS_CTRL_BA_BUFFER_SIZE;
++ else if (os_strncmp(config, "mimo", 4) == 0)
++ sub_cmd = MTK_VENDOR_ATTR_WIRELESS_CTRL_MIMO;
++ else if (os_strncmp(config, "cert", 4) == 0)
++ sub_cmd = MTK_VENDOR_ATTR_WIRELESS_CTRL_CERT ;
++ else if (os_strncmp(config, "amsdu", 5) == 0)
++ sub_cmd = MTK_VENDOR_ATTR_WIRELESS_CTRL_AMSDU;
++ else if (os_strncmp(config, "rts_sigta", 9) == 0)
++ sub_cmd = MTK_VENDOR_ATTR_WIRELESS_CTRL_RTS_SIGTA;
++ else {
++ wpa_printf(MSG_ERROR,
++ "Unsupported parameter %s for ap_wireless", config);
++ return -1;
++ }
++
++ if (hostapd_drv_ap_wireless(hapd, (u8) sub_cmd, atoi(value)) != 0)
++ return -1;
++
++ return os_snprintf(buf, buflen, "OK\n");
++}
++
++static int
++hostapd_ctrl_iface_ap_rfeatures(struct hostapd_data *hapd, char *cmd,
++ char *buf, size_t buflen)
++{
++ char *pos, *value, *type, *config = cmd;
++ enum mtk_vendor_attr_rfeature_ctrl sub_cmd;
++
++ pos = os_strchr(config, '=');
++ if (pos == NULL)
++ return -1;
++ *pos++ = '\0';
++
++ if(pos == NULL)
++ return -1;
++ value = pos;
++
++ if (os_strncmp(config, "he_gi", 5) == 0)
++ sub_cmd = MTK_VENDOR_ATTR_RFEATURE_CTRL_HE_GI;
++ else if (os_strncmp(config, "he_ltf", 6) == 0)
++ sub_cmd = MTK_VENDOR_ATTR_RFEATURE_CTRL_HE_LTF;
++ else if (os_strncmp(config, "trig_type", 9) == 0) {
++ pos = os_strchr(value, ',');
++ if (pos == NULL)
++ return -1;
++ *pos++ = '\0';
++ if(pos == NULL)
++ return -1;
++ type = pos;
++ goto trigtype;
++ } else if (os_strcmp(config, "ack_policy") == 0)
++ sub_cmd = MTK_VENDOR_ATTR_RFEATURE_CTRL_ACK_PLCY;
++ else {
++ wpa_printf(MSG_ERROR,
++ "Unsupported parameter %s for ap_rfeatures", config);
++ return -1;
++ }
++
++ if (hostapd_drv_ap_rfeatures(hapd, (u8) sub_cmd, atoi(value)) != 0)
++ return -1;
++ goto exit;
++
++trigtype:
++ if (hostapd_drv_ap_trig_type(hapd, atoi(value), atoi(type)) != 0)
++ return -1;
++
++exit:
++ return os_snprintf(buf, buflen, "OK\n");
++}
+
+ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ char *buf, char *reply,
+@@ -4973,6 +5068,10 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ reply_len = hostapd_ctrl_iface_get_bss_color(hapd, reply, reply_size);
+ } else if (os_strncmp(buf, "AVAL_COLOR_BMP", 14) == 0) {
+ reply_len = hostapd_ctrl_iface_get_aval_color_bmp(hapd, reply, reply_size);
++ } else if (os_strncmp(buf, "ap_wireless ", 12) == 0) {
++ reply_len = hostapd_ctrl_iface_ap_wireless(hapd, buf + 12, reply, reply_size);
++ } else if (os_strncmp(buf, "ap_rfeatures ", 13) == 0) {
++ reply_len = hostapd_ctrl_iface_ap_rfeatures(hapd, buf + 13, reply, reply_size);
+ } else {
+ os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
+ reply_len = 16;
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index 683f2c359..02ad55b96 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -1301,3 +1301,24 @@ int hostapd_drv_get_aval_bss_color_bmp(struct hostapd_data *hapd, u64 *aval_colo
+ return 0;
+ return hapd->driver->get_aval_color_bmp(hapd->drv_priv, aval_color_bmp);
+ }
++
++int hostapd_drv_ap_wireless(struct hostapd_data *hapd, u8 sub_vendor_id, int value)
++{
++ if (!hapd->driver || !hapd->driver->ap_wireless)
++ return 0;
++ return hapd->driver->ap_wireless(hapd->drv_priv, sub_vendor_id, value);
++}
++
++int hostapd_drv_ap_rfeatures(struct hostapd_data *hapd, u8 sub_vendor_id, int value)
++{
++ if (!hapd->driver || !hapd->driver->ap_rfeatures)
++ return 0;
++ return hapd->driver->ap_rfeatures(hapd->drv_priv, sub_vendor_id, value);
++}
++
++int hostapd_drv_ap_trig_type(struct hostapd_data *hapd, u8 enable, u8 type)
++{
++ if (!hapd->driver || !hapd->driver->ap_trigtype)
++ return 0;
++ return hapd->driver->ap_trigtype(hapd->drv_priv, enable, type);
++}
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index b76cad458..f0a8d503b 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -157,6 +157,9 @@ int hostapd_drv_amsdu_ctrl(struct hostapd_data *hapd);
+ int hostapd_drv_amsdu_dump(struct hostapd_data *hapd, u8 *amsdu);
+ int hostapd_drv_get_aval_bss_color_bmp(struct hostapd_data *hapd,
+ u64 *aval_color_bmp);
++int hostapd_drv_ap_wireless(struct hostapd_data *hapd, u8 sub_vendor_id, int value);
++int hostapd_drv_ap_rfeatures(struct hostapd_data *hapd, u8 sub_vendor_id, int value);
++int hostapd_drv_ap_trig_type(struct hostapd_data *hapd, u8 enable, u8 type);
+
+ #include "drivers/driver.h"
+
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+index e27fe69b3..0b23c76ad 100644
+--- a/src/common/mtk_vendor.h
++++ b/src/common/mtk_vendor.h
+@@ -50,17 +50,6 @@ enum mtk_vendor_attr_edcca_dump {
+ NUM_MTK_VENDOR_ATTRS_EDCCA_DUMP - 1
+ };
+
+-
+-static struct nla_policy edcca_ctrl_policy[NUM_MTK_VENDOR_ATTRS_EDCCA_CTRL] = {
+- [MTK_VENDOR_ATTR_EDCCA_CTRL_MODE] = { .type = NLA_U8 },
+- [MTK_VENDOR_ATTR_EDCCA_CTRL_PRI20_VAL] = { .type = NLA_U8 },
+- [MTK_VENDOR_ATTR_EDCCA_CTRL_SEC20_VAL] = { .type = NLA_U8 },
+- [MTK_VENDOR_ATTR_EDCCA_CTRL_SEC40_VAL] = { .type = NLA_U8 },
+- [MTK_VENDOR_ATTR_EDCCA_CTRL_SEC80_VAL] = { .type = NLA_U8 },
+- [MTK_VENDOR_ATTR_EDCCA_CTRL_COMPENSATE] = { .type = NLA_U8 },
+- [MTK_VENDOR_ATTR_EDCCA_CTRL_SEC160_VAL] = { .type = NLA_U8 },
+-};
+-
+ enum mtk_vendor_attr_3wire_ctrl {
+ MTK_VENDOR_ATTR_3WIRE_CTRL_UNSPEC,
+
+@@ -72,10 +61,6 @@ enum mtk_vendor_attr_3wire_ctrl {
+ NUM_MTK_VENDOR_ATTRS_3WIRE_CTRL - 1
+ };
+
+-static struct nla_policy three_wire_ctrl_policy[NUM_MTK_VENDOR_ATTRS_3WIRE_CTRL] = {
+- [MTK_VENDOR_ATTR_3WIRE_CTRL_MODE] = {.type = NLA_U8 },
+-};
+-
+ enum mtk_vendor_attr_csi_ctrl {
+ MTK_VENDOR_ATTR_CSI_CTRL_UNSPEC,
+
+@@ -172,7 +157,7 @@ enum mtk_vendor_attr_wireless_ctrl {
+ MTK_VENDOR_ATTR_WIRELESS_CTRL_BA_BUFFER_SIZE,
+ MTK_VENDOR_ATTR_WIRELESS_CTRL_MIMO,
+ MTK_VENDOR_ATTR_WIRELESS_CTRL_AMSDU,
+- MTK_VENDOR_ATTR_WIRELESS_CTRL_CERT,
++ MTK_VENDOR_ATTR_WIRELESS_CTRL_CERT = 9,
+ MTK_VENDOR_ATTR_WIRELESS_CTRL_RTS_SIGTA,
+
+ /* keep last */
+@@ -192,11 +177,6 @@ enum mtk_vendor_attr_wireless_dump {
+ NUM_MTK_VENDOR_ATTRS_WIRELESS_DUMP - 1
+ };
+
+-static const struct nla_policy
+-wireless_dump_policy[NUM_MTK_VENDOR_ATTRS_WIRELESS_DUMP] = {
+- [MTK_VENDOR_ATTR_WIRELESS_DUMP_AMSDU] = { .type = NLA_U8 },
+-};
+-
+ enum mtk_vendor_attr_rfeature_ctrl {
+ MTK_VENDOR_ATTR_RFEATURE_CTRL_UNSPEC,
+
+@@ -206,6 +186,7 @@ enum mtk_vendor_attr_rfeature_ctrl {
+ MTK_VENDOR_ATTR_RFEATURE_CTRL_TRIG_TYPE_EN,
+ MTK_VENDOR_ATTR_RFEATURE_CTRL_TRIG_TYPE,
+ MTK_VENDOR_ATTR_RFEATURE_CTRL_ACK_PLCY,
++ MTK_VENDOR_ATTR_RFEATURE_CTRL_TRIG_TXBF,
+
+ /* keep last */
+ NUM_MTK_VENDOR_ATTRS_RFEATURE_CTRL,
+@@ -247,16 +228,6 @@ enum mtk_vendor_attr_ibf_dump {
+ NUM_MTK_VENDOR_ATTRS_IBF_DUMP - 1
+ };
+
+-static struct nla_policy
+-ibf_ctrl_policy[NUM_MTK_VENDOR_ATTRS_IBF_CTRL] = {
+- [MTK_VENDOR_ATTR_IBF_CTRL_ENABLE] = { .type = NLA_U8 },
+-};
+-
+-static struct nla_policy
+-ibf_dump_policy[NUM_MTK_VENDOR_ATTRS_IBF_DUMP] = {
+- [MTK_VENDOR_ATTR_IBF_DUMP_ENABLE] = { .type = NLA_U8 },
+-};
+-
+ enum mtk_vendor_attr_bss_color_ctrl {
+ MTK_VENDOR_ATTR_BSS_COLOR_CTRL_UNSPEC,
+
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index 49ab4d799..1a3a24387 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -5244,6 +5244,28 @@ struct wpa_driver_ops {
+ *
+ */
+ int (*get_aval_color_bmp)(void *priv, u64 *aval_color_bmp);
++
++ /**
++ * ap_wireless - set wireless command
++ * @priv: Private driver interface data
++ * @value: value
++ */
++ int (*ap_wireless)(void *priv, u8 mode, int value);
++
++ /**
++ * ap_rfeatures - set ap rf features command
++ * @priv: Private driver interface data
++ * @value: value
++ */
++ int (*ap_rfeatures)(void *priv, u8 mode, int value);
++
++ /**
++ * ap_trigtype - set trigger type
++ * @priv: Private driver interface data
++ * @enable: enable or disable
++ * @type: trigger type
++ */
++ int (*ap_trigtype)(void *priv, u8 enable, u8 type);
+ };
+
+ /**
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index bbaaeb719..e076b1d02 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -91,6 +91,58 @@ static void handle_nl_debug_hook(struct nl_msg *msg, int tx)
+ wpa_netlink_hook(tx, nlh, nlh->nlmsg_len);
+ }
+
++static struct nla_policy
++ibf_ctrl_policy[NUM_MTK_VENDOR_ATTRS_IBF_CTRL] = {
++ [MTK_VENDOR_ATTR_IBF_CTRL_ENABLE] = { .type = NLA_U8 },
++};
++
++static struct nla_policy
++ibf_dump_policy[NUM_MTK_VENDOR_ATTRS_IBF_DUMP] = {
++ [MTK_VENDOR_ATTR_IBF_DUMP_ENABLE] = { .type = NLA_U8 },
++};
++
++static struct nla_policy three_wire_ctrl_policy[NUM_MTK_VENDOR_ATTRS_3WIRE_CTRL] = {
++ [MTK_VENDOR_ATTR_3WIRE_CTRL_MODE] = {.type = NLA_U8 },
++};
++
++static struct nla_policy edcca_ctrl_policy[NUM_MTK_VENDOR_ATTRS_EDCCA_CTRL] = {
++ [MTK_VENDOR_ATTR_EDCCA_CTRL_MODE] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_EDCCA_CTRL_PRI20_VAL] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_EDCCA_CTRL_SEC20_VAL] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_EDCCA_CTRL_SEC40_VAL] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_EDCCA_CTRL_SEC80_VAL] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_EDCCA_CTRL_COMPENSATE] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_EDCCA_CTRL_SEC160_VAL] = { .type = NLA_U8 },
++};
++
++static const struct nla_policy
++wireless_dump_policy[NUM_MTK_VENDOR_ATTRS_WIRELESS_DUMP] = {
++ [MTK_VENDOR_ATTR_WIRELESS_DUMP_AMSDU] = { .type = NLA_U8 },
++};
++
++static const struct nla_policy
++rfeature_ctrl_policy[NUM_MTK_VENDOR_ATTRS_RFEATURE_CTRL] = {
++ [MTK_VENDOR_ATTR_RFEATURE_CTRL_HE_GI] = {.type = NLA_U8 },
++ [MTK_VENDOR_ATTR_RFEATURE_CTRL_HE_LTF] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_RFEATURE_CTRL_TRIG_TYPE_CFG] = { .type = NLA_NESTED },
++ [MTK_VENDOR_ATTR_RFEATURE_CTRL_TRIG_TYPE_EN] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_RFEATURE_CTRL_TRIG_TYPE] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_RFEATURE_CTRL_ACK_PLCY] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_RFEATURE_CTRL_TRIG_TXBF] = { .type = NLA_U8 },
++};
++
++static const struct nla_policy
++wireless_ctrl_policy[NUM_MTK_VENDOR_ATTRS_WIRELESS_CTRL] = {
++ [MTK_VENDOR_ATTR_WIRELESS_CTRL_FIXED_MCS] = {.type = NLA_U8 },
++ [MTK_VENDOR_ATTR_WIRELESS_CTRL_FIXED_OFDMA] = {.type = NLA_U8 },
++ [MTK_VENDOR_ATTR_WIRELESS_CTRL_PPDU_TX_TYPE] = {.type = NLA_U8 },
++ [MTK_VENDOR_ATTR_WIRELESS_CTRL_NUSERS_OFDMA] = {.type = NLA_U8 },
++ [MTK_VENDOR_ATTR_WIRELESS_CTRL_MIMO] = {.type = NLA_U8 },
++ [MTK_VENDOR_ATTR_WIRELESS_CTRL_BA_BUFFER_SIZE] = {.type = NLA_U16 },
++ [MTK_VENDOR_ATTR_WIRELESS_CTRL_AMSDU] = {.type = NLA_U8 },
++ [MTK_VENDOR_ATTR_WIRELESS_CTRL_CERT] = {.type = NLA_U8 },
++};
++
+ static struct nl_sock * nl_create_handle(struct nl_cb *cb, const char *dbg)
+ {
+ struct nl_sock *handle;
+@@ -14850,4 +14902,7 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .amsdu_ctrl = nl80211_enable_amsdu,
+ .amsdu_dump = nl80211_dump_amsdu,
+ .get_aval_color_bmp = nl80211_get_aval_color_bmp,
++ .ap_wireless = nl80211_ap_wireless,
++ .ap_rfeatures = nl80211_ap_rfeatures,
++ .ap_trigtype = nl80211_ap_trigtype,
+ };
+diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
+index 7a6dfef93..10045ea5b 100644
+--- a/src/drivers/driver_nl80211.h
++++ b/src/drivers/driver_nl80211.h
+@@ -205,6 +205,7 @@ struct wpa_driver_nl80211_data {
+ unsigned int mtk_ibf_vendor_cmd_avail:1;
+ unsigned int mtk_wireless_vendor_cmd_avail:1;
+ unsigned int mtk_bss_color_vendor_cmd_avail:1;
++ unsigned int mtk_rfeatures_vendor_cmd_avail:1;
+
+ u32 ignore_next_local_disconnect;
+ u32 ignore_next_local_deauth;
+diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
+index 32e51906b..3e27b52b7 100644
+--- a/src/drivers/driver_nl80211_capa.c
++++ b/src/drivers/driver_nl80211_capa.c
+@@ -1155,6 +1155,9 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
+ case MTK_NL80211_VENDOR_SUBCMD_BSS_COLOR_CTRL :
+ drv->mtk_bss_color_vendor_cmd_avail = 1;
+ break;
++ case MTK_NL80211_VENDOR_SUBCMD_RFEATURE_CTRL:
++ drv->mtk_rfeatures_vendor_cmd_avail = 1;
++ break;
+ }
+ }
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0029-mtk-hostapd-Air-Monitor-support-in-hostapd-by-vendor.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0029-mtk-hostapd-Air-Monitor-support-in-hostapd-by-vendor.patch
new file mode 100644
index 0000000..0a4de0a
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0029-mtk-hostapd-Air-Monitor-support-in-hostapd-by-vendor.patch
@@ -0,0 +1,505 @@
+From fe9aff09f8b37b1f9c5d19f834d520e038374204 Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Fri, 12 May 2023 05:18:48 +0800
+Subject: [PATCH 29/69] mtk: hostapd: Air Monitor support in hostapd by vendor
+
+Signed-off-by: mtk23888 <dipanshu.mittal@mediatek.com>
+---
+ hostapd/ctrl_iface.c | 113 +++++++++++++++++++
+ hostapd/hostapd_cli.c | 15 +++
+ src/ap/ap_drv_ops.c | 14 +++
+ src/ap/ap_drv_ops.h | 3 +
+ src/common/mtk_vendor.h | 8 ++
+ src/drivers/driver.h | 16 +++
+ src/drivers/driver_nl80211.c | 179 ++++++++++++++++++++++++++++++
+ src/drivers/driver_nl80211.h | 1 +
+ src/drivers/driver_nl80211_capa.c | 2 +
+ 9 files changed, 351 insertions(+)
+
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index 57de8ebfa..b89facb56 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -4391,6 +4391,44 @@ hostapd_ctrl_iface_ap_wireless(struct hostapd_data *hapd, char *cmd,
+
+ if (hostapd_drv_ap_wireless(hapd, (u8) sub_cmd, atoi(value)) != 0)
+ return -1;
++ return os_snprintf(buf, buflen, "OK\n");
++}
++
++static int
++hostapd_ctrl_iface_set_amnt(struct hostapd_data *hapd, char *cmd,
++ char *buf, size_t buflen)
++{
++ char *tmp, sta_mac[ETH_ALEN] = {0};
++ int amnt_idx = 0;
++
++ tmp = strtok_r(cmd, " ", &cmd);
++
++ if (!tmp) {
++ wpa_printf(MSG_ERROR, "Error in command format\n");
++ return -1;
++ }
++
++ amnt_idx = strtol(tmp, &tmp, 10);
++
++ if (amnt_idx < 0 || amnt_idx > 15) {
++ wpa_printf(MSG_ERROR, "Wrong AMNT index %d\n", amnt_idx);
++ return -1;
++ }
++
++ if (!cmd) {
++ wpa_printf(MSG_ERROR, "Error in command format\n");
++ return -1;
++ }
++
++ if (hwaddr_aton(cmd, sta_mac) < 0) {
++ wpa_printf(MSG_ERROR, "station mac is not right.\n");
++ return -1;
++ }
++
++ if (hostapd_drv_amnt_set(hapd, amnt_idx, sta_mac)) {
++ wpa_printf(MSG_ERROR, "Not able to set amnt index\n");
++ return -1;
++ }
+
+ return os_snprintf(buf, buflen, "OK\n");
+ }
+@@ -4444,6 +4482,75 @@ exit:
+ return os_snprintf(buf, buflen, "OK\n");
+ }
+
++static int
++hostapd_ctrl_iface_dump_amnt(struct hostapd_data *hapd, char *cmd,
++ char *buf, size_t buflen)
++{
++ char *tmp;
++ int amnt_idx = 0, ret = 0;
++ struct amnt_resp_data *resp_buf;
++ char *pos, *end;
++ struct amnt_data *res;
++
++ pos = buf;
++ end = buf + buflen;
++
++ tmp = strtok_r(cmd, " ", &cmd);
++
++ if (!tmp) {
++ wpa_printf(MSG_ERROR, "Error in command format\n");
++ return -1;
++ }
++
++ amnt_idx = strtoul(tmp, &tmp, 0);
++
++ if ((amnt_idx < 0 || amnt_idx > 15) && amnt_idx != 0xff) {
++ wpa_printf(MSG_ERROR, "Wrong AMNT index\n");
++ return -1;
++ }
++
++ if (amnt_idx == 0xff)
++ resp_buf = (struct amnt_resp_data *) os_zalloc(AIR_MONITOR_MAX_ENTRY
++ * sizeof(struct amnt_data) + 1);
++ else
++ resp_buf = (struct amnt_resp_data *) os_zalloc(sizeof(struct amnt_data) + 1);
++
++ if (resp_buf == NULL) {
++ wpa_printf(MSG_ERROR, "Error in memory allocation\n");
++ return -1;
++ }
++
++ if (hostapd_drv_amnt_dump(hapd, amnt_idx, (u8 *)resp_buf)) {
++ wpa_printf(MSG_ERROR, "Not able to set amnt index\n");
++ os_free(resp_buf);
++ return -1;
++ }
++
++ for (int i = 0; i < resp_buf->sta_num && i < AIR_MONITOR_MAX_ENTRY; i++) {
++ res = &resp_buf->resp_data[i];
++ ret = os_snprintf(pos, end - pos,
++ "[hostapd_cli] amnt_idx: %d, addr="MACSTR
++ ", rssi=%d/%d/%d/%d, last_seen=%u\n",
++ res->idx,
++ MAC2STR(res->addr), res->rssi[0],
++ res->rssi[1], res->rssi[2],
++ res->rssi[3], res->last_seen);
++ if (os_snprintf_error(end - pos, ret)) {
++ os_free(resp_buf);
++ return 0;
++ }
++ pos = pos + ret;
++ }
++
++ os_free(resp_buf);
++
++ if (pos == buf)
++ return os_snprintf(buf, buflen, "Index %d is not monitored\n",
++ amnt_idx);
++ else
++ return pos - buf;
++}
++
+ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ char *buf, char *reply,
+ int reply_size,
+@@ -5072,6 +5179,12 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ reply_len = hostapd_ctrl_iface_ap_wireless(hapd, buf + 12, reply, reply_size);
+ } else if (os_strncmp(buf, "ap_rfeatures ", 13) == 0) {
+ reply_len = hostapd_ctrl_iface_ap_rfeatures(hapd, buf + 13, reply, reply_size);
++ } else if (os_strncmp(buf, "SET_AMNT", 8) == 0) {
++ reply_len = hostapd_ctrl_iface_set_amnt(hapd, buf+9,
++ reply, reply_size);
++ } else if (os_strncmp(buf, "DUMP_AMNT", 9) == 0) {
++ reply_len = hostapd_ctrl_iface_dump_amnt(hapd, buf+10,
++ reply, reply_size);
+ } else {
+ os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
+ reply_len = 16;
+diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
+index 865c11432..12c580455 100644
+--- a/hostapd/hostapd_cli.c
++++ b/hostapd/hostapd_cli.c
+@@ -1693,6 +1693,17 @@ static int hostapd_cli_cmd_get_amsdu(struct wpa_ctrl *ctrl, int argc,
+ return hostapd_cli_cmd(ctrl, "GET_AMSDU", 0, NULL, NULL);
+ }
+
++static int hostapd_cli_cmd_set_amnt(struct wpa_ctrl *ctrl, int argc,
++ char *argv[])
++{
++ return hostapd_cli_cmd(ctrl, "SET_AMNT", 2, argc, argv);
++}
++
++static int hostapd_cli_cmd_dump_amnt(struct wpa_ctrl *ctrl, int argc,
++ char *argv[])
++{
++ return hostapd_cli_cmd(ctrl, "DUMP_AMNT", 1, argc, argv);
++}
+
+ struct hostapd_cli_cmd {
+ const char *cmd;
+@@ -1925,6 +1936,10 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
+ " = show iBF state (enabled/disabled)"},
+ { "get_amsdu", hostapd_cli_cmd_get_amsdu, NULL,
+ " = show AMSDU state"},
++ { "set_amnt", hostapd_cli_cmd_set_amnt, NULL,
++ " = Set Station index and mac to monitor"},
++ { "dump_amnt", hostapd_cli_cmd_dump_amnt, NULL,
++ " = Dump RSSI of monitoring Station"},
+ { NULL, NULL, NULL, NULL }
+ };
+
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index 02ad55b96..2d32bd6a8 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -1322,3 +1322,17 @@ int hostapd_drv_ap_trig_type(struct hostapd_data *hapd, u8 enable, u8 type)
+ return 0;
+ return hapd->driver->ap_trigtype(hapd->drv_priv, enable, type);
+ }
++
++int hostapd_drv_amnt_set(struct hostapd_data *hapd, u8 amnt_idx, u8 *amnt_sta_mac)
++{
++ if (!hapd->driver || !hapd->driver->amnt_set)
++ return 0;
++ return hapd->driver->amnt_set(hapd->drv_priv, amnt_idx, amnt_sta_mac);
++}
++
++int hostapd_drv_amnt_dump(struct hostapd_data *hapd, u8 amnt_idx, u8 *amnt_dump_buf)
++{
++ if (!hapd->driver || !hapd->driver->amnt_dump)
++ return 0;
++ return hapd->driver->amnt_dump(hapd->drv_priv, amnt_idx, amnt_dump_buf);
++}
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index f0a8d503b..3ae300f76 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -161,6 +161,9 @@ int hostapd_drv_ap_wireless(struct hostapd_data *hapd, u8 sub_vendor_id, int val
+ int hostapd_drv_ap_rfeatures(struct hostapd_data *hapd, u8 sub_vendor_id, int value);
+ int hostapd_drv_ap_trig_type(struct hostapd_data *hapd, u8 enable, u8 type);
+
++int hostapd_drv_amnt_set(struct hostapd_data *hapd, u8 amnt_idx, u8 *amnt_sta_mac);
++int hostapd_drv_amnt_dump(struct hostapd_data *hapd, u8 amnt_idx, u8 *amnt_dump_buf);
++
+ #include "drivers/driver.h"
+
+ int hostapd_drv_wnm_oper(struct hostapd_data *hapd,
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+index 0b23c76ad..dd1ca2164 100644
+--- a/src/common/mtk_vendor.h
++++ b/src/common/mtk_vendor.h
+@@ -258,10 +258,18 @@ struct csi_data {
+ u16 rx_idx;
+ };
+
++#define AIR_MONITOR_MAX_ENTRY 16
++
+ struct amnt_data {
+ u8 idx;
+ u8 addr[ETH_ALEN];
+ s8 rssi[4];
+ u32 last_seen;
+ };
++
++struct amnt_resp_data {
++ u8 sta_num;
++ struct amnt_data resp_data[0];
++};
++
+ #endif /* MTK_VENDOR_H */
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index 1a3a24387..e27b56f35 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -5266,6 +5266,22 @@ struct wpa_driver_ops {
+ * @type: trigger type
+ */
+ int (*ap_trigtype)(void *priv, u8 enable, u8 type);
++
++ /**
++ * amnt_set - add/delete station from monitoring
++ * @priv: Private driver interface data
++ * @amnt_idx: Monitor Index
++ * @amnt_sta_mac: station mac address
++ */
++ int (*amnt_set)(void *priv, u8 amnt_idx, u8 *amnt_sta_mac);
++
++ /**
++ * amnt_dump - Dump particular/ all station
++ * @priv: Private driver interface data
++ * @amnt_idx: Monitor Index
++ * @amnt_dump_buf: Buffer to print
++ */
++ int (*amnt_dump)(void *priv, u8 amnt_idx, u8 *amnt_dump_buf);
+ };
+
+ /**
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index e076b1d02..d5246d472 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -143,6 +143,19 @@ wireless_ctrl_policy[NUM_MTK_VENDOR_ATTRS_WIRELESS_CTRL] = {
+ [MTK_VENDOR_ATTR_WIRELESS_CTRL_CERT] = {.type = NLA_U8 },
+ };
+
++static struct nla_policy
++amnt_ctrl_policy[NUM_MTK_VENDOR_ATTRS_AMNT_CTRL] = {
++ [MTK_VENDOR_ATTR_AMNT_CTRL_SET] = {.type = NLA_NESTED },
++ [MTK_VENDOR_ATTR_AMNT_CTRL_DUMP] = { .type = NLA_NESTED },
++};
++
++static struct nla_policy
++amnt_dump_policy[NUM_MTK_VENDOR_ATTRS_AMNT_DUMP] = {
++ [MTK_VENDOR_ATTR_AMNT_DUMP_INDEX] = {.type = NLA_U8 },
++ [MTK_VENDOR_ATTR_AMNT_DUMP_LEN] = { .type = NLA_U8 },
++ [MTK_VENDOR_ATTR_AMNT_DUMP_RESULT] = { .type = NLA_NESTED },
++};
++
+ static struct nl_sock * nl_create_handle(struct nl_cb *cb, const char *dbg)
+ {
+ struct nl_sock *handle;
+@@ -14735,6 +14748,170 @@ fail:
+ return -ENOBUFS;
+ }
+
++static int
++nl80211_amnt_set(void *priv, u8 amnt_idx, u8 *amnt_sta_mac)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *data;
++ void *tb1;
++ int ret;
++
++ if (!drv->mtk_amnt_vendor_cmd_avail) {
++ wpa_printf(MSG_ERROR,
++ "nl80211: Driver does not support air monitor");
++ return 0;
++ }
++
++ msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR);
++ if (!msg)
++ goto fail;
++
++ if (nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
++ MTK_NL80211_VENDOR_SUBCMD_AMNT_CTRL))
++ goto fail;
++
++ data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA | NLA_F_NESTED);
++ if (!data)
++ goto fail;
++
++ tb1 = nla_nest_start(msg, MTK_VENDOR_ATTR_AMNT_CTRL_SET);
++ if (!tb1)
++ goto fail;
++
++ nla_put_u8(msg, MTK_VENDOR_ATTR_AMNT_SET_INDEX, amnt_idx);
++
++ nla_put(msg, MTK_VENDOR_ATTR_AMNT_SET_MACADDR, ETH_ALEN, amnt_sta_mac);
++
++ nla_nest_end(msg, tb1);
++ nla_nest_end(msg, data);
++
++ ret = send_and_recv_cmd(drv, msg);
++
++ if (ret)
++ wpa_printf(MSG_ERROR, "Failed to set air monitor. ret=%d (%s)",
++ ret, strerror(-ret));
++
++ return ret;
++
++fail:
++ nlmsg_free(msg);
++ return -ENOBUFS;
++
++}
++
++static int
++mt76_amnt_dump_cb(struct nl_msg *msg, void *arg)
++{
++ struct nlattr *tb[NL80211_ATTR_MAX + 1];
++ struct nlattr *tb1[NUM_MTK_VENDOR_ATTRS_AMNT_CTRL];
++ struct nlattr *tb2[NUM_MTK_VENDOR_ATTRS_AMNT_DUMP];
++ struct nlattr *attr, *cur, *data;
++ struct amnt_data *res;
++ int len = 0, rem;
++ struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
++ struct amnt_resp_data *amnt_dump = (struct amnt_resp_data *)arg;
++
++ nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
++ genlmsg_attrlen(gnlh, 0), NULL);
++
++ attr = tb[NL80211_ATTR_VENDOR_DATA];
++ if (!attr)
++ return NL_SKIP;
++
++ nla_parse_nested(tb1, MTK_VENDOR_ATTR_AMNT_CTRL_MAX,
++ attr, amnt_ctrl_policy);
++
++ if (!tb1[MTK_VENDOR_ATTR_AMNT_CTRL_DUMP])
++ return NL_SKIP;
++
++ nla_parse_nested(tb2, NUM_MTK_VENDOR_ATTRS_AMNT_DUMP,
++ tb1[MTK_VENDOR_ATTR_AMNT_CTRL_DUMP], amnt_dump_policy);
++
++ if (!tb2[MTK_VENDOR_ATTR_AMNT_DUMP_LEN])
++ return NL_SKIP;
++
++ len = nla_get_u8(tb2[MTK_VENDOR_ATTR_AMNT_DUMP_LEN]);
++ if (!len)
++ return 0;
++
++ if (!tb2[MTK_VENDOR_ATTR_AMNT_DUMP_RESULT])
++ return NL_SKIP;
++
++ data = tb2[MTK_VENDOR_ATTR_AMNT_DUMP_RESULT];
++
++ nla_for_each_nested(cur, data, rem) {
++ if (amnt_dump->sta_num >= AIR_MONITOR_MAX_ENTRY)
++ return NL_SKIP;
++ res = (struct amnt_data *) nla_data(cur);
++ wpa_printf(MSG_ERROR, "[vendor] amnt_idx: %d, "
++ "addr="MACSTR", "
++ "rssi=%d/%d/%d/%d, last_seen=%u\n",
++ res->idx,
++ MAC2STR(res->addr),
++ res->rssi[0], res->rssi[1], res->rssi[2],
++ res->rssi[3], res->last_seen);
++ os_memcpy(&amnt_dump->resp_data[amnt_dump->sta_num], res,
++ sizeof(struct amnt_data));
++ amnt_dump->sta_num++;
++ }
++ return 0;
++}
++
++static int
++nl80211_amnt_dump(void *priv, u8 amnt_idx, u8 *dump_buf)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *data;
++ void *tb1;
++ int ret;
++
++ if (!drv->mtk_amnt_vendor_cmd_avail) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Driver does not support air monitor");
++ return 0;
++ }
++
++ msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_VENDOR);
++ if (!msg)
++ goto fail;
++
++ if (nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
++ MTK_NL80211_VENDOR_SUBCMD_AMNT_CTRL))
++ goto fail;
++
++ data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA | NLA_F_NESTED);
++ if (!data)
++ goto fail;
++
++ tb1 = nla_nest_start(msg, MTK_VENDOR_ATTR_AMNT_CTRL_DUMP
++ | NLA_F_NESTED);
++ if (!tb1)
++ goto fail;
++
++ nla_put_u8(msg, MTK_VENDOR_ATTR_AMNT_DUMP_INDEX, amnt_idx);
++
++ nla_nest_end(msg, tb1);
++ nla_nest_end(msg, data);
++
++ ret = send_and_recv_resp(drv, msg, mt76_amnt_dump_cb, dump_buf);
++
++ if (ret)
++ wpa_printf(MSG_ERROR, "Failed to Dump air monitor. ret=%d (%s)"
++ , ret, strerror(-ret));
++
++ return ret;
++
++fail:
++ nlmsg_free(msg);
++ return -ENOBUFS;
++}
++
+ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .name = "nl80211",
+ .desc = "Linux nl80211/cfg80211",
+@@ -14905,4 +15082,6 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .ap_wireless = nl80211_ap_wireless,
+ .ap_rfeatures = nl80211_ap_rfeatures,
+ .ap_trigtype = nl80211_ap_trigtype,
++ .amnt_set = nl80211_amnt_set,
++ .amnt_dump = nl80211_amnt_dump,
+ };
+diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
+index 10045ea5b..877115660 100644
+--- a/src/drivers/driver_nl80211.h
++++ b/src/drivers/driver_nl80211.h
+@@ -206,6 +206,7 @@ struct wpa_driver_nl80211_data {
+ unsigned int mtk_wireless_vendor_cmd_avail:1;
+ unsigned int mtk_bss_color_vendor_cmd_avail:1;
+ unsigned int mtk_rfeatures_vendor_cmd_avail:1;
++ unsigned int mtk_amnt_vendor_cmd_avail:1;
+
+ u32 ignore_next_local_disconnect;
+ u32 ignore_next_local_deauth;
+diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
+index 3e27b52b7..2c3530b36 100644
+--- a/src/drivers/driver_nl80211_capa.c
++++ b/src/drivers/driver_nl80211_capa.c
+@@ -1154,6 +1154,8 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
+ break;
+ case MTK_NL80211_VENDOR_SUBCMD_BSS_COLOR_CTRL :
+ drv->mtk_bss_color_vendor_cmd_avail = 1;
++ case MTK_NL80211_VENDOR_SUBCMD_AMNT_CTRL:
++ drv->mtk_amnt_vendor_cmd_avail = 1;
+ break;
+ case MTK_NL80211_VENDOR_SUBCMD_RFEATURE_CTRL:
+ drv->mtk_rfeatures_vendor_cmd_avail = 1;
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0030-mtk-hostapd-Add-muru-user-number-debug-command.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0030-mtk-hostapd-Add-muru-user-number-debug-command.patch
new file mode 100644
index 0000000..49fe5b1
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0030-mtk-hostapd-Add-muru-user-number-debug-command.patch
@@ -0,0 +1,228 @@
+From bc5c6e388852496f31df43a010850c468dac81da Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Fri, 12 May 2023 05:24:19 +0800
+Subject: [PATCH 30/69] mtk: hostapd: Add muru user number debug command
+
+---
+ hostapd/ctrl_iface.c | 13 ++++++++++++-
+ src/ap/ap_drv_ops.c | 4 ++--
+ src/ap/ap_drv_ops.h | 2 +-
+ src/ap/hostapd.c | 3 ++-
+ src/common/mtk_vendor.h | 7 +++++++
+ src/drivers/driver.h | 4 ++--
+ src/drivers/driver_nl80211.c | 37 ++++++++++++++++++++++++++++--------
+ 7 files changed, 55 insertions(+), 15 deletions(-)
+
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index b89facb56..487c97222 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -3694,6 +3694,8 @@ hostapd_ctrl_iface_set_edcca(struct hostapd_data *hapd, char *cmd,
+ char *buf, size_t buflen)
+ {
+ char *pos, *config, *value;
++ u8 mode;
++
+ config = cmd;
+ pos = os_strchr(config, ' ');
+ if (pos == NULL)
+@@ -4086,6 +4088,8 @@ hostapd_ctrl_iface_set_mu(struct hostapd_data *hapd, char *cmd,
+ char *buf, size_t buflen)
+ {
+ char *pos, *config, *value;
++ u8 mode;
++
+ config = cmd;
+ pos = os_strchr(config, ' ');
+ if (pos == NULL)
+@@ -4103,13 +4107,20 @@ hostapd_ctrl_iface_set_mu(struct hostapd_data *hapd, char *cmd,
+ return -1;
+ }
+ hapd->iconf->mu_onoff = (u8) mu;
++ mode = MU_CTRL_ONOFF;
++ } else if (os_strcmp(config, "ul_user_cnt") == 0) {
++ mode = MU_CTRL_UL_USER_CNT;
++ wpa_printf(MSG_ERROR, "ul_user_cnt:%d\n", (u8)atoi(value));
++ } else if (os_strcmp(config, "dl_user_cnt") == 0) {
++ mode = MU_CTRL_DL_USER_CNT;
++ wpa_printf(MSG_ERROR, "dl_user_cnt:%d\n", (u8)atoi(value));
+ } else {
+ wpa_printf(MSG_ERROR,
+ "Unsupported parameter %s for SET_MU", config);
+ return -1;
+ }
+
+- if(hostapd_drv_mu_ctrl(hapd) == 0) {
++ if(hostapd_drv_mu_ctrl(hapd, mode, (u8)atoi(value)) == 0) {
+ return os_snprintf(buf, buflen, "OK\n");
+ } else {
+ return -1;
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index 2d32bd6a8..1b7edb97d 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -1241,11 +1241,11 @@ int hostapd_drv_get_edcca(struct hostapd_data *hapd, const u8 mode, u8 *value)
+ return hapd->driver->get_edcca(hapd->drv_priv, mode, value);
+ }
+
+-int hostapd_drv_mu_ctrl(struct hostapd_data *hapd)
++int hostapd_drv_mu_ctrl(struct hostapd_data *hapd, u8 mode, u8 val)
+ {
+ if (!hapd->driver || !hapd->driver->mu_ctrl)
+ return 0;
+- return hapd->driver->mu_ctrl(hapd->drv_priv, hapd->iconf->mu_onoff);
++ return hapd->driver->mu_ctrl(hapd->drv_priv, mode, val);
+ }
+
+ int hostapd_drv_mu_dump(struct hostapd_data *hapd, u8 *mu_onoff)
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index 3ae300f76..0f34ee8c0 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -148,7 +148,7 @@ int hostapd_drv_configure_edcca_enable(struct hostapd_data *hapd);
+ int hostapd_drv_configure_edcca_threshold(struct hostapd_data *hapd,
+ const int *threshold);
+ int hostapd_drv_get_edcca(struct hostapd_data *hapd, const u8 mode, u8 *value);
+-int hostapd_drv_mu_ctrl(struct hostapd_data *hapd);
++int hostapd_drv_mu_ctrl(struct hostapd_data *hapd, u8 mode, u8 val);
+ int hostapd_drv_mu_dump(struct hostapd_data *hapd, u8 *mu_onoff);
+ int hostapd_drv_three_wire_ctrl(struct hostapd_data *hapd);
+ int hostapd_drv_ibf_ctrl(struct hostapd_data *hapd);
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index 5cfbf2e2b..61a2fc046 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -58,6 +58,7 @@
+ #include "wpa_auth_kay.h"
+ #include "hw_features.h"
+
++#include "common/mtk_vendor.h"
+
+ static int hostapd_flush_old_stations(struct hostapd_data *hapd, u16 reason);
+ #ifdef CONFIG_WEP
+@@ -2619,7 +2620,7 @@ dfs_offload:
+ if (hostapd_drv_configure_edcca_threshold(hapd,
+ hapd->iconf->edcca_threshold) < 0)
+ goto fail;
+- if (hostapd_drv_mu_ctrl(hapd) < 0)
++ if (hostapd_drv_mu_ctrl(hapd, MU_CTRL_ONOFF, hapd->iconf->mu_onoff) < 0)
+ goto fail;
+ if (hostapd_drv_three_wire_ctrl(hapd) < 0)
+ goto fail;
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+index dd1ca2164..99371bf73 100644
+--- a/src/common/mtk_vendor.h
++++ b/src/common/mtk_vendor.h
+@@ -199,6 +199,8 @@ enum mtk_vendor_attr_mu_ctrl {
+
+ MTK_VENDOR_ATTR_MU_CTRL_ONOFF,
+ MTK_VENDOR_ATTR_MU_CTRL_DUMP,
++ MTK_VENDOR_ATTR_MU_CTRL_OFDMA_MODE,
++ MTK_VENDOR_ATTR_MU_CTRL_OFDMA_VAL,
+
+ /* keep last */
+ NUM_MTK_VENDOR_ATTRS_MU_CTRL,
+@@ -272,4 +274,9 @@ struct amnt_resp_data {
+ struct amnt_data resp_data[0];
+ };
+
++enum {
++ MU_CTRL_ONOFF,
++ MU_CTRL_DL_USER_CNT,
++ MU_CTRL_UL_USER_CNT,
++};
+ #endif /* MTK_VENDOR_H */
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index e27b56f35..e9d8732e8 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -5199,11 +5199,11 @@ struct wpa_driver_ops {
+ int (*get_edcca)(void *priv, const u8 mode, u8 *value);
+
+ /**
+- * mu_ctrl - ctrl on off for UL/DL MURU
++ * mu_ctrl - ctrl for UL/DL MURU
+ * @priv: Private driver interface data
+ *
+ */
+- int (*mu_ctrl)(void *priv, u8 mu_onoff);
++ int (*mu_ctrl)(void *priv, u8 mode, u8 val);
+ int (*mu_dump)(void *priv, u8 *mu_onoff);
+
+ /**
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index d5246d472..ee046f063 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -13894,13 +13894,13 @@ fail:
+
+
+ #ifdef CONFIG_IEEE80211AX
+-static int nl80211_mu_onoff(void *priv, u8 mu_onoff)
++static int nl80211_mu_ctrl(void *priv, u8 mode, u8 val)
+ {
+ struct i802_bss *bss = priv;
+ struct wpa_driver_nl80211_data *drv = bss->drv;
+ struct nl_msg *msg;
+ struct nlattr *data;
+- int ret;
++ int ret = -ENOBUFS;
+
+ if (!drv->mtk_mu_vendor_cmd_avail) {
+ wpa_printf(MSG_INFO,
+@@ -13911,17 +13911,38 @@ static int nl80211_mu_onoff(void *priv, u8 mu_onoff)
+ if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
+ nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
+ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, MTK_NL80211_VENDOR_SUBCMD_MU_CTRL) ||
+- !(data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
+- nla_put_u8(msg, MTK_VENDOR_ATTR_MU_CTRL_ONOFF, mu_onoff)) {
+- nlmsg_free(msg);
+- return -ENOBUFS;
++ !(data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)))
++ goto fail;
++
++ switch (mode) {
++ case MU_CTRL_ONOFF:
++ if (nla_put_u8(msg, MTK_VENDOR_ATTR_MU_CTRL_ONOFF, val))
++ goto fail;
++ break;
++ case MU_CTRL_UL_USER_CNT:
++ case MU_CTRL_DL_USER_CNT:
++ if (nla_put_u8(msg, MTK_VENDOR_ATTR_MU_CTRL_OFDMA_MODE, mode) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_MU_CTRL_OFDMA_VAL, val))
++ goto fail;
++ break;
++ default:
++ wpa_printf(MSG_ERROR, "nl80211: Wrong mu mode !");
++ ret = -EINVAL;
++ goto fail;
+ }
++
+ nla_nest_end(msg, data);
++
+ ret = send_and_recv_cmd(drv, msg);
+ if(ret){
+- wpa_printf(MSG_ERROR, "Failed to set mu_onoff. ret=%d (%s)", ret, strerror(-ret));
++ wpa_printf(MSG_ERROR, "Failed to set mu_ctrl. ret=%d (%s)", ret, strerror(-ret));
+ }
+ return ret;
++
++fail:
++ nl80211_nlmsg_clear(msg);
++ nlmsg_free(msg);
++ return ret;
+ }
+
+
+@@ -15058,7 +15079,7 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .update_connect_params = nl80211_update_connection_params,
+ .send_external_auth_status = nl80211_send_external_auth_status,
+ .set_4addr_mode = nl80211_set_4addr_mode,
+- .mu_ctrl = nl80211_mu_onoff,
++ .mu_ctrl = nl80211_mu_ctrl,
+ .mu_dump = nl80211_mu_dump,
+ #ifdef CONFIG_DPP
+ .dpp_listen = nl80211_dpp_listen,
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0031-mtk-hostapd-add-connac3-PHY-MURU-manual-mode-config-.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0031-mtk-hostapd-add-connac3-PHY-MURU-manual-mode-config-.patch
new file mode 100644
index 0000000..d5183af
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0031-mtk-hostapd-add-connac3-PHY-MURU-manual-mode-config-.patch
@@ -0,0 +1,647 @@
+From 5df49008f5e1dd42301028f239f6bbe07a72af14 Mon Sep 17 00:00:00 2001
+From: Howard Hsu <howard-yh.hsu@mediatek.com>
+Date: Sat, 3 Jun 2023 17:12:15 +0800
+Subject: [PATCH 31/69] mtk: hostapd: add connac3 PHY MURU manual mode config
+ support
+
+This commit supports read the following two formats to set MU/RU manual
+mode:
+1. hostapd_cli -i <intf> raw set_muru_manual_config=<field>:<value>
+2. hostapd_cli -i <intf> set_mu <field> <value>
+
+For the <field>, we support the following field:
+1. ul_comm_user_cnt/dl_comm_user_cnt: set the number of user
+2. ul_comm_bw/dl_comm_bw: set the bandwith
+3. ul_user_ru_alloc/dl_user_ru_alloc: set the RU band idx and RU
+allocate idx
+4. ul_user_mcs/dl_user_mcs: set the mcs for each user
+5. ul_user_ssAlloc_raru: set the number of ss for each user
+6. ul_comm_gi_ltf: set the combinations of gi and ltf for UL only.
+7. dl_comm_toneplan: fix ru toneplan allocation
+8. dl_comm_ack_policy: fix station ack policy
+9. update : trigger driver to send mcu command to set muru manual mode.
+
+For the value of each field, please check wiki to learn the details:
+https://wiki.mediatek.inc/display/GWKB/muru_mancfg_user_guide
+
+For the fields that mt76 support to use, we will update in this wiki:
+https://wiki.mediatek.inc/pages/viewpage.action?pageId=1271741116
+
+Please noted that this commit is only for connac 3 gen chips. If this
+feature is to be used in other generations, the following actions must
+be taken:
+1. Different data structue needs to be defined for different
+generations, e.g. connac4_muru_comm, connac4_muru_dl.
+2. hostapd_ctrl_iface_set_mu() shall be modified.
+3. A new code level configuration shall be defined to differentiate the
+code flow that different generations will go through.
+---
+ hostapd/ctrl_iface.c | 237 +++++++++++++++++++++++++++++++----
+ src/ap/ap_config.h | 1 +
+ src/ap/ap_drv_ops.c | 4 +-
+ src/ap/ap_drv_ops.h | 2 +-
+ src/ap/hostapd.c | 2 +-
+ src/common/mtk_vendor.h | 166 +++++++++++++++++++++++-
+ src/drivers/driver.h | 2 +-
+ src/drivers/driver_nl80211.c | 21 ++--
+ 8 files changed, 391 insertions(+), 44 deletions(-)
+
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index 487c97222..6ed47ecce 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -3796,7 +3796,6 @@ hostapd_ctrl_iface_get_edcca(struct hostapd_data *hapd, char *cmd, char *buf,
+ }
+ }
+
+-
+ #ifdef CONFIG_NAN_USD
+
+ static int hostapd_ctrl_nan_publish(struct hostapd_data *hapd, char *cmd,
+@@ -4083,21 +4082,61 @@ fail:
+ #endif /* CONFIG_NAN_USD */
+
+
++static int
++hostapd_parse_argument_helper(char *value, u16 **ptr_input)
++{
++#define MAX_MU_CTRL_NUM 17
++ u16 *input;
++ char *endptr;
++ int cnt = 0;
++
++ input = os_zalloc(MAX_MU_CTRL_NUM * sizeof(u16));
++ if (input == NULL) {
++ wpa_printf(MSG_ERROR, "Failed to allocate memory.\n");
++ return -1;
++ }
++ while (value) {
++ u8 val = strtol(value, &endptr, 10);
++
++ if (value != endptr) {
++ input[cnt++] = val;
++ value = os_strchr(endptr, ':');
++ if (value)
++ value++;
++ } else {
++ break;
++ }
++ }
++
++ *ptr_input = input;
++ return cnt;
++}
++
++#define MURU_CFG_DEPENDENCE_CHECK(_val, _mask) do { \
++ if ((le_to_host32(_val) & (_mask)) != _mask) { \
++ wpa_printf(MSG_ERROR, "Set %s first\n", #_mask); \
++ goto fail; \
++ } \
++ } while(0)
++
+ static int
+ hostapd_ctrl_iface_set_mu(struct hostapd_data *hapd, char *cmd,
+- char *buf, size_t buflen)
++ char *buf, size_t buflen)
+ {
+ char *pos, *config, *value;
+- u8 mode;
++ u8 i;
++ int cnt = 0, ret;
++ u16 *val;
++ struct connac3_muru *muru;
++ struct connac3_muru_dl *dl;
++ struct connac3_muru_ul *ul;
++ struct connac3_muru_comm *comm;
+
+ config = cmd;
+ pos = os_strchr(config, ' ');
+- if (pos == NULL)
+- return -1;
+- *pos++ = '\0';
++ if (pos != NULL)
++ *pos++ = '\0';
+
+- if(pos == NULL)
+- return -1;
+ value = pos;
+
+ if (os_strcmp(config, "onoff") == 0) {
+@@ -4107,24 +4146,167 @@ hostapd_ctrl_iface_set_mu(struct hostapd_data *hapd, char *cmd,
+ return -1;
+ }
+ hapd->iconf->mu_onoff = (u8) mu;
+- mode = MU_CTRL_ONOFF;
+- } else if (os_strcmp(config, "ul_user_cnt") == 0) {
+- mode = MU_CTRL_UL_USER_CNT;
+- wpa_printf(MSG_ERROR, "ul_user_cnt:%d\n", (u8)atoi(value));
+- } else if (os_strcmp(config, "dl_user_cnt") == 0) {
+- mode = MU_CTRL_DL_USER_CNT;
+- wpa_printf(MSG_ERROR, "dl_user_cnt:%d\n", (u8)atoi(value));
+- } else {
+- wpa_printf(MSG_ERROR,
+- "Unsupported parameter %s for SET_MU", config);
+- return -1;
++
++ if (hostapd_drv_mu_ctrl(hapd, MU_CTRL_ONOFF) == 0)
++ return os_snprintf(buf, buflen, "OK\n");
++ else
++ goto fail;
+ }
+
+- if(hostapd_drv_mu_ctrl(hapd, mode, (u8)atoi(value)) == 0) {
+- return os_snprintf(buf, buflen, "OK\n");
++ if (hapd->iconf->muru_config == NULL)
++ hapd->iconf->muru_config = os_zalloc(sizeof(struct connac3_muru));
++
++ muru = hapd->iconf->muru_config;
++ dl = &muru->dl;
++ ul = &muru->ul;
++ comm = &muru->comm;
++
++ if (os_strncmp(config, "update", 6) == 0) {
++ ret = hostapd_drv_mu_ctrl(hapd, MU_CTRL_UPDATE);
++
++ os_free(hapd->iconf->muru_config);
++ hapd->iconf->muru_config = NULL;
++
++ if (ret)
++ goto fail;
++ } else if (os_strcmp(config, "ul_comm_user_cnt") == 0) {
++ ul->user_num = (u8)atoi(value);
++ comm->ppdu_format |= MURU_PPDU_HE_TRIG;
++ comm->sch_type |= MURU_OFDMA_SCH_TYPE_UL;
++ muru->cfg_comm |= host_to_le32(MURU_COMM_SET);
++ muru->cfg_ul |= host_to_le32(MURU_FIXED_UL_TOTAL_USER_CNT);
++ } else if (os_strcmp(config, "dl_comm_user_cnt") == 0) {
++ dl->user_num = (u8)atoi(value);
++ comm->ppdu_format |= MURU_PPDU_HE_MU;
++ comm->sch_type |= MURU_OFDMA_SCH_TYPE_DL;
++ muru->cfg_comm |= host_to_le32(MURU_COMM_SET);
++ muru->cfg_dl |= host_to_le32(MURU_FIXED_DL_TOTAL_USER_CNT);
++ } else if (os_strcmp(config, "dl_comm_bw") == 0) {
++ dl->bw = (u8)atoi(value);
++ muru->cfg_dl |= host_to_le32(MURU_FIXED_DL_BW);
++ } else if (os_strcmp(config, "ul_comm_bw") == 0) {
++ ul->bw = (u8)atoi(value);
++ muru->cfg_ul |= host_to_le32(MURU_FIXED_UL_BW);
++ } else if (os_strcmp(config, "dl_user_ru_alloc") == 0) {
++ MURU_CFG_DEPENDENCE_CHECK(muru->cfg_dl, MURU_FIXED_DL_TOTAL_USER_CNT);
++ cnt = hostapd_parse_argument_helper(value, &val);
++ if (cnt == -1)
++ goto fail;
++ if (cnt != (dl->user_num * 2))
++ goto para_fail;
++ for (i = 0; i < dl->user_num; i++) {
++ dl->usr[i].ru_alloc_seg = (val[2 * i] & 0x1);
++ dl->usr[i].ru_allo_ps160 = ((val[2 * i] & 0x2) >> 1);
++ dl->usr[i].ru_idx = val[(2 * i) + 1];
++ }
++ os_free(val);
++ muru->cfg_dl |= host_to_le32(MURU_FIXED_USER_DL_RU_ALLOC);
++ } else if (os_strcmp(config, "ul_user_ru_alloc") == 0) {
++ MURU_CFG_DEPENDENCE_CHECK(muru->cfg_ul, MURU_FIXED_UL_TOTAL_USER_CNT);
++ cnt = hostapd_parse_argument_helper(value, &val);
++ if (cnt == -1)
++ goto fail;
++ if (cnt != (ul->user_num * 2))
++ goto para_fail;
++ for (i = 0; i < ul->user_num; i++) {
++ ul->usr[i].ru_alloc_seg = (val[2 * i] & 0x1);
++ ul->usr[i].ru_allo_ps160 = ((val[2 * i] & 0x2) >> 1);
++ ul->usr[i].ru_idx = val[(2 * i) + 1];
++ }
++ os_free(val);
++ muru->cfg_ul |= host_to_le32(MURU_FIXED_USER_UL_RU_ALLOC);
++ } else if (os_strcmp(config, "dl_user_mcs") == 0) {
++ MURU_CFG_DEPENDENCE_CHECK(muru->cfg_dl, MURU_FIXED_DL_TOTAL_USER_CNT);
++ cnt = hostapd_parse_argument_helper(value, &val);
++ if (cnt == -1)
++ goto fail;
++ if (cnt != dl->user_num)
++ goto para_fail;
++ for (i = 0; i < cnt; i++)
++ dl->usr[i].mcs = (u8) val[i];
++ os_free(val);
++ muru->cfg_dl |= host_to_le32(MURU_FIXED_USER_DL_MCS);
++ } else if (os_strcmp(config, "ul_user_mcs") == 0) {
++ MURU_CFG_DEPENDENCE_CHECK(muru->cfg_ul, MURU_FIXED_UL_TOTAL_USER_CNT);
++ cnt = hostapd_parse_argument_helper(value, &val);
++ if (cnt == -1)
++ goto fail;
++ if (cnt != ul->user_num)
++ goto para_fail;
++ for (i = 0; i < cnt; i++)
++ ul->usr[i].mcs = (u8) val[i];
++ os_free(val);
++ muru->cfg_ul |= host_to_le32(MURU_FIXED_USER_UL_MCS);
++ } else if (os_strcmp(config, "dl_user_cod") == 0) {
++ MURU_CFG_DEPENDENCE_CHECK(muru->cfg_dl, MURU_FIXED_DL_TOTAL_USER_CNT);
++ cnt = hostapd_parse_argument_helper(value, &val);
++ if (cnt == -1)
++ goto fail;
++ if (cnt != dl->user_num)
++ goto para_fail;
++ for (i = 0; i < cnt; i++)
++ dl->usr[i].ldpc = (u8) val[i];
++ os_free(val);
++ muru->cfg_dl |= host_to_le32(MURU_FIXED_USER_DL_COD);
++ } else if (os_strcmp(config, "ul_user_cod") == 0) {
++ MURU_CFG_DEPENDENCE_CHECK(muru->cfg_ul, MURU_FIXED_UL_TOTAL_USER_CNT);
++ cnt = hostapd_parse_argument_helper(value, &val);
++ if (cnt == -1)
++ goto fail;
++ if (cnt != ul->user_num)
++ goto para_fail;
++ for (i = 0; i < cnt; i++)
++ ul->usr[i].ldpc = (u8) val[i];
++ os_free(val);
++ muru->cfg_ul |= host_to_le32(MURU_FIXED_USER_UL_COD);
++ } else if (os_strcmp(config, "ul_user_ssAlloc_raru") == 0) {
++ MURU_CFG_DEPENDENCE_CHECK(muru->cfg_ul, MURU_FIXED_UL_TOTAL_USER_CNT);
++ cnt = hostapd_parse_argument_helper(value, &val);
++ if (cnt == -1)
++ goto fail;
++ if (cnt != ul->user_num)
++ goto para_fail;
++ for (i = 0; i < cnt; i++)
++ ul->usr[i].nss = (u8) val[i];
++ os_free(val);
++ muru->cfg_ul |= host_to_le32(MURU_FIXED_USER_UL_NSS);
++ } else if (os_strcmp(config, "dl_comm_gi") == 0) {
++ dl->gi = (u8)atoi(value);
++ muru->cfg_dl |= host_to_le32(MURU_FIXED_DL_GI);
++ } else if (os_strcmp(config, "dl_comm_ltf") == 0) {
++ dl->ltf = (u8)atoi(value);
++ muru->cfg_dl |= host_to_le32(MURU_FIXED_DL_LTF);
++ } else if (os_strcmp(config, "ul_comm_gi_ltf") == 0) {
++ ul->gi_ltf = (u8)atoi(value);
++ muru->cfg_ul |= host_to_le32(MURU_FIXED_UL_GILTF);
++ } else if (os_strcmp(config, "dl_comm_ack_policy") == 0) {
++ dl->ack_policy = (u8)atoi(value);
++ muru->cfg_dl |= host_to_le32(MURU_FIXED_DL_ACK_PLY);
++ } else if (os_strcmp(config, "dl_comm_toneplan") == 0) {
++ MURU_CFG_DEPENDENCE_CHECK(muru->cfg_dl, MURU_FIXED_DL_BW);
++ cnt = hostapd_parse_argument_helper(value, &val);
++ if (cnt == -1)
++ goto fail;
++ i = pow(2, dl->bw);
++ if (cnt != i)
++ goto para_fail;
++ for (i = 0; i < cnt; i++)
++ dl->ru[i] = host_to_le16(val[i]);
++ os_free(val);
++ muru->cfg_dl |= host_to_le32(MURU_FIXED_DL_TONE_PLAN);
+ } else {
+- return -1;
++ wpa_printf(MSG_ERROR,
++ "Unsupported parameter %s for SET_MU", config);
++ goto fail;
+ }
++
++ return os_snprintf(buf, buflen, "OK\n");
++
++para_fail:
++ os_free(val);
++ wpa_printf(MSG_ERROR, "Incorrect input number\n");
++fail:
++ return os_snprintf(buf, buflen, "FAIL\n");
+ }
+
+
+@@ -5169,8 +5351,7 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ reply_len = hostapd_ctrl_iface_get_edcca(hapd, buf+10, reply,
+ reply_size);
+ } else if (os_strncmp(buf, "SET_MU ", 7) == 0) {
+- reply_len = hostapd_ctrl_iface_set_mu(hapd, buf + 7, reply,
+- reply_size);
++ reply_len = hostapd_ctrl_iface_set_mu(hapd, buf + 7, reply, reply_size);
+ } else if (os_strncmp(buf, "GET_MU", 6) == 0) {
+ reply_len = hostapd_ctrl_iface_get_mu(hapd, reply, reply_size);
+ } else if (os_strncmp(buf, "GET_IBF", 7) == 0) {
+@@ -5196,6 +5377,14 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ } else if (os_strncmp(buf, "DUMP_AMNT", 9) == 0) {
+ reply_len = hostapd_ctrl_iface_dump_amnt(hapd, buf+10,
+ reply, reply_size);
++ } else if (os_strncmp(buf, "set_muru_manual_config=", 23) == 0) {
++ // Replace first ':' with a single space ' '
++ char *pos = buf + 23;
++
++ pos = os_strchr(pos, ':');
++ if (pos)
++ *pos = ' ';
++ reply_len = hostapd_ctrl_iface_set_mu(hapd, buf + 23, reply, reply_size);
+ } else {
+ os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
+ reply_len = 16;
+diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
+index d995b8d9c..3827a8fc8 100644
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -1291,6 +1291,7 @@ struct hostapd_config {
+ u8 ibf_enable;
+ u8 dfs_detect_mode;
+ u8 amsdu;
++ void *muru_config;
+ };
+
+ enum three_wire_mode {
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index 1b7edb97d..ab514ddf1 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -1241,11 +1241,11 @@ int hostapd_drv_get_edcca(struct hostapd_data *hapd, const u8 mode, u8 *value)
+ return hapd->driver->get_edcca(hapd->drv_priv, mode, value);
+ }
+
+-int hostapd_drv_mu_ctrl(struct hostapd_data *hapd, u8 mode, u8 val)
++int hostapd_drv_mu_ctrl(struct hostapd_data *hapd, u8 mode)
+ {
+ if (!hapd->driver || !hapd->driver->mu_ctrl)
+ return 0;
+- return hapd->driver->mu_ctrl(hapd->drv_priv, mode, val);
++ return hapd->driver->mu_ctrl(hapd->drv_priv, mode, hapd->iconf);
+ }
+
+ int hostapd_drv_mu_dump(struct hostapd_data *hapd, u8 *mu_onoff)
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index 0f34ee8c0..706654b6b 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -148,7 +148,7 @@ int hostapd_drv_configure_edcca_enable(struct hostapd_data *hapd);
+ int hostapd_drv_configure_edcca_threshold(struct hostapd_data *hapd,
+ const int *threshold);
+ int hostapd_drv_get_edcca(struct hostapd_data *hapd, const u8 mode, u8 *value);
+-int hostapd_drv_mu_ctrl(struct hostapd_data *hapd, u8 mode, u8 val);
++int hostapd_drv_mu_ctrl(struct hostapd_data *hapd, u8 mode);
+ int hostapd_drv_mu_dump(struct hostapd_data *hapd, u8 *mu_onoff);
+ int hostapd_drv_three_wire_ctrl(struct hostapd_data *hapd);
+ int hostapd_drv_ibf_ctrl(struct hostapd_data *hapd);
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index 61a2fc046..8ab5c96d6 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -2620,7 +2620,7 @@ dfs_offload:
+ if (hostapd_drv_configure_edcca_threshold(hapd,
+ hapd->iconf->edcca_threshold) < 0)
+ goto fail;
+- if (hostapd_drv_mu_ctrl(hapd, MU_CTRL_ONOFF, hapd->iconf->mu_onoff) < 0)
++ if (hostapd_drv_mu_ctrl(hapd, MU_CTRL_ONOFF) < 0)
+ goto fail;
+ if (hostapd_drv_three_wire_ctrl(hapd) < 0)
+ goto fail;
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+index 99371bf73..e140de60b 100644
+--- a/src/common/mtk_vendor.h
++++ b/src/common/mtk_vendor.h
+@@ -199,8 +199,11 @@ enum mtk_vendor_attr_mu_ctrl {
+
+ MTK_VENDOR_ATTR_MU_CTRL_ONOFF,
+ MTK_VENDOR_ATTR_MU_CTRL_DUMP,
+- MTK_VENDOR_ATTR_MU_CTRL_OFDMA_MODE,
+- MTK_VENDOR_ATTR_MU_CTRL_OFDMA_VAL,
++ /**
++ * The above attrs are also used by connac 2. It is best not to modify the
++ * above data structure.
++ */
++ MTK_VENDOR_ATTR_MU_CTRL_STRUCT,
+
+ /* keep last */
+ NUM_MTK_VENDOR_ATTRS_MU_CTRL,
+@@ -275,8 +278,163 @@ struct amnt_resp_data {
+ };
+
+ enum {
++ MU_CTRL_UPDATE,
+ MU_CTRL_ONOFF,
+- MU_CTRL_DL_USER_CNT,
+- MU_CTRL_UL_USER_CNT,
+ };
++
++struct connac3_muru_comm {
++ u8 pda_pol;
++ u8 band;
++ u8 spe_idx;
++ u8 proc_type;
++
++ le16 mlo_ctrl;
++ u8 sch_type;
++ u8 ppdu_format;
++ u8 ac;
++ u8 _rsv[3];
++};
++
++struct connac3_muru_dl {
++ u8 user_num;
++ u8 tx_mode;
++ u8 bw;
++ u8 gi;
++
++ u8 ltf;
++ u8 mcs;
++ u8 dcm;
++ u8 cmprs;
++
++ le16 ru[16];
++
++ u8 c26[2];
++ u8 ack_policy;
++ u8 tx_power;
++
++ le16 mu_ppdu_duration;
++ u8 agc_disp_order;
++ u8 _rsv1;
++
++ u8 agc_disp_pol;
++ u8 agc_disp_ratio;
++ le16 agc_disp_linkMFG;
++
++ le16 prmbl_punc_bmp;
++ u8 _rsv2[2];
++
++ struct {
++ le16 wlan_idx;
++ u8 ru_alloc_seg;
++ u8 ru_idx;
++ u8 ldpc;
++ u8 nss;
++ u8 mcs;
++ u8 mu_group_idx;
++ u8 vht_groud_id;
++ u8 vht_up;
++ u8 he_start_stream;
++ u8 he_mu_spatial;
++ le16 tx_power_alpha;
++ u8 ack_policy;
++ u8 ru_allo_ps160;
++ } usr[16];
++};
++
++struct connac3_muru_ul {
++ u8 user_num;
++ u8 tx_mode;
++
++ u8 ba_type;
++ u8 _rsv;
++
++ u8 bw;
++ u8 gi_ltf;
++ le16 ul_len;
++
++ le16 trig_cnt;
++ u8 pad;
++ u8 trig_type;
++
++ le16 trig_intv;
++ u8 trig_ta[ETH_ALEN];
++ le16 ul_ru[16];
++
++ u8 c26[2];
++ le16 agc_disp_linkMFG;
++
++ u8 agc_disp_mu_len;
++ u8 agc_disp_pol;
++ u8 agc_disp_ratio;
++ u8 agc_disp_pu_idx;
++
++ struct {
++ le16 wlan_idx;
++ u8 ru_alloc_seg;
++ u8 ru_idx;
++ u8 ldpc;
++ u8 nss;
++ u8 mcs;
++ u8 target_rssi;
++ le32 trig_pkt_size;
++ u8 ru_allo_ps160;
++ u8 _rsv2[3];
++ } usr[16];
++};
++
++struct connac3_muru_dbg {
++ /* HE TB RX Debug */
++ le32 rx_hetb_nonsf_en_bitmap;
++ le32 rx_hetb_cfg[2];
++};
++
++struct connac3_muru {
++ le32 cfg_comm;
++ le32 cfg_dl;
++ le32 cfg_ul;
++ le32 cfg_dbg;
++
++ struct connac3_muru_comm comm;
++ struct connac3_muru_dl dl;
++ struct connac3_muru_ul ul;
++ struct connac3_muru_dbg dbg;
++};
++
++#define MURU_OFDMA_SCH_TYPE_DL BIT(0)
++#define MURU_OFDMA_SCH_TYPE_UL BIT(1)
++#define MURU_PPDU_HE_TRIG BIT(2)
++#define MURU_PPDU_HE_MU BIT(3)
++
++/* Common Config */
++#define MURU_COMM_PPDU_FMT BIT(0)
++#define MURU_COMM_BAND BIT(2)
++#define MURU_COMM_WMM BIT(3)
++#define MURU_COMM_SPE_IDX BIT(4)
++#define MURU_COMM_SET (MURU_COMM_PPDU_FMT | MURU_COMM_BAND | \
++ MURU_COMM_WMM | MURU_COMM_SPE_IDX)
++
++/* DL Common config */
++#define MURU_FIXED_DL_BW BIT(0)
++#define MURU_FIXED_DL_GI BIT(1)
++#define MURU_FIXED_DL_TONE_PLAN BIT(3)
++#define MURU_FIXED_DL_TOTAL_USER_CNT BIT(4)
++#define MURU_FIXED_DL_LTF BIT(5)
++#define MURU_FIXED_DL_ACK_PLY BIT(9)
++
++/* DL Per User Config */
++#define MURU_FIXED_USER_DL_COD BIT(17)
++#define MURU_FIXED_USER_DL_MCS BIT(18)
++#define MURU_FIXED_USER_DL_RU_ALLOC BIT(20)
++
++/* UL Common Config */
++#define MURU_FIXED_UL_TOTAL_USER_CNT BIT(4)
++#define MURU_FIXED_UL_BW BIT(5)
++#define MURU_FIXED_UL_GILTF BIT(6)
++
++/* UL Per User Config */
++#define MURU_FIXED_USER_UL_COD BIT(18)
++#define MURU_FIXED_USER_UL_MCS BIT(19)
++#define MURU_FIXED_USER_UL_NSS BIT(20)
++#define MURU_FIXED_USER_UL_RU_ALLOC BIT(21)
++
+ #endif /* MTK_VENDOR_H */
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index e9d8732e8..e91b741a8 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -5203,7 +5203,7 @@ struct wpa_driver_ops {
+ * @priv: Private driver interface data
+ *
+ */
+- int (*mu_ctrl)(void *priv, u8 mode, u8 val);
++ int (*mu_ctrl)(void *priv, u8 mode, void *config);
+ int (*mu_dump)(void *priv, u8 *mu_onoff);
+
+ /**
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index ee046f063..f52e1ada6 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -13894,12 +13894,13 @@ fail:
+
+
+ #ifdef CONFIG_IEEE80211AX
+-static int nl80211_mu_ctrl(void *priv, u8 mode, u8 val)
++static int nl80211_mu_ctrl(void *priv, u8 mode, void *config)
+ {
+ struct i802_bss *bss = priv;
+ struct wpa_driver_nl80211_data *drv = bss->drv;
+ struct nl_msg *msg;
+ struct nlattr *data;
++ struct hostapd_config *cfg = config;
+ int ret = -ENOBUFS;
+
+ if (!drv->mtk_mu_vendor_cmd_avail) {
+@@ -13916,17 +13917,16 @@ static int nl80211_mu_ctrl(void *priv, u8 mode, u8 val)
+
+ switch (mode) {
+ case MU_CTRL_ONOFF:
+- if (nla_put_u8(msg, MTK_VENDOR_ATTR_MU_CTRL_ONOFF, val))
+- goto fail;
++ if (nla_put_u8(msg, MTK_VENDOR_ATTR_MU_CTRL_ONOFF, cfg->mu_onoff))
++ goto fail;
+ break;
+- case MU_CTRL_UL_USER_CNT:
+- case MU_CTRL_DL_USER_CNT:
+- if (nla_put_u8(msg, MTK_VENDOR_ATTR_MU_CTRL_OFDMA_MODE, mode) ||
+- nla_put_u8(msg, MTK_VENDOR_ATTR_MU_CTRL_OFDMA_VAL, val))
+- goto fail;
++ case MU_CTRL_UPDATE:
++ if (nla_put(msg, MTK_VENDOR_ATTR_MU_CTRL_STRUCT,
++ sizeof(struct connac3_muru), cfg->muru_config))
++ goto fail;
+ break;
+ default:
+- wpa_printf(MSG_ERROR, "nl80211: Wrong mu mode !");
++ wpa_printf(MSG_ERROR, "nl80211: Wrong mu mode %u!", mode);
+ ret = -EINVAL;
+ goto fail;
+ }
+@@ -13934,9 +13934,8 @@ static int nl80211_mu_ctrl(void *priv, u8 mode, u8 val)
+ nla_nest_end(msg, data);
+
+ ret = send_and_recv_cmd(drv, msg);
+- if(ret){
++ if (ret)
+ wpa_printf(MSG_ERROR, "Failed to set mu_ctrl. ret=%d (%s)", ret, strerror(-ret));
+- }
+ return ret;
+
+ fail:
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0032-mtk-hostapd-Add-HE-capabilities-check.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0032-mtk-hostapd-Add-HE-capabilities-check.patch
new file mode 100644
index 0000000..a0a05aa
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0032-mtk-hostapd-Add-HE-capabilities-check.patch
@@ -0,0 +1,52 @@
+From e71defb9b28f933e5ced5e9116f84f776df2c741 Mon Sep 17 00:00:00 2001
+From: MeiChia Chiu <meichia.chiu@mediatek.com>
+Date: Fri, 9 Jun 2023 09:03:05 +0800
+Subject: [PATCH 32/69] mtk: hostapd: Add HE capabilities check
+
+Add HE capabilities check.
+Since "HE capabilities" check has been removed by driver,
+add the support for "HE capabilities" check in hostapd.
+---
+ src/ap/hw_features.c | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
+index 672e43a10..a35c5974a 100644
+--- a/src/ap/hw_features.c
++++ b/src/ap/hw_features.c
+@@ -709,6 +709,32 @@ static int ieee80211ac_supported_vht_capab(struct hostapd_iface *iface)
+ #ifdef CONFIG_IEEE80211AX
+ static int ieee80211ax_supported_he_capab(struct hostapd_iface *iface)
+ {
++ struct hostapd_hw_modes *mode = iface->current_mode;
++ struct he_capabilities *he_cap = &mode->he_capab[IEEE80211_MODE_AP];
++ struct hostapd_config *conf = iface->conf;
++
++#define HE_CAP_CHECK(hw_cap, field, phy_idx, cfg_cap) \
++ do { \
++ if (cfg_cap && !(hw_cap[phy_idx] & field)) { \
++ wpa_printf(MSG_ERROR, "Driver does not support configured" \
++ " HE capability [%s]", #field); \
++ return 0; \
++ } \
++ } while (0)
++
++ HE_CAP_CHECK(he_cap->phy_cap, HE_PHYCAP_LDPC_CODING_IN_PAYLOAD,
++ HE_PHYCAP_LDPC_CODING_IN_PAYLOAD_IDX,
++ conf->he_phy_capab.he_ldpc);
++ HE_CAP_CHECK(he_cap->phy_cap, HE_PHYCAP_SU_BEAMFORMER_CAPAB,
++ HE_PHYCAP_SU_BEAMFORMER_CAPAB_IDX,
++ conf->he_phy_capab.he_su_beamformer);
++ HE_CAP_CHECK(he_cap->phy_cap, HE_PHYCAP_SU_BEAMFORMEE_CAPAB,
++ HE_PHYCAP_SU_BEAMFORMEE_CAPAB_IDX,
++ conf->he_phy_capab.he_su_beamformee);
++ HE_CAP_CHECK(he_cap->phy_cap, HE_PHYCAP_MU_BEAMFORMER_CAPAB,
++ HE_PHYCAP_MU_BEAMFORMER_CAPAB_IDX,
++ conf->he_phy_capab.he_mu_beamformer);
++
+ return 1;
+ }
+ #endif /* CONFIG_IEEE80211AX */
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0033-mtk-hostapd-Fix-background-channel-overlapping-opera.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0033-mtk-hostapd-Fix-background-channel-overlapping-opera.patch
new file mode 100644
index 0000000..c6f1f49
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0033-mtk-hostapd-Fix-background-channel-overlapping-opera.patch
@@ -0,0 +1,64 @@
+From 0a1002f2105ade7141cd044bb5a6e554bd7732cf Mon Sep 17 00:00:00 2001
+From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+Date: Wed, 5 Jul 2023 10:44:15 +0800
+Subject: [PATCH 33/69] mtk: hostapd: Fix background channel overlapping
+ operating channel issue
+
+Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+---
+ src/ap/dfs.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/src/ap/dfs.c b/src/ap/dfs.c
+index f5794753e..8be953287 100644
+--- a/src/ap/dfs.c
++++ b/src/ap/dfs.c
+@@ -814,6 +814,20 @@ static int dfs_are_channels_overlapped(struct hostapd_iface *iface, int freq,
+ }
+
+
++static void dfs_check_background_overlapped(struct hostapd_iface *iface)
++{
++ int width = hostapd_get_oper_chwidth(iface->conf);
++
++ if (!dfs_use_radar_background(iface))
++ return;
++
++ if (dfs_are_channels_overlapped(iface, iface->radar_background.freq,
++ width, iface->radar_background.centr_freq_seg0_idx,
++ iface->radar_background.centr_freq_seg1_idx))
++ iface->radar_background.channel = -1;
++}
++
++
+ static unsigned int dfs_get_cac_time(struct hostapd_iface *iface,
+ int start_chan_idx, int n_chans)
+ {
+@@ -1141,6 +1155,8 @@ static void hostapd_dfs_update_background_chain(struct hostapd_iface *iface)
+ &oper_centr_freq_seg1_idx,
+ &channel_type);
+ if (!channel ||
++ channel->chan == iface->conf->channel ||
++ channel->chan == iface->radar_background.channel ||
+ hostapd_start_dfs_cac(iface, iface->conf->hw_mode,
+ channel->freq, channel->chan,
+ iface->conf->ieee80211n,
+@@ -1375,6 +1391,7 @@ static int hostapd_dfs_start_channel_switch_cac(struct hostapd_iface *iface)
+ hostapd_set_oper_centr_freq_seg1_idx(iface->conf,
+ oper_centr_freq_seg1_idx);
+ err = 0;
++ dfs_check_background_overlapped(iface);
+
+ hostapd_setup_interface_complete(iface, err);
+ return err;
+@@ -1502,6 +1519,7 @@ static int hostapd_dfs_start_channel_switch(struct hostapd_iface *iface)
+ hostapd_set_oper_centr_freq_seg1_idx(
+ iface->conf, oper_centr_freq_seg1_idx);
+
++ dfs_check_background_overlapped(iface);
+ hostapd_disable_iface(iface);
+ hostapd_enable_iface(iface);
+ return 0;
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0034-mtk-hostapd-Fix-hostapd_dfs_start_cac-log.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0034-mtk-hostapd-Fix-hostapd_dfs_start_cac-log.patch
new file mode 100644
index 0000000..a25ddce
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0034-mtk-hostapd-Fix-hostapd_dfs_start_cac-log.patch
@@ -0,0 +1,31 @@
+From 8880c18c12383130f091415710301245904513f9 Mon Sep 17 00:00:00 2001
+From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+Date: Wed, 5 Jul 2023 10:47:20 +0800
+Subject: [PATCH 34/69] mtk: hostapd: Fix hostapd_dfs_start_cac log
+
+Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+---
+ src/ap/dfs.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/ap/dfs.c b/src/ap/dfs.c
+index 8be953287..7adaf81ac 100644
+--- a/src/ap/dfs.c
++++ b/src/ap/dfs.c
+@@ -1664,9 +1664,11 @@ int hostapd_dfs_start_cac(struct hostapd_iface *iface, int freq,
+ /* TODO: How to check CAC time for ETSI weather channels? */
+ iface->dfs_cac_ms = 60000;
+ wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, DFS_EVENT_CAC_START
+- "freq=%d chan=%d chan_offset=%d width=%d seg0=%d "
++ "freq=%d chan=%d chan_offset=%d width=%s seg0=%d "
+ "seg1=%d cac_time=%ds%s",
+- freq, (freq - 5000) / 5, chan_offset, chan_width, cf1, cf2,
++ freq, (freq - 5000) / 5, chan_offset,
++ channel_width_to_string(chan_width),
++ (cf1 - 5000) / 5, cf2 ? (cf2 - 5000) / 5 : 0,
+ iface->dfs_cac_ms / 1000,
+ hostapd_dfs_is_background_event(iface, freq) ?
+ " (background)" : "");
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0035-mtk-hostapd-Check-the-bridge-after-ioctl-SIOCBRADDIF.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0035-mtk-hostapd-Check-the-bridge-after-ioctl-SIOCBRADDIF.patch
new file mode 100644
index 0000000..fd8cd96
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0035-mtk-hostapd-Check-the-bridge-after-ioctl-SIOCBRADDIF.patch
@@ -0,0 +1,62 @@
+From 8e8c6df5f7fefd18630ca59e0e23581c496a8d4b Mon Sep 17 00:00:00 2001
+From: Michael Lee <michael-cy.lee@mediatek.com>
+Date: Thu, 13 Jul 2023 13:14:26 +0800
+Subject: [PATCH 35/69] mtk: hostapd: Check the bridge after ioctl SIOCBRADDIF
+ failed
+
+If ioctl returns EBUSY on command SIOCBRADDIF, the interface might
+already be bridged by others, and linux_br_add_if should not indicate an
+error in the case.
+
+This patch checks whether the interface is correctly brigded when ioctl
+returns EBUSY.
+
+Signed-off-by: Michael Lee <michael-cy.lee@mediatek.com>
+---
+ src/drivers/linux_ioctl.c | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/src/drivers/linux_ioctl.c b/src/drivers/linux_ioctl.c
+index 29abc0c59..73d27825d 100644
+--- a/src/drivers/linux_ioctl.c
++++ b/src/drivers/linux_ioctl.c
+@@ -150,7 +150,8 @@ int linux_br_del(int sock, const char *brname)
+ int linux_br_add_if(int sock, const char *brname, const char *ifname)
+ {
+ struct ifreq ifr;
+- int ifindex;
++ int ifindex, ret;
++ char in_br[IFNAMSIZ];
+
+ ifindex = if_nametoindex(ifname);
+ if (ifindex == 0)
+@@ -165,6 +166,17 @@ int linux_br_add_if(int sock, const char *brname, const char *ifname)
+
+ wpa_printf(MSG_DEBUG, "Could not add interface %s into bridge "
+ "%s: %s", ifname, brname, strerror(errno));
++
++ /* If ioctl returns -EBUSY when adding interface into bridge,
++ * the interface might already be added by netifd, so here we
++ * check whether the interface is currently on the right
++ * bridge. */
++ if(errno == EBUSY && linux_br_get(in_br, ifname) == 0 &&
++ os_strcmp(in_br, brname) == 0)
++ ret = 0;
++ else
++ ret = -1;
++
+ errno = saved_errno;
+
+ /* If ioctl() returns EBUSY when adding an interface into the
+@@ -175,6 +187,8 @@ int linux_br_add_if(int sock, const char *brname, const char *ifname)
+ if (errno != EBUSY || linux_br_get(in_br, ifname) != 0 ||
+ os_strcmp(in_br, brname) != 0)
+ return -1;
++
++ return ret;
+ }
+
+ return 0;
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0036-mtk-hostapd-Update-parameter_set_count-in-MU-EDCA-IE.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0036-mtk-hostapd-Update-parameter_set_count-in-MU-EDCA-IE.patch
new file mode 100644
index 0000000..142711d
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0036-mtk-hostapd-Update-parameter_set_count-in-MU-EDCA-IE.patch
@@ -0,0 +1,28 @@
+From ca514dac2884e5300e87e19cbf1f2ee6b1889cc3 Mon Sep 17 00:00:00 2001
+From: MeiChia Chiu <meichia.chiu@mediatek.com>
+Date: Fri, 14 Jul 2023 17:19:13 +0800
+Subject: [PATCH 36/69] mtk: hostapd: Update parameter_set_count in MU EDCA IE
+
+without this patch, MU EDCA Parameter update count not equal to
+WMM Parameter set count.
+---
+ src/ap/ieee802_11_he.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/ap/ieee802_11_he.c b/src/ap/ieee802_11_he.c
+index 3c6ee72fe..3b6b2041c 100644
+--- a/src/ap/ieee802_11_he.c
++++ b/src/ap/ieee802_11_he.c
+@@ -317,6 +317,9 @@ u8 * hostapd_eid_he_mu_edca_parameter_set(struct hostapd_data *hapd, u8 *eid)
+ edca = (struct ieee80211_he_mu_edca_parameter_set *) pos;
+ os_memcpy(edca, &hapd->iface->conf->he_mu_edca, sizeof(*edca));
+
++ if (hapd->conf->wmm_enabled)
++ edca->he_qos_info = hapd->parameter_set_count % 0xf;
++
+ wpa_hexdump(MSG_DEBUG, "HE: MU EDCA Parameter Set element",
+ pos, sizeof(*edca));
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0037-mtk-hostapd-add-extension-IE-list-for-non-inherit-IE.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0037-mtk-hostapd-add-extension-IE-list-for-non-inherit-IE.patch
new file mode 100644
index 0000000..75e879b
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0037-mtk-hostapd-add-extension-IE-list-for-non-inherit-IE.patch
@@ -0,0 +1,36 @@
+From c7a85f8c48129417b0a3754a7403985af6bb16c2 Mon Sep 17 00:00:00 2001
+From: mtk20656 <chank.chen@mediatek.com>
+Date: Mon, 24 Jul 2023 11:30:27 +0800
+Subject: [PATCH 37/69] mtk: hostapd: add extension IE list for non-inherit IE
+ in mbssid
+
+Certain clients do not scan all non tx profiles due to absence of
+element ID extension list which is mandatory field in non inheritance
+IE. Non inheritance Element ID is followed by extension element ID.
+Length is expected to be mentioned. Currently we do not support any
+extension element and hence filling length as 0.
+
+Signed-off-by: mtk20656 <chank.chen@mediatek.com>
+---
+ src/ap/ieee802_11.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 100644 => 100755 src/ap/ieee802_11.c
+
+diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+old mode 100644
+new mode 100755
+index 875054196..8a26bdfbc
+--- a/src/ap/ieee802_11.c
++++ b/src/ap/ieee802_11.c
+@@ -7890,7 +7890,7 @@ static size_t hostapd_eid_mbssid_elem_len(struct hostapd_data *hapd,
+ else if (hapd->conf->xrates_supported)
+ ie_count++;
+ if (ie_count)
+- nontx_profile_len += 4 + ie_count;
++ nontx_profile_len += 5 + ie_count;
+
+ if (len + nontx_profile_len > 255)
+ break;
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0038-mtk-hostapd-Fix-rnr-ie-length-when-no-need-to-report.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0038-mtk-hostapd-Fix-rnr-ie-length-when-no-need-to-report.patch
new file mode 100644
index 0000000..dd06548
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0038-mtk-hostapd-Fix-rnr-ie-length-when-no-need-to-report.patch
@@ -0,0 +1,34 @@
+From 0a4af7dcc865da8bf47476e3a8dc3b76f437af3e Mon Sep 17 00:00:00 2001
+From: "Allen.Ye" <allen.ye@mediatek.com>
+Date: Mon, 7 Aug 2023 15:27:27 +0800
+Subject: [PATCH 38/69] mtk: hostapd: Fix rnr ie length when no need to report
+ bss
+
+Fix rnr ie length when no need to report bss. If we don't have content in
+TBTT then don't change the length of the ie (*size_offset).
+
+Signed-off-by: Allen.Ye <allen.ye@mediatek.com>
+---
+ src/ap/ieee802_11.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+index 8a26bdfbc..713b48433 100755
+--- a/src/ap/ieee802_11.c
++++ b/src/ap/ieee802_11.c
+@@ -7732,8 +7732,10 @@ static u8 * hostapd_eid_rnr_iface(struct hostapd_data *hapd,
+ }
+
+ start = i;
+- *tbtt_count_pos = RNR_TBTT_INFO_COUNT(tbtt_count - 1);
+- *size_offset = (eid - size_offset) - 1;
++ if (tbtt_count != 0) {
++ *tbtt_count_pos = RNR_TBTT_INFO_COUNT(tbtt_count - 1);
++ *size_offset = (eid - size_offset) - 1;
++ }
+ }
+
+ if (tbtt_count == 0)
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0039-mtk-hostapd-add-back-ht-vht-cap-missing-field-before.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0039-mtk-hostapd-add-back-ht-vht-cap-missing-field-before.patch
new file mode 100644
index 0000000..c2da758
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0039-mtk-hostapd-add-back-ht-vht-cap-missing-field-before.patch
@@ -0,0 +1,44 @@
+From 6fdbb52e9ab32058715f80a25f3e24a63f776ccc Mon Sep 17 00:00:00 2001
+From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+Date: Tue, 8 Aug 2023 19:21:41 +0800
+Subject: [PATCH 39/69] mtk: hostapd: add back ht vht cap missing field before
+ dfs channel fallback
+
+hostapd_event_ch_switch would set / clear ht_capab and vht_capab, based
+on the bandwidth of switched channel.
+For example, vht bw 160 support field would be cleared if we switch to
+non bw 160 channel.
+This design works fine with NON-DFS channel switch.
+However, for those DFS channels who require CAC, channel switch command
+calls hostapd_switch_channel_fallback instead of hostapd_switch_channel.
+This is simply restarting the interface not CHANNEL SWITCHING, so
+hostapd will not receive any ch_switch event from kernel.
+Therefore, the cleared field in vht_capab will not be set back to 1,
+even if we channel switch to dfs channel bw 160.
+
+Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+---
+ src/ap/hostapd.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index 8ab5c96d6..a047927e0 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -4256,6 +4256,13 @@ hostapd_switch_channel_fallback(struct hostapd_iface *iface,
+ break;
+ }
+
++ if ((iface->current_mode->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET) &&
++ freq_params->bandwidth > 20)
++ iface->conf->ht_capab |= HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET;
++ if ((iface->current_mode->vht_capab & VHT_CAP_SUPP_CHAN_WIDTH_160MHZ) &&
++ freq_params->bandwidth == 160)
++ iface->conf->vht_capab |= VHT_CAP_SUPP_CHAN_WIDTH_160MHZ;
++
+ iface->freq = freq_params->freq;
+ iface->conf->channel = freq_params->channel;
+ iface->conf->secondary_channel = freq_params->sec_channel_offset;
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0040-mtk-hostapd-Add-support-for-gtk-rekeying-in-hostapd-.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0040-mtk-hostapd-Add-support-for-gtk-rekeying-in-hostapd-.patch
new file mode 100644
index 0000000..5ac43a5
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0040-mtk-hostapd-Add-support-for-gtk-rekeying-in-hostapd-.patch
@@ -0,0 +1,45 @@
+From 7c494ef09049fab6ce45f06fd1c8afc303bc9d3c Mon Sep 17 00:00:00 2001
+From: mtk23510 <rudra.shahi@mediatek.com>
+Date: Fri, 26 May 2023 14:52:35 +0800
+Subject: [PATCH 40/69] mtk: hostapd: Add support for gtk rekeying in hostapd
+ cli
+
+Signed-off-by: mtk23510 <rudra.shahi@mediatek.com>
+---
+ hostapd/hostapd_cli.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
+index 12c580455..e0b175386 100644
+--- a/hostapd/hostapd_cli.c
++++ b/hostapd/hostapd_cli.c
+@@ -1291,6 +1291,15 @@ static int hostapd_cli_cmd_stop_ap(struct wpa_ctrl *ctrl, int argc,
+ }
+
+
++#ifdef CONFIG_TESTING_OPTIONS
++static int hostapd_cli_cmd_rekey_gtk(struct wpa_ctrl *ctrl, int argc,
++ char *argv[])
++{
++ return wpa_ctrl_command(ctrl, "REKEY_GTK");
++}
++#endif
++
++
+ static int hostapd_cli_cmd_vendor(struct wpa_ctrl *ctrl, int argc, char *argv[])
+ {
+ char cmd[256];
+@@ -1831,6 +1840,10 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
+ "= update Beacon frame contents\n"},
+ { "stop_ap", hostapd_cli_cmd_stop_ap, NULL,
+ "= stop AP\n"},
++#ifdef CONFIG_TESTING_OPTIONS
++ { "rekey_gtk", hostapd_cli_cmd_rekey_gtk, NULL,
++ "= rekey gtk\n"},
++#endif
+ { "erp_flush", hostapd_cli_cmd_erp_flush, NULL,
+ "= drop all ERP keys"},
+ { "log_level", hostapd_cli_cmd_log_level, NULL,
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0041-mtk-hostapd-Set-WMM-and-TX-queue-parameters-for-wpa_.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0041-mtk-hostapd-Set-WMM-and-TX-queue-parameters-for-wpa_.patch
new file mode 100644
index 0000000..470a4fb
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0041-mtk-hostapd-Set-WMM-and-TX-queue-parameters-for-wpa_.patch
@@ -0,0 +1,48 @@
+From 4c89ae629600a6d14229c8a4ed13e24dfd6b656a Mon Sep 17 00:00:00 2001
+From: Michael Lee <michael-cy.lee@mediatek.com>
+Date: Tue, 11 Jul 2023 14:17:43 +0800
+Subject: [PATCH 41/69] mtk: hostapd: Set WMM and TX queue parameters for
+ wpa_supplicant
+
+Since most of the time, wpa_supplicant will be used to setup an STA
+interface, it's default WMM and TX queue parameters should be set for
+STA.
+
+Signed-off-by: Michael Lee <michael-cy.lee@mediatek.com>
+---
+ wpa_supplicant/config.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
+index c3943355d..7bb57e2ab 100644
+--- a/wpa_supplicant/config.c
++++ b/wpa_supplicant/config.c
+@@ -4720,19 +4720,19 @@ struct wpa_config * wpa_config_alloc_empty(const char *ctrl_interface,
+ const struct hostapd_wmm_ac_params ac_bk =
+ { aCWmin, aCWmax, 7, 0, 0 }; /* background traffic */
+ const struct hostapd_wmm_ac_params ac_be =
+- { aCWmin, aCWmax, 3, 0, 0 }; /* best effort traffic */
++ { aCWmin, aCWmin + 2, 3, 0, 0 }; /* best effort traffic */
+ const struct hostapd_wmm_ac_params ac_vi = /* video traffic */
+- { aCWmin - 1, aCWmin, 2, 3008 / 32, 0 };
++ { aCWmin - 1, aCWmin, 1, 3008 / 32, 0 };
+ const struct hostapd_wmm_ac_params ac_vo = /* voice traffic */
+- { aCWmin - 2, aCWmin - 1, 2, 1504 / 32, 0 };
++ { aCWmin - 2, aCWmin - 1, 1, 1504 / 32, 0 };
+ const struct hostapd_tx_queue_params txq_bk =
+ { 7, ecw2cw(aCWmin), ecw2cw(aCWmax), 0 };
+ const struct hostapd_tx_queue_params txq_be =
+- { 3, ecw2cw(aCWmin), 4 * (ecw2cw(aCWmin) + 1) - 1, 0 };
++ { 3, ecw2cw(aCWmin), ecw2cw(aCWmax), 0 };
+ const struct hostapd_tx_queue_params txq_vi =
+- { 1, (ecw2cw(aCWmin) + 1) / 2 - 1, ecw2cw(aCWmin), 30 };
++ { 2, (ecw2cw(aCWmin) + 1) / 2 - 1, ecw2cw(aCWmin), 30 };
+ const struct hostapd_tx_queue_params txq_vo =
+- { 1, (ecw2cw(aCWmin) + 1) / 4 - 1,
++ { 2, (ecw2cw(aCWmin) + 1) / 4 - 1,
+ (ecw2cw(aCWmin) + 1) / 2 - 1, 15 };
+
+ #undef ecw2cw
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0042-mtk-hostapd-Set-STA-TX-queue-parameters-configuratio.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0042-mtk-hostapd-Set-STA-TX-queue-parameters-configuratio.patch
new file mode 100644
index 0000000..c331ecd
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0042-mtk-hostapd-Set-STA-TX-queue-parameters-configuratio.patch
@@ -0,0 +1,78 @@
+From 3d0b9d228d1b2411f6c5478c2639deeae8907d86 Mon Sep 17 00:00:00 2001
+From: Michael Lee <michael-cy.lee@mediatek.com>
+Date: Fri, 7 Jul 2023 17:16:11 +0800
+Subject: [PATCH 42/69] mtk: hostapd: Set STA TX queue parameters configuration
+ after association
+
+This patch adds the way for wpa_supplicant to set driver's TX queue
+parameters.
+Since STA parses and apply TX queue parameters from AP beacon's WMM IE
+during association, wpa_supplicant set driver's TX queue parameters
+after the association.
+
+Signed-off-by: Michael Lee <michael-cy.lee@mediatek.com>
+---
+ wpa_supplicant/driver_i.h | 12 ++++++++++++
+ wpa_supplicant/events.c | 16 ++++++++++++++++
+ 2 files changed, 28 insertions(+)
+
+diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h
+index 0322b7150..0b7182f49 100644
+--- a/wpa_supplicant/driver_i.h
++++ b/wpa_supplicant/driver_i.h
+@@ -321,6 +321,18 @@ static inline int wpa_drv_set_country(struct wpa_supplicant *wpa_s,
+ return 0;
+ }
+
++static inline int wpa_drv_set_tx_queue_params(struct wpa_supplicant *wpa_s,
++ int q, int aifs, int cw_min,
++ int cw_max, int burst_time)
++{
++ int link_id = -1;
++ if (wpa_s->driver->set_tx_queue_params)
++ return wpa_s->driver->set_tx_queue_params(wpa_s->drv_priv, q,
++ aifs, cw_min, cw_max,
++ burst_time, link_id);
++ return 0;
++}
++
+ static inline int wpa_drv_send_mlme(struct wpa_supplicant *wpa_s,
+ const u8 *data, size_t data_len, int noack,
+ unsigned int freq, unsigned int wait)
+diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
+index 2a9342318..8fd2f2049 100644
+--- a/wpa_supplicant/events.c
++++ b/wpa_supplicant/events.c
+@@ -4070,6 +4070,20 @@ out:
+ return wpa_sm_set_mlo_params(wpa_s->wpa, &wpa_mlo);
+ }
+
++static void wpa_supplicant_tx_queue_params(struct wpa_supplicant *wpa_s){
++ struct hostapd_tx_queue_params *p;
++
++ for (int i = 0; i < NUM_TX_QUEUES; i++){
++ p = &wpa_s->conf->tx_queue[i];
++ if(wpa_drv_set_tx_queue_params(wpa_s, 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 void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
+ union wpa_event_data *data)
+@@ -4399,6 +4413,8 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
+
+ if (wpa_s->current_ssid && wpa_s->current_ssid->enable_4addr_mode)
+ wpa_supplicant_set_4addr_mode(wpa_s);
++
++ wpa_supplicant_tx_queue_params(wpa_s);
+ }
+
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0043-mtk-hostapd-avoid-color-switch-when-beacon-is-not-se.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0043-mtk-hostapd-avoid-color-switch-when-beacon-is-not-se.patch
new file mode 100644
index 0000000..1d84d9f
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0043-mtk-hostapd-avoid-color-switch-when-beacon-is-not-se.patch
@@ -0,0 +1,26 @@
+From ea5ab4350b4adae945b1ffc814398e9fd1637039 Mon Sep 17 00:00:00 2001
+From: Michael-CY Lee <michael-cy.lee@mediatek.com>
+Date: Fri, 1 Sep 2023 15:31:24 +0800
+Subject: [PATCH 43/69] mtk: hostapd: avoid color switch when beacon is not set
+
+Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
+---
+ src/ap/hostapd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index a047927e0..f6366d58a 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -4394,7 +4394,7 @@ void hostapd_switch_color(struct hostapd_data *hapd, u64 bitmap)
+ {
+ struct os_reltime now;
+
+- if (hapd->cca_in_progress)
++ if (hapd->cca_in_progress || !hapd->beacon_set_done)
+ return;
+
+ if (os_get_reltime(&now))
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0044-mtk-hostapd-6g-bss-connect-do-not-consider-ht-operat.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0044-mtk-hostapd-6g-bss-connect-do-not-consider-ht-operat.patch
new file mode 100644
index 0000000..4f07765
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0044-mtk-hostapd-6g-bss-connect-do-not-consider-ht-operat.patch
@@ -0,0 +1,30 @@
+From 52d769d9a88a28d20f8e24298de14dd411be558e Mon Sep 17 00:00:00 2001
+From: mtk20656 <chank.chen@mediatek.com>
+Date: Wed, 13 Sep 2023 19:29:51 +0800
+Subject: [PATCH 44/69] mtk: hostapd: 6g bss connect do not consider ht
+ operation
+
+Signed-off-by: mtk20656 <chank.chen@mediatek.com>
+---
+ src/ap/ieee802_11.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 100755 => 100644 src/ap/ieee802_11.c
+
+diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+old mode 100755
+new mode 100644
+index 713b48433..100a775ad
+--- a/src/ap/ieee802_11.c
++++ b/src/ap/ieee802_11.c
+@@ -5595,7 +5595,7 @@ static void handle_assoc(struct hostapd_data *hapd,
+ set_beacon = true;
+ }
+
+- if (update_ht_state(hapd, sta) > 0)
++ if (!is_6ghz_op_class(hapd->iconf->op_class) && update_ht_state(hapd, sta) > 0)
+ set_beacon = true;
+
+ hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0045-mtk-hostapd-Add-ACS-chanlist-info-in-get_config.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0045-mtk-hostapd-Add-ACS-chanlist-info-in-get_config.patch
new file mode 100644
index 0000000..abf47cb
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0045-mtk-hostapd-Add-ACS-chanlist-info-in-get_config.patch
@@ -0,0 +1,96 @@
+From 0fc675cee8f27cbc0277820e9478201c4c8be625 Mon Sep 17 00:00:00 2001
+From: "fancy.liu" <fancy.liu@mediatek.com>
+Date: Sun, 8 Oct 2023 11:50:06 +0800
+Subject: [PATCH 45/69] mtk: hostapd: Add ACS chanlist info in get_config
+
+This patch is used to add ACS chanlist info displaying
+for upper layer application obtaining.
+
+Command format:
+hostapd_cli -i phy0-ap0 get_config
+
+Signed-off-by: fancy.liu <fancy.liu@mediatek.com>
+---
+ hostapd/ctrl_iface.c | 59 ++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 59 insertions(+)
+
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index 6ed47ecce..056a35bc3 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -1058,6 +1058,7 @@ static int hostapd_ctrl_iface_get_config(struct hostapd_data *hapd,
+ {
+ int ret;
+ char *pos, *end;
++ int i;
+
+ pos = buf;
+ end = buf + buflen;
+@@ -1237,6 +1238,64 @@ static int hostapd_ctrl_iface_get_config(struct hostapd_data *hapd,
+ pos += ret;
+ }
+
++ /* dump chanlist */
++ if (hapd->iface->conf->acs_ch_list.num > 0) {
++ ret = os_snprintf(pos, end - pos, "chanlist=");
++ if (os_snprintf_error(end - pos, ret))
++ return pos - buf;
++ pos += ret;
++
++ for (i = 0; i < hapd->iface->conf->acs_ch_list.num; i++) {
++ if (i > 0) {
++ ret = os_snprintf(pos, end - pos, ", ");
++ if (os_snprintf_error(end - pos, ret))
++ return pos - buf;
++ pos += ret;
++ }
++
++ ret = os_snprintf(pos, end - pos, "%d-%d",
++ hapd->iface->conf->acs_ch_list.range[i].min,
++ hapd->iface->conf->acs_ch_list.range[i].max);
++ if (os_snprintf_error(end - pos, ret))
++ return pos - buf;
++ pos += ret;
++ }
++
++ ret = os_snprintf(pos, end - pos, "\n");
++ if (os_snprintf_error(end - pos, ret))
++ return pos - buf;
++ pos += ret;
++ }
++
++ /* dump freqlist */
++ if (hapd->iface->conf->acs_freq_list.num > 0) {
++ ret = os_snprintf(pos, end - pos, "freqlist=");
++ if (os_snprintf_error(end - pos, ret))
++ return pos - buf;
++ pos += ret;
++
++ for (i = 0; i < hapd->iface->conf->acs_freq_list.num; i++) {
++ if (i > 0) {
++ ret = os_snprintf(pos, end - pos, ", ");
++ if (os_snprintf_error(end - pos, ret))
++ return pos - buf;
++ pos += ret;
++ }
++
++ ret = os_snprintf(pos, end - pos, "%d-%d",
++ hapd->iface->conf->acs_freq_list.range[i].min,
++ hapd->iface->conf->acs_freq_list.range[i].max);
++ if (os_snprintf_error(end - pos, ret))
++ return pos - buf;
++ pos += ret;
++ }
++
++ ret = os_snprintf(pos, end - pos, "\n");
++ if (os_snprintf_error(end - pos, ret))
++ return pos - buf;
++ pos += ret;
++ }
++
+ return pos - buf;
+ }
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0046-mtk-hostapd-Fix-RSNXE-Interop-issue-with-STA.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0046-mtk-hostapd-Fix-RSNXE-Interop-issue-with-STA.patch
new file mode 100644
index 0000000..d2c8481
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0046-mtk-hostapd-Fix-RSNXE-Interop-issue-with-STA.patch
@@ -0,0 +1,43 @@
+From 38ac9a75c71ec9659058f50bf4e669b754dcb011 Mon Sep 17 00:00:00 2001
+From: mtk25255 <rohit.kamat@mediatek.com>
+Date: Thu, 12 Oct 2023 14:29:23 +0800
+Subject: [PATCH 46/69] mtk: hostapd: Fix RSNXE Interop issue with STA
+
+---
+ src/ap/ieee802_11.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+index 100a775ad..dc362a589 100644
+--- a/src/ap/ieee802_11.c
++++ b/src/ap/ieee802_11.c
+@@ -5298,6 +5298,7 @@ static void handle_assoc(struct hostapd_data *hapd,
+ int omit_rsnxe = 0;
+ bool set_beacon = false;
+ bool mld_addrs_not_translated = false;
++ bool sae_pk = false;
+
+ if (len < IEEE80211_HDRLEN + (reassoc ? sizeof(mgmt->u.reassoc_req) :
+ sizeof(mgmt->u.assoc_req))) {
+@@ -5543,7 +5544,17 @@ static void handle_assoc(struct hostapd_data *hapd,
+ if (resp != WLAN_STATUS_SUCCESS)
+ goto fail;
+ omit_rsnxe = !get_ie(pos, left, WLAN_EID_RSNX);
+-
++#ifdef CONFIG_SAE_PK
++ sae_pk = hostapd_sae_pk_in_use(hapd->conf);
++#endif /* CONFIG_SAE_PK */
++ if (omit_rsnxe) {
++ if (!reassoc && wpa_key_mgmt_sae(hapd->conf->wpa_key_mgmt) &&
++ (hapd->conf->sae_pwe == SAE_PWE_HASH_TO_ELEMENT ||
++ hapd->conf->sae_pwe == SAE_PWE_BOTH || sae_pk ||
++ wpa_key_mgmt_sae_ext_key(hapd->conf->wpa_key_mgmt))) {
++ omit_rsnxe = 0;
++ }
++ }
+ if (hostapd_get_aid(hapd, sta) < 0) {
+ hostapd_logger(hapd, mgmt->sa, HOSTAPD_MODULE_IEEE80211,
+ HOSTAPD_LEVEL_INFO, "No room for more AIDs");
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0047-mtk-hostapd-update-eht-operation-element.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0047-mtk-hostapd-update-eht-operation-element.patch
new file mode 100644
index 0000000..8eaf5c8
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0047-mtk-hostapd-update-eht-operation-element.patch
@@ -0,0 +1,29 @@
+From 5ae6e7a6971a9e1f789f91d42dc5e5522e2c648f Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Wed, 10 May 2023 13:11:34 +0800
+Subject: [PATCH 47/69] mtk: hostapd: update eht operation element
+
+---
+ src/ap/ieee802_11_eht.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/ap/ieee802_11_eht.c b/src/ap/ieee802_11_eht.c
+index 6ffc5dd57..c589e5134 100644
+--- a/src/ap/ieee802_11_eht.c
++++ b/src/ap/ieee802_11_eht.c
+@@ -237,9 +237,9 @@ u8 * hostapd_eid_eht_operation(struct hostapd_data *hapd, u8 *eid)
+
+ /* TODO: Fill in appropriate EHT-MCS max Nss information */
+ oper->basic_eht_mcs_nss_set[0] = 0x11;
+- oper->basic_eht_mcs_nss_set[1] = 0x00;
+- oper->basic_eht_mcs_nss_set[2] = 0x00;
+- oper->basic_eht_mcs_nss_set[3] = 0x00;
++ oper->basic_eht_mcs_nss_set[1] = 0x11;
++ oper->basic_eht_mcs_nss_set[2] = 0x11;
++ oper->basic_eht_mcs_nss_set[3] = 0x11;
+
+ if (!eht_oper_info_present)
+ return pos + elen;
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0048-mtk-hostapd-ucode-add-support-for-ucode-to-parse-BW3.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0048-mtk-hostapd-ucode-add-support-for-ucode-to-parse-BW3.patch
new file mode 100644
index 0000000..d598562
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0048-mtk-hostapd-ucode-add-support-for-ucode-to-parse-BW3.patch
@@ -0,0 +1,28 @@
+From 9739b0a32f7ccf3b538285ad18dd9604befa2cd1 Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Wed, 30 Aug 2023 04:23:37 +0800
+Subject: [PATCH 48/69] mtk: hostapd: ucode: add support for ucode to parse
+ BW320MHz info
+
+---
+ src/utils/ucode.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/utils/ucode.c b/src/utils/ucode.c
+index 29c753c32..4b6ed3a94 100644
+--- a/src/utils/ucode.c
++++ b/src/utils/ucode.c
+@@ -144,6 +144,10 @@ uc_value_t *uc_wpa_freq_info(uc_vm_t *vm, size_t nargs)
+ case 2:
+ chanwidth = CONF_OPER_CHWIDTH_160MHZ;
+ break;
++ case 9:
++ width = 3;
++ chanwidth = CONF_OPER_CHWIDTH_320MHZ;
++ break;
+ default:
+ return NULL;
+ }
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0049-mtk-hostapd-synchronize-bandwidth-in-AP-STA-support.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0049-mtk-hostapd-synchronize-bandwidth-in-AP-STA-support.patch
new file mode 100644
index 0000000..a568827
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0049-mtk-hostapd-synchronize-bandwidth-in-AP-STA-support.patch
@@ -0,0 +1,279 @@
+From 859b6e4923fc315127b892635ed34832ab2e32f0 Mon Sep 17 00:00:00 2001
+From: Michael-CY Lee <michael-cy.lee@mediatek.com>
+Date: Mon, 11 Sep 2023 10:16:35 +0800
+Subject: [PATCH 49/69] mtk: hostapd: synchronize bandwidth in AP/STA support
+
+Signed-off-by: Michael Lee <michael-cy.lee@mediatek.com>
+---
+ src/ap/ucode.c | 41 +++++++++++++++++++--
+ src/utils/ucode.c | 12 +++++--
+ wpa_supplicant/ucode.c | 82 ++++++++++++++++++++++++++++++++++--------
+ 3 files changed, 117 insertions(+), 18 deletions(-)
+
+diff --git a/src/ap/ucode.c b/src/ap/ucode.c
+index 16d1b5153..98b2a3bf2 100644
+--- a/src/ap/ucode.c
++++ b/src/ap/ucode.c
+@@ -489,6 +489,9 @@ uc_hostapd_iface_stop(uc_vm_t *vm, size_t nargs)
+ struct hostapd_iface *iface = uc_fn_thisval("hostapd.iface");
+ int i;
+
++ wpa_printf(MSG_INFO, "ucode: mtk: stop iface for %s in state %s\n",
++ iface->phy, hostapd_state_text(iface->state));
++
+ if (!iface)
+ return NULL;
+
+@@ -515,6 +518,9 @@ uc_hostapd_iface_start(uc_vm_t *vm, size_t nargs)
+ uint64_t intval;
+ int i;
+
++ wpa_printf(MSG_INFO, "ucode: mtk: start iface for %s in state %s\n",
++ iface->phy, hostapd_state_text(iface->state));
++
+ if (!iface)
+ return NULL;
+
+@@ -537,7 +543,13 @@ uc_hostapd_iface_start(uc_vm_t *vm, size_t nargs)
+ UPDATE_VAL(op_class, "op_class");
+ UPDATE_VAL(hw_mode, "hw_mode");
+ UPDATE_VAL(channel, "channel");
+- UPDATE_VAL(secondary_channel, "sec_channel");
++
++ intval = ucv_int64_get(ucv_object_get(info, "sec_channel", NULL));
++ if (!errno) {
++ conf->secondary_channel = intval;
++ changed = true;
++ }
++
+ if (!changed &&
+ (iface->bss[0]->beacon_set_done ||
+ iface->state == HAPD_IFACE_DFS))
+@@ -583,6 +595,18 @@ out:
+ return ucv_boolean_new(true);
+ }
+
++ wpa_printf(MSG_INFO, "ucode: mtk: updated channel information:\n");
++ wpa_printf(MSG_INFO, " * channel: %d\n", conf->channel);
++ wpa_printf(MSG_INFO, " * op_class: %d\n", conf->op_class);
++ wpa_printf(MSG_INFO, " * secondary channel: %d\n",
++ conf->secondary_channel);
++ wpa_printf(MSG_INFO, " * seg0: %d\n",
++ hostapd_get_oper_centr_freq_seg0_idx(conf));
++ wpa_printf(MSG_INFO, " * seg1: %d\n",
++ hostapd_get_oper_centr_freq_seg0_idx(conf));
++ wpa_printf(MSG_INFO, " * oper_chwidth: %d\n",
++ hostapd_get_oper_chwidth(conf));
++
+ for (i = 0; i < iface->num_bss; i++) {
+ struct hostapd_data *hapd = iface->bss[i];
+ int ret;
+@@ -617,6 +641,7 @@ uc_hostapd_iface_switch_channel(uc_vm_t *vm, size_t nargs)
+ uint64_t intval;
+ int i, ret = 0;
+
++ wpa_printf(MSG_INFO, "ucode: mtk: channel switch for %s\n", iface->phy);
+ if (!iface || ucv_type(info) != UC_OBJECT)
+ return NULL;
+
+@@ -636,7 +661,8 @@ uc_hostapd_iface_switch_channel(uc_vm_t *vm, size_t nargs)
+ if (errno)
+ intval = hostapd_get_oper_chwidth(conf);
+ if (intval)
+- csa.freq_params.bandwidth = 40 << intval;
++ csa.freq_params.bandwidth = 40 <<
++ (intval == CONF_OPER_CHWIDTH_320MHZ ? 3 : intval);
+ else
+ csa.freq_params.bandwidth = csa.freq_params.sec_channel_offset ? 40 : 20;
+
+@@ -647,6 +673,17 @@ uc_hostapd_iface_switch_channel(uc_vm_t *vm, size_t nargs)
+ if ((intval = ucv_int64_get(ucv_object_get(info, "center_freq2", NULL))) && !errno)
+ csa.freq_params.center_freq2 = intval;
+
++ wpa_printf(MSG_INFO, "ucode: mtk: switch channel information:\n");
++ wpa_printf(MSG_INFO, " * freq is %d\n", csa.freq_params.freq);
++ wpa_printf(MSG_INFO, " * bandwidth is %d\n",
++ csa.freq_params.bandwidth);
++ wpa_printf(MSG_INFO, " * sec_chan_offset is %d\n",
++ csa.freq_params.sec_channel_offset);
++ wpa_printf(MSG_INFO, " * center_freq1 is %d\n",
++ csa.freq_params.center_freq1);
++ wpa_printf(MSG_INFO, " * center_freq2 is %d\n",
++ csa.freq_params.center_freq2);
++
+ for (i = 0; i < iface->num_bss; i++)
+ ret = hostapd_switch_channel(iface->bss[i], &csa);
+
+diff --git a/src/utils/ucode.c b/src/utils/ucode.c
+index 4b6ed3a94..6f82382f3 100644
+--- a/src/utils/ucode.c
++++ b/src/utils/ucode.c
+@@ -110,6 +110,7 @@ uc_value_t *uc_wpa_freq_info(uc_vm_t *vm, size_t nargs)
+ uc_value_t *freq = uc_fn_arg(0);
+ uc_value_t *sec = uc_fn_arg(1);
+ int width = ucv_uint64_get(uc_fn_arg(2));
++ int bw320_offset = 1;
+ int freq_val, center_idx, center_ofs;
+ enum oper_chan_width chanwidth;
+ enum hostapd_hw_mode hw_mode;
+@@ -147,6 +148,9 @@ uc_value_t *uc_wpa_freq_info(uc_vm_t *vm, size_t nargs)
+ case 9:
+ width = 3;
+ chanwidth = CONF_OPER_CHWIDTH_320MHZ;
++
++ /* bw320_offset is 1 for 320 MHz-1, and 2 for 320 MHz-2 */
++ bw320_offset = ucv_uint64_get(uc_fn_arg(3));
+ break;
+ default:
+ return NULL;
+@@ -178,12 +182,16 @@ uc_value_t *uc_wpa_freq_info(uc_vm_t *vm, size_t nargs)
+ ucv_object_add(ret, "hw_mode_str", ucv_get(ucv_string_new(modestr)));
+ ucv_object_add(ret, "sec_channel", ucv_int64_new(sec_channel));
+ ucv_object_add(ret, "frequency", ucv_int64_new(freq_val));
++ ucv_object_add(ret, "oper_chwidth", ucv_int64_new(chanwidth));
+
+- if (!sec_channel)
++ if (chanwidth == CONF_OPER_CHWIDTH_USE_HT && !sec_channel) {
++ ucv_object_add(ret, "center_seg0_idx", ucv_int64_new(channel));
++ ucv_object_add(ret, "center_freq1", ucv_int64_new(freq_val));
+ return ret;
++ }
+
+ if (freq_val >= 5900)
+- center_ofs = 0;
++ center_ofs = 32 * (1 - bw320_offset);
+ else if (freq_val >= 5745)
+ center_ofs = 20;
+ else
+diff --git a/wpa_supplicant/ucode.c b/wpa_supplicant/ucode.c
+index 397f85bde..542ca25c9 100644
+--- a/wpa_supplicant/ucode.c
++++ b/wpa_supplicant/ucode.c
+@@ -7,6 +7,8 @@
+ #include "wps_supplicant.h"
+ #include "bss.h"
+ #include "ucode.h"
++#include "driver_i.h"
++#include "common/ieee802_11_common.h"
+
+ static struct wpa_global *wpa_global;
+ static uc_resource_type_t *global_type, *iface_type;
+@@ -96,6 +98,8 @@ void wpas_ucode_event(struct wpa_supplicant *wpa_s, int event, union wpa_event_d
+ {
+ const char *state;
+ uc_value_t *val;
++ enum oper_chan_width ch_width;
++ int center_freq1, bw320_offset = 1;
+
+ if (event != EVENT_CH_SWITCH_STARTED)
+ return;
+@@ -114,11 +118,42 @@ void wpas_ucode_event(struct wpa_supplicant *wpa_s, int event, union wpa_event_d
+ uc_value_push(ucv_get(val));
+
+ if (event == EVENT_CH_SWITCH_STARTED) {
++ center_freq1 = data->ch_switch.cf1;
++
++ switch (data->ch_switch.ch_width) {
++ case CHAN_WIDTH_80:
++ ch_width = CONF_OPER_CHWIDTH_80MHZ;
++ break;
++ case CHAN_WIDTH_80P80:
++ ch_width = CONF_OPER_CHWIDTH_80P80MHZ;
++ break;
++ case CHAN_WIDTH_160:
++ ch_width = CONF_OPER_CHWIDTH_160MHZ;
++ break;
++ case CHAN_WIDTH_320:
++ ch_width = CONF_OPER_CHWIDTH_320MHZ;
++ break;
++ case CHAN_WIDTH_20_NOHT:
++ case CHAN_WIDTH_20:
++ case CHAN_WIDTH_40:
++ default:
++ ch_width = CONF_OPER_CHWIDTH_USE_HT;
++ break;
++ }
++
++ /* Check bandwidth 320 MHz-2 */
++ if (ch_width == CONF_OPER_CHWIDTH_320MHZ &&
++ (center_freq1 == 6265) || center_freq1 == 6585 ||
++ center_freq1 == 6905)
++ bw320_offset = 2;
++
+ ucv_object_add(val, "csa_count", ucv_int64_new(data->ch_switch.count));
+ ucv_object_add(val, "frequency", ucv_int64_new(data->ch_switch.freq));
+ ucv_object_add(val, "sec_chan_offset", ucv_int64_new(data->ch_switch.ch_offset));
+- ucv_object_add(val, "center_freq1", ucv_int64_new(data->ch_switch.cf1));
++ ucv_object_add(val, "center_freq1", ucv_int64_new(center_freq1));
+ ucv_object_add(val, "center_freq2", ucv_int64_new(data->ch_switch.cf2));
++ ucv_object_add(val, "ch_width", ucv_int64_new(ch_width));
++ ucv_object_add(val, "bw320_offset", ucv_int64_new(bw320_offset));
+ }
+
+ ucv_put(wpa_ucode_call(4));
+@@ -212,6 +247,11 @@ uc_wpas_iface_status(uc_vm_t *vm, size_t nargs)
+ struct wpa_supplicant *wpa_s = uc_fn_thisval("wpas.iface");
+ struct wpa_bss *bss;
+ uc_value_t *ret, *val;
++ struct wpa_channel_info ci;
++ u8 op_class, channel;
++ enum oper_chan_width ch_width;
++ int center_freq1, bw320_offset = 1, is_24ghz;
++ enum hostapd_hw_mode hw_mode;
+
+ if (!wpa_s)
+ return NULL;
+@@ -224,23 +264,37 @@ uc_wpas_iface_status(uc_vm_t *vm, size_t nargs)
+ bss = wpa_s->current_bss;
+ if (bss) {
+ int sec_chan = 0;
+- const u8 *ie;
+-
+- ie = wpa_bss_get_ie(bss, WLAN_EID_HT_OPERATION);
+- if (ie && ie[1] >= 2) {
+- const struct ieee80211_ht_operation *ht_oper;
+- int sec;
+-
+- ht_oper = (const void *) (ie + 2);
+- sec = ht_oper->ht_param & HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK;
+- if (sec == HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE)
+- sec_chan = 1;
+- else if (sec == HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW)
+- sec_chan = -1;
++
++ hw_mode = ieee80211_freq_to_chan(bss->freq, &channel);
++ is_24ghz = hw_mode == HOSTAPD_MODE_IEEE80211G ||
++ hw_mode == HOSTAPD_MODE_IEEE80211B;
++
++ wpa_drv_channel_info(wpa_s, &ci);
++ center_freq1 = ci.center_frq1;
++
++ if (bss->freq != center_freq1) {
++ if (is_24ghz)
++ sec_chan = (bss->freq < center_freq1) ? 1 : -1;
++ else
++ sec_chan = (bss->freq / 20) & 1 ? 1 : -1;
++ }
++
++ if (ieee80211_chaninfo_to_channel(ci.frequency, ci.chanwidth,
++ sec_chan, &op_class, &channel))
++ return NULL;
++
++ ch_width = op_class_to_ch_width(op_class);
++ if (ch_width == CONF_OPER_CHWIDTH_320MHZ &&
++ (center_freq1 == 6265) || center_freq1 == 6585 ||
++ center_freq1 == 6905) {
++ /* Bandwidth 320 MHz-2 */
++ bw320_offset = 2;
+ }
+
+ ucv_object_add(ret, "sec_chan_offset", ucv_int64_new(sec_chan));
+ ucv_object_add(ret, "frequency", ucv_int64_new(bss->freq));
++ ucv_object_add(ret, "ch_width", ucv_int64_new(ch_width));
++ ucv_object_add(ret, "bw320_offset", ucv_int64_new(bw320_offset));
+ }
+
+ #ifdef CONFIG_MESH
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0050-mtk-hostapd-Add-support-for-updating-background-chan.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0050-mtk-hostapd-Add-support-for-updating-background-chan.patch
new file mode 100644
index 0000000..c301046
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0050-mtk-hostapd-Add-support-for-updating-background-chan.patch
@@ -0,0 +1,339 @@
+From 20bd2374a81ded4cb99d42e1329ba0f158244029 Mon Sep 17 00:00:00 2001
+From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+Date: Wed, 5 Jul 2023 10:25:01 +0800
+Subject: [PATCH 50/69] mtk: hostapd: Add support for updating background
+ channel by driver
+
+Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+---
+ src/ap/dfs.c | 107 ++++++++++++++++++++++++++++-
+ src/ap/dfs.h | 3 +
+ src/ap/drv_callbacks.c | 22 ++++++
+ src/ap/hostapd.h | 5 ++
+ src/drivers/driver.h | 12 ++++
+ src/drivers/driver_nl80211_event.c | 6 ++
+ src/drivers/nl80211_copy.h | 6 ++
+ 7 files changed, 160 insertions(+), 1 deletion(-)
+
+diff --git a/src/ap/dfs.c b/src/ap/dfs.c
+index 7adaf81ac..e39f3c180 100644
+--- a/src/ap/dfs.c
++++ b/src/ap/dfs.c
+@@ -816,11 +816,14 @@ static int dfs_are_channels_overlapped(struct hostapd_iface *iface, int freq,
+
+ static void dfs_check_background_overlapped(struct hostapd_iface *iface)
+ {
+- int width = hostapd_get_oper_chwidth(iface->conf);
++ int width = iface->radar_background.new_chwidth;
+
+ if (!dfs_use_radar_background(iface))
+ return;
+
++ if (!width)
++ width = hostapd_get_oper_chwidth(iface->conf);
++
+ if (dfs_are_channels_overlapped(iface, iface->radar_background.freq,
+ width, iface->radar_background.centr_freq_seg0_idx,
+ iface->radar_background.centr_freq_seg1_idx))
+@@ -985,6 +988,15 @@ int hostapd_handle_dfs(struct hostapd_iface *iface)
+ iface->radar_background.temp_ch = 1;
+ return 1;
+ } else if (dfs_use_radar_background(iface)) {
++ /*
++ * AP is going to perform CAC, so reset temp_ch to 0,
++ * when dedicated rx has already started CAC.
++ */
++ if (iface->radar_background.cac_started) {
++ iface->radar_background.temp_ch = 0;
++ return 0;
++ }
++
+ if (iface->dfs_domain == HOSTAPD_DFS_REGION_ETSI)
+ channel_type = DFS_ANY_CHANNEL;
+
+@@ -1125,6 +1137,8 @@ static int hostapd_dfs_request_channel_switch(struct hostapd_iface *iface,
+ * ch_switch_notify event is received */
+ wpa_printf(MSG_DEBUG, "DFS waiting channel switch event");
+
++ hostapd_set_oper_chwidth(iface->conf, new_vht_oper_chwidth);
++
+ return 0;
+ }
+
+@@ -1176,6 +1190,9 @@ static void hostapd_dfs_update_background_chain(struct hostapd_iface *iface)
+ iface->radar_background.secondary_channel = sec;
+ iface->radar_background.centr_freq_seg0_idx = oper_centr_freq_seg0_idx;
+ iface->radar_background.centr_freq_seg1_idx = oper_centr_freq_seg1_idx;
++ /* if main channel do not require dfs, then set temp_ch = 1 */
++ if (!hostapd_is_dfs_required(iface))
++ iface->radar_background.temp_ch = 1;
+
+ wpa_printf(MSG_DEBUG,
+ "%s: setting background chain to chan %d (%d MHz)",
+@@ -1198,6 +1215,10 @@ hostapd_dfs_start_channel_switch_background(struct hostapd_iface *iface)
+ u8 current_vht_oper_chwidth = hostapd_get_oper_chwidth(iface->conf);
+ int ret;
+
++ if (iface->radar_background.new_chwidth) {
++ hostapd_set_oper_chwidth(iface->conf, iface->radar_background.new_chwidth);
++ iface->radar_background.new_chwidth = 0;
++ }
+ ret = hostapd_dfs_request_channel_switch(iface, iface->radar_background.channel,
+ iface->radar_background.freq,
+ iface->radar_background.secondary_channel,
+@@ -1220,6 +1241,52 @@ hostapd_dfs_start_channel_switch_background(struct hostapd_iface *iface)
+ }
+
+
++static void
++hostapd_dfs_background_expand(struct hostapd_iface *iface, int chan_width)
++{
++ struct hostapd_hw_modes *mode = iface->current_mode;
++ struct hostapd_channel_data *chan;
++ int i, channel, width = channel_width_to_int(chan_width);
++
++ if (iface->conf->channel - iface->radar_background.channel == width / 5)
++ channel = iface->radar_background.channel;
++ else if (iface->radar_background.channel - iface->conf->channel == width / 5)
++ channel = iface->conf->channel;
++ else
++ return;
++
++ for (i = 0; i < mode->num_channels; i++) {
++ chan = &mode->channels[i];
++ if (chan->chan == channel)
++ break;
++ }
++
++ if (i == mode->num_channels || !dfs_is_chan_allowed(chan, width / 10))
++ return;
++
++ switch (chan_width) {
++ case CHAN_WIDTH_20_NOHT:
++ case CHAN_WIDTH_20:
++ iface->radar_background.new_chwidth = CONF_OPER_CHWIDTH_USE_HT;
++ break;
++ case CHAN_WIDTH_40:
++ iface->radar_background.new_chwidth = CONF_OPER_CHWIDTH_80MHZ;
++ break;
++ case CHAN_WIDTH_80:
++ iface->radar_background.new_chwidth = CONF_OPER_CHWIDTH_160MHZ;
++ break;
++ default:
++ return;
++ }
++
++ iface->radar_background.freq = channel * 5 + 5000;
++ iface->radar_background.channel = channel;
++ iface->radar_background.centr_freq_seg0_idx = channel + width / 5 - 2;
++ iface->radar_background.secondary_channel = 1;
++ iface->radar_background.expand_ch = 0;
++}
++
++
+ int hostapd_dfs_complete_cac(struct hostapd_iface *iface, int success, int freq,
+ int ht_enabled, int chan_offset, int chan_width,
+ int cf1, int cf2)
+@@ -1253,6 +1320,10 @@ int hostapd_dfs_complete_cac(struct hostapd_iface *iface, int success, int freq,
+ return 0;
+
+ iface->radar_background.temp_ch = 0;
++
++ if (iface->radar_background.expand_ch)
++ hostapd_dfs_background_expand(iface, chan_width);
++
+ return hostapd_dfs_start_channel_switch_background(iface);
+ }
+
+@@ -1283,6 +1354,8 @@ int hostapd_dfs_complete_cac(struct hostapd_iface *iface, int success, int freq,
+ }
+ } else if (hostapd_dfs_is_background_event(iface, freq)) {
+ iface->radar_background.cac_started = 0;
++ iface->radar_background.temp_ch = 0;
++ iface->radar_background.expand_ch = 0;
+ hostapd_dfs_update_background_chain(iface);
+ }
+
+@@ -1415,6 +1488,9 @@ hostapd_dfs_background_start_channel_switch(struct hostapd_iface *iface,
+ iface->conf->dfs_detect_mode == DFS_DETECT_MODE_ALL_ENABLE)
+ return 0;
+
++ iface->radar_background.temp_ch = 0;
++ iface->radar_background.expand_ch = 0;
++
+ /* Check if CSA in progress */
+ if (hostapd_csa_in_progress(iface))
+ return 0;
+@@ -1649,6 +1725,35 @@ int hostapd_is_dfs_required(struct hostapd_iface *iface)
+ }
+
+
++int hostapd_dfs_background_chan_update(struct hostapd_iface *iface, int freq,
++ int ht_enabled, int chan_offset, int chan_width,
++ int cf1, int cf2, bool expand)
++{
++ switch (chan_width) {
++ case CHAN_WIDTH_80:
++ iface->radar_background.new_chwidth = CONF_OPER_CHWIDTH_80MHZ;
++ break;
++ case CHAN_WIDTH_160:
++ iface->radar_background.new_chwidth = CONF_OPER_CHWIDTH_160MHZ;
++ break;
++ default:
++ iface->radar_background.new_chwidth = CONF_OPER_CHWIDTH_USE_HT;
++ break;
++ };
++
++ iface->radar_background.freq = freq;
++ iface->radar_background.channel = (freq - 5000) / 5;
++ iface->radar_background.centr_freq_seg0_idx = (cf1 - 5000) / 5;
++ iface->radar_background.centr_freq_seg1_idx = cf2 ? (cf2 - 5000) / 5 : 0;
++ if (expand) {
++ iface->radar_background.temp_ch = 1;
++ iface->radar_background.expand_ch = 1;
++ }
++
++ return 0;
++}
++
++
+ int hostapd_dfs_start_cac(struct hostapd_iface *iface, int freq,
+ int ht_enabled, int chan_offset, int chan_width,
+ int cf1, int cf2)
+diff --git a/src/ap/dfs.h b/src/ap/dfs.h
+index 25ba29ca1..a1a2be5ec 100644
+--- a/src/ap/dfs.h
++++ b/src/ap/dfs.h
+@@ -30,6 +30,9 @@ int hostapd_dfs_radar_detected(struct hostapd_iface *iface, int freq,
+ int hostapd_dfs_nop_finished(struct hostapd_iface *iface, int freq,
+ int ht_enabled,
+ int chan_offset, int chan_width, int cf1, int cf2);
++int hostapd_dfs_background_chan_update(struct hostapd_iface *iface, int freq,
++ int ht_enabled, int chan_offset, int chan_width,
++ int cf1, int cf2, bool expand);
+ int hostapd_dfs_sta_update_state(struct hostapd_iface *iface, int freq,
+ int ht_enabled, int chan_offset, int chan_width,
+ int cf1, int cf2, u32 state);
+diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
+index 773a70878..11c8c1899 100644
+--- a/src/ap/drv_callbacks.c
++++ b/src/ap/drv_callbacks.c
+@@ -2243,6 +2243,18 @@ static void hostapd_event_dfs_cac_started(struct hostapd_data *hapd,
+ radar->cf1, radar->cf2);
+ }
+
++
++static void hostapd_event_dfs_background_chan_update(struct hostapd_data *hapd,
++ struct dfs_event *radar, bool expand)
++{
++ wpa_printf(MSG_DEBUG, "DFS background channel %s to %d MHz",
++ expand ? "expand" : "update", radar->freq);
++ hostapd_dfs_background_chan_update(hapd->iface, radar->freq, radar->ht_enabled,
++ radar->chan_offset, radar->chan_width,
++ radar->cf1, radar->cf2, expand);
++}
++
++
+ static void hostapd_event_dfs_sta_cac_skipped(struct hostapd_data *hapd,
+ struct dfs_event *radar)
+ {
+@@ -2609,6 +2621,16 @@ void hostapd_wpa_event(void *ctx, enum wpa_event_type event,
+ hapd = switch_link_hapd(hapd, data->dfs_event.link_id);
+ hostapd_event_dfs_nop_finished(hapd, &data->dfs_event);
+ break;
++ case EVENT_DFS_BACKGROUND_CHAN_UPDATE:
++ if (!data)
++ break;
++ hostapd_event_dfs_background_chan_update(hapd, &data->dfs_event, false);
++ break;
++ case EVENT_DFS_BACKGROUND_CHAN_EXPAND:
++ if (!data)
++ break;
++ hostapd_event_dfs_background_chan_update(hapd, &data->dfs_event, true);
++ break;
+ case EVENT_DFS_STA_CAC_SKIPPED:
+ if (!data)
+ break;
+diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
+index a03023dff..f38ed5491 100644
+--- a/src/ap/hostapd.h
++++ b/src/ap/hostapd.h
+@@ -615,6 +615,11 @@ struct hostapd_iface {
+ unsigned int temp_ch:1;
+ /* CAC started on radar offchain */
+ unsigned int cac_started:1;
++ /* Main chain should expand its width according to the
++ * current offchain channel after CAC detection on radar offchain.
++ */
++ unsigned int expand_ch:1;
++ int new_chwidth;
+ } radar_background;
+
+ u16 hw_flags;
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index e91b741a8..463df85b3 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -5923,6 +5923,18 @@ enum wpa_event_type {
+ * The channel in the notification is now marked as usable.
+ */
+ EVENT_DFS_STA_CAC_EXPIRED,
++
++ /**
++ * EVENT_DFS_BACKGROUND_CHAN_UPDATE - Notification that background
++ * channel has been updated.
++ */
++ EVENT_DFS_BACKGROUND_CHAN_UPDATE,
++
++ /**
++ * EVENT_DFS_BACKGROUND_CHAN_EXPAND - Notification that background
++ * channel has been updated and operating channel should expand its width.
++ */
++ EVENT_DFS_BACKGROUND_CHAN_EXPAND,
+ };
+
+
+diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c
+index 13977ec19..78c9e58f9 100644
+--- a/src/drivers/driver_nl80211_event.c
++++ b/src/drivers/driver_nl80211_event.c
+@@ -2518,6 +2518,12 @@ static void nl80211_radar_event(struct wpa_driver_nl80211_data *drv,
+ case NL80211_RADAR_CAC_STARTED:
+ wpa_supplicant_event(drv->ctx, EVENT_DFS_CAC_STARTED, &data);
+ break;
++ case NL80211_RADAR_BACKGROUND_CHAN_UPDATE:
++ wpa_supplicant_event(drv->ctx, EVENT_DFS_BACKGROUND_CHAN_UPDATE, &data);
++ break;
++ case NL80211_RADAR_BACKGROUND_CHAN_EXPAND:
++ wpa_supplicant_event(drv->ctx, EVENT_DFS_BACKGROUND_CHAN_EXPAND, &data);
++ break;
+ case NL80211_RADAR_STA_CAC_SKIPPED:
+ wpa_supplicant_event(drv->ctx, EVENT_DFS_STA_CAC_SKIPPED, &data);
+ break;
+diff --git a/src/drivers/nl80211_copy.h b/src/drivers/nl80211_copy.h
+index 8917d565b..c56954306 100644
+--- a/src/drivers/nl80211_copy.h
++++ b/src/drivers/nl80211_copy.h
+@@ -6699,6 +6699,10 @@ enum nl80211_smps_mode {
+ * applicable for ETSI dfs domain where pre-CAC is valid for ever.
+ * @NL80211_RADAR_CAC_STARTED: Channel Availability Check has been started,
+ * should be generated by HW if NL80211_EXT_FEATURE_DFS_OFFLOAD is enabled.
++ * @NL80211_RADAR_BACKGROUND_CHAN_UPDATE: background channel is updated by the
++ * driver.
++ * @NL80211_RADAR_BACKGROUND_CHAN_EXPAND: background channel is updated by the
++ * driver and required to expand main operating channel.
+ * @NL80211_RADAR_STA_CAC_SKIPPED: STA set the DFS state to available
+ * when receiving CSA/assoc resp
+ * @NL80211_RADAR_STA_CAC_EXPIRED: STA set the DFS state to usable
+@@ -6711,6 +6715,8 @@ enum nl80211_radar_event {
+ NL80211_RADAR_NOP_FINISHED,
+ NL80211_RADAR_PRE_CAC_EXPIRED,
+ NL80211_RADAR_CAC_STARTED,
++ NL80211_RADAR_BACKGROUND_CHAN_UPDATE,
++ NL80211_RADAR_BACKGROUND_CHAN_EXPAND,
+ NL80211_RADAR_STA_CAC_SKIPPED,
+ NL80211_RADAR_STA_CAC_EXPIRED,
+ };
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0051-mtk-hostapd-add-zwdfs-mode-ctrl-for-eagle-efem-hwits.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0051-mtk-hostapd-add-zwdfs-mode-ctrl-for-eagle-efem-hwits.patch
new file mode 100644
index 0000000..f01df26
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0051-mtk-hostapd-add-zwdfs-mode-ctrl-for-eagle-efem-hwits.patch
@@ -0,0 +1,290 @@
+From 034d7c0afa2492ee7579736efb48141aef6744bf Mon Sep 17 00:00:00 2001
+From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+Date: Wed, 2 Aug 2023 19:00:34 +0800
+Subject: [PATCH 51/69] mtk: hostapd: add zwdfs mode ctrl for eagle efem hwits
+
+Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+---
+ hostapd/config_file.c | 2 ++
+ hostapd/ctrl_iface.c | 30 +++++++++++++++++++++++++++
+ src/ap/ap_config.h | 6 ++++++
+ src/ap/ap_drv_ops.c | 14 +++++++++++++
+ src/ap/ap_drv_ops.h | 1 +
+ src/ap/dfs.c | 6 ++++++
+ src/common/mtk_vendor.h | 12 +++++++++++
+ src/drivers/driver.h | 7 +++++++
+ src/drivers/driver_nl80211.c | 34 +++++++++++++++++++++++++++++++
+ src/drivers/driver_nl80211.h | 1 +
+ src/drivers/driver_nl80211_capa.c | 3 +++
+ 11 files changed, 116 insertions(+)
+
+diff --git a/hostapd/config_file.c b/hostapd/config_file.c
+index dadc8f108..9467a1128 100644
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -3576,6 +3576,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ conf->acs_exclude_6ghz_non_psc = atoi(pos);
+ } else if (os_strcmp(buf, "enable_background_radar") == 0) {
+ conf->enable_background_radar = atoi(pos);
++ } else if (os_strcmp(buf, "background_radar_mode") == 0) {
++ conf->background_radar_mode = atoi(pos);
+ } else if (os_strcmp(buf, "min_tx_power") == 0) {
+ int val = atoi(pos);
+
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index 056a35bc3..8646bf148 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -4803,6 +4803,33 @@ hostapd_ctrl_iface_dump_amnt(struct hostapd_data *hapd, char *cmd,
+ return pos - buf;
+ }
+
++static int
++hostapd_ctrl_iface_set_background_radar_mode(struct hostapd_data *hapd, char *cmd,
++ char *buf, size_t buflen)
++{
++ struct hostapd_iface *iface = hapd->iface;
++ char *pos, *param;
++
++ param = os_strchr(cmd, ' ');
++ if (!param)
++ return -1;
++ *param++ = '\0';
++
++ pos = os_strstr(param, "mode=");
++ if (!pos)
++ return -1;
++
++ if (os_strncmp(pos + 5, "cert", 4) == 0)
++ iface->conf->background_radar_mode = BACKGROUND_RADAR_CERT_MODE;
++ else if (os_strncmp(pos + 5, "normal", 6) == 0)
++ iface->conf->background_radar_mode = BACKGROUND_RADAR_NORMAL_MODE;
++
++ if (hostapd_drv_background_radar_mode(hapd) < 0)
++ return -1;
++
++ return os_snprintf(buf, buflen, "OK\n");
++}
++
+ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ char *buf, char *reply,
+ int reply_size,
+@@ -5444,6 +5471,9 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ if (pos)
+ *pos = ' ';
+ reply_len = hostapd_ctrl_iface_set_mu(hapd, buf + 23, reply, reply_size);
++ } else if (os_strncmp(buf, "SET_BACKGROUND_RADAR_MODE", 25) == 0) {
++ reply_len = hostapd_ctrl_iface_set_background_radar_mode(hapd, buf + 25,
++ reply, reply_size);
+ } else {
+ os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
+ reply_len = 16;
+diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
+index 3827a8fc8..0b07be516 100644
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -1051,6 +1051,7 @@ struct hostapd_config {
+ bool hw_mode_set;
+ int acs_exclude_6ghz_non_psc;
+ int enable_background_radar;
++ int background_radar_mode;
+ enum {
+ LONG_PREAMBLE = 0,
+ SHORT_PREAMBLE = 1
+@@ -1306,6 +1307,11 @@ enum three_wire_mode {
+ NUM_THREE_WIRE_MODE - 1
+ };
+
++enum background_radar_mode {
++ BACKGROUND_RADAR_NORMAL_MODE,
++ BACKGROUND_RADAR_CERT_MODE,
++};
++
+ enum dfs_mode {
+ DFS_DETECT_MODE_DISABLE,
+ DFS_DETECT_MODE_AP_ENABLE,
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index ab514ddf1..47309e766 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -1336,3 +1336,17 @@ int hostapd_drv_amnt_dump(struct hostapd_data *hapd, u8 amnt_idx, u8 *amnt_dump_
+ return 0;
+ return hapd->driver->amnt_dump(hapd->drv_priv, amnt_idx, amnt_dump_buf);
+ }
++
++int hostapd_drv_background_radar_mode(struct hostapd_data *hapd)
++{
++ if (!hapd->driver || !hapd->driver->background_radar_mode ||
++ !(hapd->iface->drv_flags2 & WPA_DRIVER_FLAGS2_RADAR_BACKGROUND) ||
++ !hapd->iface->conf->enable_background_radar)
++ return 0;
++ if (hapd->iconf->background_radar_mode > BACKGROUND_RADAR_CERT_MODE) {
++ wpa_printf(MSG_INFO, "Invalid value for background radar mode\n");
++ return 0;
++ }
++ return hapd->driver->background_radar_mode(hapd->drv_priv,
++ hapd->iconf->background_radar_mode);
++}
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index 706654b6b..19b11288b 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -163,6 +163,7 @@ int hostapd_drv_ap_trig_type(struct hostapd_data *hapd, u8 enable, u8 type);
+
+ int hostapd_drv_amnt_set(struct hostapd_data *hapd, u8 amnt_idx, u8 *amnt_sta_mac);
+ int hostapd_drv_amnt_dump(struct hostapd_data *hapd, u8 amnt_idx, u8 *amnt_dump_buf);
++int hostapd_drv_background_radar_mode(struct hostapd_data *hapd);
+
+ #include "drivers/driver.h"
+
+diff --git a/src/ap/dfs.c b/src/ap/dfs.c
+index e39f3c180..b12290556 100644
+--- a/src/ap/dfs.c
++++ b/src/ap/dfs.c
+@@ -985,6 +985,9 @@ int hostapd_handle_dfs(struct hostapd_iface *iface)
+ if (res < 0)
+ return res;
+
++ if (hostapd_drv_background_radar_mode(iface->bss[0]) < 0)
++ return -1;
++
+ iface->radar_background.temp_ch = 1;
+ return 1;
+ } else if (dfs_use_radar_background(iface)) {
+@@ -1025,6 +1028,9 @@ int hostapd_handle_dfs(struct hostapd_iface *iface)
+ iface->radar_background.secondary_channel = sec;
+ iface->radar_background.centr_freq_seg0_idx = cf1;
+ iface->radar_background.centr_freq_seg1_idx = cf2;
++
++ if (hostapd_drv_background_radar_mode(iface->bss[0]) < 0)
++ return -1;
+ }
+
+ return 0;
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+index e140de60b..5bc1e0444 100644
+--- a/src/common/mtk_vendor.h
++++ b/src/common/mtk_vendor.h
+@@ -16,6 +16,7 @@ enum mtk_nl80211_vendor_subcmds {
+ MTK_NL80211_VENDOR_SUBCMD_3WIRE_CTRL = 0xc8,
+ MTK_NL80211_VENDOR_SUBCMD_IBF_CTRL = 0xc9,
+ MTK_NL80211_VENDOR_SUBCMD_BSS_COLOR_CTRL = 0xca,
++ MTK_NL80211_VENDOR_SUBCMD_BACKGROUND_RADAR_CTRL = 0xcb,
+ };
+
+ enum mtk_vendor_attr_edcca_ctrl {
+@@ -244,6 +245,17 @@ enum mtk_vendor_attr_bss_color_ctrl {
+ NUM_MTK_VENDOR_ATTRS_BSS_COLOR_CTRL - 1
+ };
+
++enum mtk_vendor_attr_background_radar_ctrl {
++ MTK_VENDOR_ATTR_BACKGROUND_RADAR_CTRL_UNSPEC,
++
++ MTK_VENDOR_ATTR_BACKGROUND_RADAR_CTRL_MODE,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_BACKGROUND_RADAR_CTRL,
++ MTK_VENDOR_ATTR_BACKGROUND_RADAR_CTRL_MAX =
++ NUM_MTK_VENDOR_ATTRS_BACKGROUND_RADAR_CTRL - 1
++};
++
+ #define CSI_MAX_COUNT 256
+ #define ETH_ALEN 6
+
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index 463df85b3..014659432 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -5282,6 +5282,13 @@ struct wpa_driver_ops {
+ * @amnt_dump_buf: Buffer to print
+ */
+ int (*amnt_dump)(void *priv, u8 amnt_idx, u8 *amnt_dump_buf);
++
++ /**
++ * background_radar_mode - set background radar mode
++ * @priv: Private driver interface data
++ * @background_radar_mode: background radar mode
++ */
++ int (*background_radar_mode)(void *priv, u8 background_radar_mode);
+ };
+
+ /**
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index f52e1ada6..e185117a1 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -14932,6 +14932,39 @@ fail:
+ return -ENOBUFS;
+ }
+
++static int nl80211_background_radar_mode(void *priv, const u8 background_radar_mode)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ /* Prepare nl80211 cmd */
++ struct nl_msg *msg;
++ struct nlattr *data;
++ int ret;
++
++ if (!drv->mtk_background_radar_vendor_cmd_avail) {
++ wpa_printf(MSG_INFO,
++ "nl80211: Driver does not support setting background radar mode");
++ return 0;
++ }
++
++ if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
++ MTK_NL80211_VENDOR_SUBCMD_BACKGROUND_RADAR_CTRL) ||
++ !(data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_BACKGROUND_RADAR_CTRL_MODE, background_radar_mode)) {
++ nlmsg_free(msg);
++ return -ENOBUFS;
++ }
++ nla_nest_end(msg, data);
++ ret = send_and_recv_cmd(drv, msg);
++ if (ret) {
++ wpa_printf(MSG_ERROR, "Failed to set background radar mode. ret=%d (%s) ",
++ ret, strerror(-ret));
++ }
++ return ret;
++}
++
+ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .name = "nl80211",
+ .desc = "Linux nl80211/cfg80211",
+@@ -15104,4 +15137,5 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .ap_trigtype = nl80211_ap_trigtype,
+ .amnt_set = nl80211_amnt_set,
+ .amnt_dump = nl80211_amnt_dump,
++ .background_radar_mode = nl80211_background_radar_mode,
+ };
+diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
+index 877115660..d795c807f 100644
+--- a/src/drivers/driver_nl80211.h
++++ b/src/drivers/driver_nl80211.h
+@@ -207,6 +207,7 @@ struct wpa_driver_nl80211_data {
+ unsigned int mtk_bss_color_vendor_cmd_avail:1;
+ unsigned int mtk_rfeatures_vendor_cmd_avail:1;
+ unsigned int mtk_amnt_vendor_cmd_avail:1;
++ unsigned int mtk_background_radar_vendor_cmd_avail:1;
+
+ u32 ignore_next_local_disconnect;
+ u32 ignore_next_local_deauth;
+diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
+index 2c3530b36..b85afe740 100644
+--- a/src/drivers/driver_nl80211_capa.c
++++ b/src/drivers/driver_nl80211_capa.c
+@@ -1160,6 +1160,9 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
+ case MTK_NL80211_VENDOR_SUBCMD_RFEATURE_CTRL:
+ drv->mtk_rfeatures_vendor_cmd_avail = 1;
+ break;
++ case MTK_NL80211_VENDOR_SUBCMD_BACKGROUND_RADAR_CTRL:
++ drv->mtk_background_radar_vendor_cmd_avail = 1;
++ break;
+ }
+ }
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0052-mtk-hostapd-add-support-enable-disable-preamble-punc.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0052-mtk-hostapd-add-support-enable-disable-preamble-punc.patch
new file mode 100644
index 0000000..8012c89
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0052-mtk-hostapd-add-support-enable-disable-preamble-punc.patch
@@ -0,0 +1,375 @@
+From 3c0acf1519b30e045d84d8243aa7af29d9901528 Mon Sep 17 00:00:00 2001
+From: Howard Hsu <howard-yh.hsu@mediatek.com>
+Date: Thu, 21 Sep 2023 10:29:46 +0800
+Subject: [PATCH 52/69] mtk: hostapd: add support enable/disable preamble
+ puncture from mtk vendor command
+
+This commit supports two ways to enable/disable preamble puncture
+feature.
+
+1. Add new hostapd configuration "pp_mode". The possible value could be
+1 to 3. When the value is 0, it means that the firmware will turn off
+the pp algorithm. When the value is 1, it means that the firmware will
+enable the pp algorithm, allowing the algorithm to determine whether pp
+could be applied on each txcmd. When the value is 2, it means that pp
+feature is manually configured by the user. Please noted that for
+current implementation, the default configuration is 0.
+
+2. $ hostapd_cli -i <intf_name> raw set_pp mode val
+The argument "val" could be 0 for PP feature disabled or 1 to configure
+PP feature as auto mode.
+
+This commit also let user check whether pp feature is enabled by
+hostapd_cli command. The usage shows as below:
+$ hostapd_cli -i <intf_name> raw get_pp mode
+
+Signed-off-by: Howard Hsu <howard-yh.hsu@mediatek.com>
+---
+ hostapd/config_file.c | 12 +++++++
+ hostapd/ctrl_iface.c | 59 +++++++++++++++++++++++++++++++
+ src/ap/ap_config.c | 1 +
+ src/ap/ap_config.h | 7 ++++
+ src/ap/ap_drv_ops.c | 9 +++++
+ src/ap/ap_drv_ops.h | 1 +
+ src/ap/hostapd.c | 2 ++
+ src/common/mtk_vendor.h | 12 +++++++
+ src/drivers/driver.h | 6 ++++
+ src/drivers/driver_nl80211.c | 49 +++++++++++++++++++++++++
+ src/drivers/driver_nl80211.h | 1 +
+ src/drivers/driver_nl80211_capa.c | 3 ++
+ 12 files changed, 162 insertions(+)
+
+diff --git a/hostapd/config_file.c b/hostapd/config_file.c
+index 9467a1128..050ef290e 100644
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -5333,6 +5333,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ } else if (os_strcmp(buf, "punct_bitmap") == 0) {
+ if (get_u16(pos, line, &conf->punct_bitmap))
+ return 1;
++ conf->punct_bitmap = atoi(pos);
++ conf->pp_mode = PP_MANUAL_MODE;
+ } else if (os_strcmp(buf, "punct_acs_threshold") == 0) {
+ int val = atoi(pos);
+
+@@ -5415,6 +5417,16 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ return 1;
+ }
+ conf->amsdu = val;
++ } else if (os_strcmp(buf, "pp_mode") == 0) {
++ int val = atoi(pos);
++
++ if ((val != PP_MANUAL_MODE && conf->punct_bitmap) ||
++ val < PP_DISABLE || val > PP_MANUAL_MODE) {
++ wpa_printf(MSG_ERROR, "Line %d: invalid pp_mode value",
++ line);
++ return 1;
++ }
++ conf->pp_mode = (u8) val;
+ } else {
+ wpa_printf(MSG_ERROR,
+ "Line %d: unknown configuration item '%s'",
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index 8646bf148..91a9feaa5 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -4830,6 +4830,59 @@ hostapd_ctrl_iface_set_background_radar_mode(struct hostapd_data *hapd, char *cm
+ return os_snprintf(buf, buflen, "OK\n");
+ }
+
++static int
++hostapd_ctrl_iface_set_pp(struct hostapd_data *hapd, char *cmd, char *buf,
++ size_t buflen)
++{
++ char *pos, *config, *value;
++
++ config = cmd;
++ pos = os_strchr(config, ' ');
++ if (pos == NULL)
++ return -1;
++ *pos++ = '\0';
++
++ if (pos == NULL)
++ return -1;
++ value = pos;
++
++ if (os_strcmp(config, "mode") == 0) {
++ int val = atoi(value);
++
++ if (val < PP_DISABLE || val > PP_AUTO_MODE) {
++ wpa_printf(MSG_ERROR, "Invalid value for set_pp");
++ return -1;
++ }
++ hapd->iconf->pp_mode = (u8) val;
++ if (hostapd_drv_pp_mode_set(hapd) != 0)
++ return -1;
++ } else {
++ wpa_printf(MSG_ERROR,
++ "Unsupported parameter %s for set_pp", config);
++ return -1;
++ }
++ return os_snprintf(buf, buflen, "OK\n");
++}
++
++static int
++hostapd_ctrl_iface_get_pp(struct hostapd_data *hapd, char *cmd, char *buf,
++ size_t buflen)
++{
++ char *pos, *end;
++
++ pos = buf;
++ end = buf + buflen;
++
++ if (os_strcmp(cmd, "mode") == 0) {
++ return os_snprintf(pos, end - pos, "pp_mode: %d\n",
++ hapd->iconf->pp_mode);
++ } else {
++ wpa_printf(MSG_ERROR,
++ "Unsupported parameter %s for get_pp", cmd);
++ return -1;
++ }
++}
++
+ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ char *buf, char *reply,
+ int reply_size,
+@@ -5463,6 +5516,12 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ } else if (os_strncmp(buf, "DUMP_AMNT", 9) == 0) {
+ reply_len = hostapd_ctrl_iface_dump_amnt(hapd, buf+10,
+ reply, reply_size);
++ } else if (os_strncmp(buf, "set_pp", 6) == 0) {
++ reply_len = hostapd_ctrl_iface_set_pp(hapd, buf + 7, reply,
++ reply_size);
++ } else if (os_strncmp(buf, "get_pp", 6) == 0) {
++ reply_len = hostapd_ctrl_iface_get_pp(hapd, buf + 7, reply,
++ reply_size);
+ } else if (os_strncmp(buf, "set_muru_manual_config=", 23) == 0) {
+ // Replace first ':' with a single space ' '
+ char *pos = buf + 23;
+diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
+index ba1b2a7a3..056c38f73 100644
+--- a/src/ap/ap_config.c
++++ b/src/ap/ap_config.c
+@@ -310,6 +310,7 @@ struct hostapd_config * hostapd_config_defaults(void)
+ conf->three_wire_enable = THREE_WIRE_MODE_DISABLE;
+ conf->ibf_enable = IBF_DEFAULT_ENABLE;
+ conf->amsdu = 1;
++ conf->pp_mode = PP_DISABLE;
+
+ hostapd_set_and_check_bw320_offset(conf, 0);
+
+diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
+index 0b07be516..40edcdaa7 100644
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -1293,6 +1293,7 @@ struct hostapd_config {
+ u8 dfs_detect_mode;
+ u8 amsdu;
+ void *muru_config;
++ u8 pp_mode;
+ };
+
+ enum three_wire_mode {
+@@ -1345,6 +1346,12 @@ enum mtk_vendor_attr_edcca_ctrl_mode {
+ EDCCA_CTRL_NUM,
+ };
+
++enum pp_mode {
++ PP_DISABLE = 0,
++ PP_AUTO_MODE,
++ PP_MANUAL_MODE,
++};
++
+ #define EDCCA_DEFAULT_COMPENSATION -6
+ #define EDCCA_MIN_COMPENSATION -126
+ #define EDCCA_MAX_COMPENSATION 126
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index 47309e766..534473388 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -1350,3 +1350,12 @@ int hostapd_drv_background_radar_mode(struct hostapd_data *hapd)
+ return hapd->driver->background_radar_mode(hapd->drv_priv,
+ hapd->iconf->background_radar_mode);
+ }
++
++int hostapd_drv_pp_mode_set(struct hostapd_data *hapd)
++{
++ if (!hapd->driver || !hapd->driver->pp_mode_set ||
++ hapd->iconf->pp_mode > PP_AUTO_MODE)
++ return 0;
++ return hapd->driver->pp_mode_set(hapd->drv_priv,
++ hapd->iconf->pp_mode);
++}
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index 19b11288b..c813b2f0d 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -164,6 +164,7 @@ int hostapd_drv_ap_trig_type(struct hostapd_data *hapd, u8 enable, u8 type);
+ int hostapd_drv_amnt_set(struct hostapd_data *hapd, u8 amnt_idx, u8 *amnt_sta_mac);
+ int hostapd_drv_amnt_dump(struct hostapd_data *hapd, u8 amnt_idx, u8 *amnt_dump_buf);
+ int hostapd_drv_background_radar_mode(struct hostapd_data *hapd);
++int hostapd_drv_pp_mode_set(struct hostapd_data *hapd);
+
+ #include "drivers/driver.h"
+
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index f6366d58a..43b479e9b 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -2628,6 +2628,8 @@ dfs_offload:
+ goto fail;
+ if (hostapd_drv_amsdu_ctrl(hapd) < 0)
+ goto fail;
++ if (hostapd_drv_pp_mode_set(hapd) < 0)
++ goto fail;
+
+ wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
+ iface->bss[0]->conf->iface);
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+index 5bc1e0444..6275c141d 100644
+--- a/src/common/mtk_vendor.h
++++ b/src/common/mtk_vendor.h
+@@ -17,6 +17,7 @@ enum mtk_nl80211_vendor_subcmds {
+ MTK_NL80211_VENDOR_SUBCMD_IBF_CTRL = 0xc9,
+ MTK_NL80211_VENDOR_SUBCMD_BSS_COLOR_CTRL = 0xca,
+ MTK_NL80211_VENDOR_SUBCMD_BACKGROUND_RADAR_CTRL = 0xcb,
++ MTK_NL80211_VENDOR_SUBCMD_PP_CTRL = 0xcc,
+ };
+
+ enum mtk_vendor_attr_edcca_ctrl {
+@@ -256,6 +257,17 @@ enum mtk_vendor_attr_background_radar_ctrl {
+ NUM_MTK_VENDOR_ATTRS_BACKGROUND_RADAR_CTRL - 1
+ };
+
++enum mtk_vendor_attr_pp_ctrl {
++ MTK_VENDOR_ATTR_PP_CTRL_UNSPEC,
++
++ MTK_VENDOR_ATTR_PP_MODE,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_PP_CTRL,
++ MTK_VENDOR_ATTR_PP_CTRL_MAX =
++ NUM_MTK_VENDOR_ATTRS_PP_CTRL - 1
++};
++
+ #define CSI_MAX_COUNT 256
+ #define ETH_ALEN 6
+
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index 014659432..75e87df9a 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -5289,6 +5289,12 @@ struct wpa_driver_ops {
+ * @background_radar_mode: background radar mode
+ */
+ int (*background_radar_mode)(void *priv, u8 background_radar_mode);
++ /**
++ * pp_mode_set - Set preamble puncture operation mode
++ * @priv: Private driver interface data
++ * @pp_mode: Value is defined in enum pp_mode
++ */
++ int (*pp_mode_set)(void *priv, const u8 pp_mode);
+ };
+
+ /**
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index e185117a1..ac22c22a7 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -156,6 +156,11 @@ amnt_dump_policy[NUM_MTK_VENDOR_ATTRS_AMNT_DUMP] = {
+ [MTK_VENDOR_ATTR_AMNT_DUMP_RESULT] = { .type = NLA_NESTED },
+ };
+
++static struct nla_policy
++pp_ctrl_policy[NUM_MTK_VENDOR_ATTRS_PP_CTRL] = {
++ [MTK_VENDOR_ATTR_PP_MODE] = { .type = NLA_U8 },
++};
++
+ static struct nl_sock * nl_create_handle(struct nl_cb *cb, const char *dbg)
+ {
+ struct nl_sock *handle;
+@@ -14965,6 +14970,49 @@ static int nl80211_background_radar_mode(void *priv, const u8 background_radar_m
+ return ret;
+ }
+
++static int nl80211_pp_mode_set(void *priv, const u8 pp_mode)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *data;
++ int ret;
++
++ if (!drv->mtk_pp_vendor_cmd_avail) {
++ wpa_printf(MSG_DEBUG,
++ "nl80211: Driver does not support setting preamble puncture");
++ return 0;
++ }
++
++ msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR);
++ if (!msg)
++ goto fail;
++
++ if (nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
++ MTK_NL80211_VENDOR_SUBCMD_PP_CTRL))
++ goto fail;
++
++ data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA);
++ if (!data)
++ goto fail;
++
++ nla_put_u8(msg, MTK_VENDOR_ATTR_PP_MODE, pp_mode);
++
++ nla_nest_end(msg, data);
++ ret = send_and_recv_cmd(drv, msg);
++
++ if (ret)
++ wpa_printf(MSG_ERROR, "Failed to set pp_enable. ret=%d (%s)",
++ ret, strerror(-ret));
++
++ return ret;
++
++fail:
++ nlmsg_free(msg);
++ return -ENOBUFS;
++}
++
+ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .name = "nl80211",
+ .desc = "Linux nl80211/cfg80211",
+@@ -15138,4 +15186,5 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .amnt_set = nl80211_amnt_set,
+ .amnt_dump = nl80211_amnt_dump,
+ .background_radar_mode = nl80211_background_radar_mode,
++ .pp_mode_set = nl80211_pp_mode_set,
+ };
+diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
+index d795c807f..4145d4c3a 100644
+--- a/src/drivers/driver_nl80211.h
++++ b/src/drivers/driver_nl80211.h
+@@ -208,6 +208,7 @@ struct wpa_driver_nl80211_data {
+ unsigned int mtk_rfeatures_vendor_cmd_avail:1;
+ unsigned int mtk_amnt_vendor_cmd_avail:1;
+ unsigned int mtk_background_radar_vendor_cmd_avail:1;
++ unsigned int mtk_pp_vendor_cmd_avail:1;
+
+ u32 ignore_next_local_disconnect;
+ u32 ignore_next_local_deauth;
+diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
+index b85afe740..319f22029 100644
+--- a/src/drivers/driver_nl80211_capa.c
++++ b/src/drivers/driver_nl80211_capa.c
+@@ -1163,6 +1163,9 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
+ case MTK_NL80211_VENDOR_SUBCMD_BACKGROUND_RADAR_CTRL:
+ drv->mtk_background_radar_vendor_cmd_avail = 1;
+ break;
++ case MTK_NL80211_VENDOR_SUBCMD_PP_CTRL:
++ drv->mtk_pp_vendor_cmd_avail = 1;
++ break;
+ }
+ }
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0053-mtk-hostapd-add-no_beacon-vendor-command-for-cert.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0053-mtk-hostapd-add-no_beacon-vendor-command-for-cert.patch
new file mode 100644
index 0000000..af5dc9c
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0053-mtk-hostapd-add-no_beacon-vendor-command-for-cert.patch
@@ -0,0 +1,247 @@
+From 9803c5e614398064abf6d943aff80175aa84f5e7 Mon Sep 17 00:00:00 2001
+From: MeiChia Chiu <meichia.chiu@mediatek.com>
+Date: Wed, 22 Nov 2023 21:41:34 +0800
+Subject: [PATCH 53/69] mtk: hostapd: add no_beacon vendor command for cert
+
+Add the vendor command to disable/enable beacon
+
+[Usage]
+hostapd_cli -i <interface> no_beacon <value>
+ <value>
+ 0: enable beacon
+ 1: disable beacon
+
+Signed-off-by: MeiChia Chiu <meichia.chiu@mediatek.com>
+---
+ hostapd/ctrl_iface.c | 21 +++++++++++++++++++
+ hostapd/hostapd_cli.c | 7 +++++++
+ src/ap/ap_drv_ops.c | 8 ++++++++
+ src/ap/ap_drv_ops.h | 1 +
+ src/common/mtk_vendor.h | 12 +++++++++++
+ src/drivers/driver.h | 7 +++++++
+ src/drivers/driver_nl80211.c | 34 +++++++++++++++++++++++++++++++
+ src/drivers/driver_nl80211.h | 1 +
+ src/drivers/driver_nl80211_capa.c | 3 +++
+ 9 files changed, 94 insertions(+)
+
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index 91a9feaa5..63655b149 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -4883,6 +4883,24 @@ hostapd_ctrl_iface_get_pp(struct hostapd_data *hapd, char *cmd, char *buf,
+ }
+ }
+
++static int
++hostapd_ctrl_iface_disable_beacon(struct hostapd_data *hapd, char *value,
++ char *buf, size_t buflen)
++{
++ int disable_beacon = atoi(value);
++
++ if (disable_beacon < 0) {
++ wpa_printf(MSG_ERROR, "Invalid value for beacon ctrl");
++ return -1;
++ }
++
++ if (hostapd_drv_beacon_ctrl(hapd, !disable_beacon) == 0)
++ return os_snprintf(buf, buflen, "OK\n");
++ else
++ return -1;
++
++}
++
+ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ char *buf, char *reply,
+ int reply_size,
+@@ -5533,6 +5551,9 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ } else if (os_strncmp(buf, "SET_BACKGROUND_RADAR_MODE", 25) == 0) {
+ reply_len = hostapd_ctrl_iface_set_background_radar_mode(hapd, buf + 25,
+ reply, reply_size);
++ } else if (os_strncmp(buf, "NO_BEACON ", 10) == 0) {
++ reply_len = hostapd_ctrl_iface_disable_beacon(hapd, buf + 10, reply,
++ reply_size);
+ } else {
+ os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
+ reply_len = 16;
+diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
+index e0b175386..7e4485cb8 100644
+--- a/hostapd/hostapd_cli.c
++++ b/hostapd/hostapd_cli.c
+@@ -1464,6 +1464,11 @@ static int hostapd_cli_cmd_get_mu(struct wpa_ctrl *ctrl, int argc,
+ return hostapd_cli_cmd(ctrl, "GET_MU", 0, NULL, NULL);
+ }
+
++static int hostapd_cli_cmd_disable_beacon(struct wpa_ctrl *ctrl, int argc,
++ char *argv[])
++{
++ return hostapd_cli_cmd(ctrl, "NO_BEACON", 1, argc, argv);
++}
+
+ #ifdef CONFIG_DPP
+
+@@ -1871,6 +1876,8 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
+ "<value> [0-15] bitmap- UL MU-MIMO(bit3), DL MU-MIMO(bit2), UL OFDMA(bit1), DL OFDMA(bit0)"},
+ { "get_mu", hostapd_cli_cmd_get_mu, NULL,
+ " = show mu onoff value in 0-15 bitmap"},
++ { "no_beacon", hostapd_cli_cmd_disable_beacon, NULL,
++ "<value> 0: Enable beacon, 1: Disable beacon"},
+ #ifdef CONFIG_DPP
+ { "dpp_qr_code", hostapd_cli_cmd_dpp_qr_code, NULL,
+ "report a scanned DPP URI from a QR Code" },
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index 534473388..c5a990691 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -1359,3 +1359,11 @@ int hostapd_drv_pp_mode_set(struct hostapd_data *hapd)
+ return hapd->driver->pp_mode_set(hapd->drv_priv,
+ hapd->iconf->pp_mode);
+ }
++
++int hostapd_drv_beacon_ctrl(struct hostapd_data *hapd, u8 beacon_mode)
++{
++ if (!hapd->driver || !hapd->driver->beacon_ctrl)
++ return 0;
++ return hapd->driver->beacon_ctrl(hapd->drv_priv, beacon_mode);
++}
++
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index c813b2f0d..0c29f90a8 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -165,6 +165,7 @@ int hostapd_drv_amnt_set(struct hostapd_data *hapd, u8 amnt_idx, u8 *amnt_sta_ma
+ int hostapd_drv_amnt_dump(struct hostapd_data *hapd, u8 amnt_idx, u8 *amnt_dump_buf);
+ int hostapd_drv_background_radar_mode(struct hostapd_data *hapd);
+ int hostapd_drv_pp_mode_set(struct hostapd_data *hapd);
++int hostapd_drv_beacon_ctrl(struct hostapd_data *hapd, u8 beacon_mode);
+
+ #include "drivers/driver.h"
+
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+index 6275c141d..5531802b8 100644
+--- a/src/common/mtk_vendor.h
++++ b/src/common/mtk_vendor.h
+@@ -18,6 +18,7 @@ enum mtk_nl80211_vendor_subcmds {
+ MTK_NL80211_VENDOR_SUBCMD_BSS_COLOR_CTRL = 0xca,
+ MTK_NL80211_VENDOR_SUBCMD_BACKGROUND_RADAR_CTRL = 0xcb,
+ MTK_NL80211_VENDOR_SUBCMD_PP_CTRL = 0xcc,
++ MTK_NL80211_VENDOR_SUBCMD_BEACON_CTRL = 0xcd,
+ };
+
+ enum mtk_vendor_attr_edcca_ctrl {
+@@ -268,6 +269,17 @@ enum mtk_vendor_attr_pp_ctrl {
+ NUM_MTK_VENDOR_ATTRS_PP_CTRL - 1
+ };
+
++enum mtk_vendor_attr_beacon_ctrl {
++ MTK_VENDOR_ATTR_BEACON_CTRL_UNSPEC,
++
++ MTK_VENDOR_ATTR_BEACON_CTRL_MODE,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_BEACON_CTRL,
++ MTK_VENDOR_ATTR_BEACON_CTRL_MAX =
++ NUM_MTK_VENDOR_ATTRS_BEACON_CTRL - 1
++};
++
+ #define CSI_MAX_COUNT 256
+ #define ETH_ALEN 6
+
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index 75e87df9a..a657f3285 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -5206,6 +5206,13 @@ struct wpa_driver_ops {
+ int (*mu_ctrl)(void *priv, u8 mode, void *config);
+ int (*mu_dump)(void *priv, u8 *mu_onoff);
+
++ /**
++ * beacon_ctrl - ctrl on off for beacon
++ * @priv: Private driver interface data
++ *
++ */
++ int (*beacon_ctrl)(void *priv, u8 beacon_mode);
++
+ /**
+ * three_wire_ctrl - set three_wire_ctrl mode
+ * @priv: Private driver interface data
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index ac22c22a7..c0bbd92a7 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -14023,6 +14023,39 @@ static int nl80211_mu_dump(void *priv, u8 *mu_onoff)
+
+ return ret;
+ }
++static int nl80211_beacon_ctrl(void *priv, u8 beacon_mode)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *data;
++ int ret;
++
++ if (!drv->mtk_beacon_ctrl_vendor_cmd_avail) {
++ wpa_printf(MSG_ERROR,
++ "nl80211: Driver does not support setting beacon control");
++ return 0;
++ }
++
++ if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, MTK_NL80211_VENDOR_SUBCMD_BEACON_CTRL) ||
++ !(data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_BEACON_CTRL_MODE, beacon_mode)) {
++ nlmsg_free(msg);
++ return -ENOBUFS;
++ }
++
++ nla_nest_end(msg, data);
++
++ ret = send_and_recv_cmd(drv, msg);
++
++ if (ret)
++ wpa_printf(MSG_ERROR, "Failed to set beacon_ctrl. ret=%d (%s)", ret, strerror(-ret));
++
++ return ret;
++}
++
+ #endif /* CONFIG_IEEE80211AX */
+
+
+@@ -15161,6 +15194,7 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .set_4addr_mode = nl80211_set_4addr_mode,
+ .mu_ctrl = nl80211_mu_ctrl,
+ .mu_dump = nl80211_mu_dump,
++ .beacon_ctrl = nl80211_beacon_ctrl,
+ #ifdef CONFIG_DPP
+ .dpp_listen = nl80211_dpp_listen,
+ #endif /* CONFIG_DPP */
+diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
+index 4145d4c3a..7ac766fa8 100644
+--- a/src/drivers/driver_nl80211.h
++++ b/src/drivers/driver_nl80211.h
+@@ -209,6 +209,7 @@ struct wpa_driver_nl80211_data {
+ unsigned int mtk_amnt_vendor_cmd_avail:1;
+ unsigned int mtk_background_radar_vendor_cmd_avail:1;
+ unsigned int mtk_pp_vendor_cmd_avail:1;
++ unsigned int mtk_beacon_ctrl_vendor_cmd_avail:1;
+
+ u32 ignore_next_local_disconnect;
+ u32 ignore_next_local_deauth;
+diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
+index 319f22029..ef04d3007 100644
+--- a/src/drivers/driver_nl80211_capa.c
++++ b/src/drivers/driver_nl80211_capa.c
+@@ -1166,6 +1166,9 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
+ case MTK_NL80211_VENDOR_SUBCMD_PP_CTRL:
+ drv->mtk_pp_vendor_cmd_avail = 1;
+ break;
++ case MTK_NL80211_VENDOR_SUBCMD_BEACON_CTRL :
++ drv->mtk_beacon_ctrl_vendor_cmd_avail = 1;
++ break;
+ }
+ }
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0054-mtk-hostapd-WPS-added-change-to-configure-AP-PIN-loc.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0054-mtk-hostapd-WPS-added-change-to-configure-AP-PIN-loc.patch
new file mode 100644
index 0000000..b463019
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0054-mtk-hostapd-WPS-added-change-to-configure-AP-PIN-loc.patch
@@ -0,0 +1,64 @@
+From e1f26f8a80908fe46b53662db2dc87a217883751 Mon Sep 17 00:00:00 2001
+From: "amlendu.mishra" <amlendu.mishra@mediatek.com>
+Date: Wed, 13 Dec 2023 18:13:01 +0530
+Subject: [PATCH 54/69] mtk: hostapd: WPS added change to configure AP PIN lock
+ timout
+
+added config paramter ap_pin_lockout_time to configure
+AP PIN timeout from hosatpd.conf
+
+Signed-off-by: amlendu.mishra <amlendu.mishra@mediatek.com>
+---
+ hostapd/config_file.c | 2 ++
+ src/ap/ap_config.h | 1 +
+ src/ap/wps_hostapd.c | 9 ++++++---
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/hostapd/config_file.c b/hostapd/config_file.c
+index 050ef290e..7bc19479d 100644
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -4191,6 +4191,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ bss->wps_independent = atoi(pos);
+ } else if (os_strcmp(buf, "ap_setup_locked") == 0) {
+ bss->ap_setup_locked = atoi(pos);
++ } else if (os_strcmp(buf, "ap_pin_lockout_time") == 0) {
++ bss->ap_pin_lockout_time = atoi(pos);
+ } else if (os_strcmp(buf, "uuid") == 0) {
+ if (uuid_str2bin(pos, bss->uuid)) {
+ wpa_printf(MSG_ERROR, "Line %d: invalid UUID", line);
+diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
+index 40edcdaa7..7f48c71f5 100644
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -493,6 +493,7 @@ struct hostapd_bss_config {
+ #ifdef CONFIG_WPS
+ int wps_independent;
+ int ap_setup_locked;
++ unsigned int ap_pin_lockout_time;
+ u8 uuid[16];
+ char *wps_pin_requests;
+ char *device_name;
+diff --git a/src/ap/wps_hostapd.c b/src/ap/wps_hostapd.c
+index dfc5c3ecb..8a6fc42b2 100644
+--- a/src/ap/wps_hostapd.c
++++ b/src/ap/wps_hostapd.c
+@@ -768,9 +768,12 @@ static int wps_pwd_auth_fail(struct hostapd_data *hapd, void *ctx)
+ eloop_cancel_timeout(hostapd_wps_reenable_ap_pin, hapd, NULL);
+ wpa_printf(MSG_DEBUG, "WPS: AP PIN disabled indefinitely");
+ } else if (!hapd->conf->ap_setup_locked) {
+- if (hapd->ap_pin_lockout_time == 0)
+- hapd->ap_pin_lockout_time = 60;
+- else if (hapd->ap_pin_lockout_time < 365 * 24 * 60 * 60 &&
++ if (hapd->ap_pin_lockout_time == 0) {
++ if (hapd->conf->ap_pin_lockout_time)
++ hapd->ap_pin_lockout_time = hapd->conf->ap_pin_lockout_time;
++ else
++ hapd->ap_pin_lockout_time = 60;
++ } else if (hapd->ap_pin_lockout_time < 365 * 24 * 60 * 60 &&
+ (hapd->ap_pin_failures % 3) == 0)
+ hapd->ap_pin_lockout_time *= 2;
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0055-hostapd-mtk-ACS-remove-chan-freq-list-check-when-sca.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0055-hostapd-mtk-ACS-remove-chan-freq-list-check-when-sca.patch
new file mode 100644
index 0000000..1552e08
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0055-hostapd-mtk-ACS-remove-chan-freq-list-check-when-sca.patch
@@ -0,0 +1,45 @@
+From 2c737653fb513f2cfed0cf899264a22fcfd0e899 Mon Sep 17 00:00:00 2001
+From: Michael-CY Lee <michael-cy.lee@mediatek.com>
+Date: Tue, 23 Jan 2024 10:52:57 +0800
+Subject: [PATCH 55/69] hostapd: mtk: ACS: remove chan/freq list check when
+ scan request and factor calculation
+
+CR-Id: WCNCR00289305
+Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
+---
+ src/ap/acs.c | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/src/ap/acs.c b/src/ap/acs.c
+index 4c4c750ab..cb4db7147 100644
+--- a/src/ap/acs.c
++++ b/src/ap/acs.c
+@@ -595,12 +595,6 @@ static void acs_survey_mode_interference_factor(
+ iface->conf->acs_exclude_dfs)
+ continue;
+
+- if (!is_in_chanlist(iface, chan))
+- continue;
+-
+- if (!is_in_freqlist(iface, chan))
+- continue;
+-
+ if (chan->max_tx_power < iface->conf->min_tx_power)
+ continue;
+
+@@ -1358,12 +1352,6 @@ static int * acs_request_scan_add_freqs(struct hostapd_iface *iface,
+ iface->conf->acs_exclude_dfs))
+ continue;
+
+- if (!is_in_chanlist(iface, chan))
+- continue;
+-
+- if (!is_in_freqlist(iface, chan))
+- continue;
+-
+ if (chan->max_tx_power < iface->conf->min_tx_power)
+ continue;
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0056-mtk-hostapd-Fix-chan_switch-to-usable-DFS-channel-fa.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0056-mtk-hostapd-Fix-chan_switch-to-usable-DFS-channel-fa.patch
new file mode 100644
index 0000000..1397dbf
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0056-mtk-hostapd-Fix-chan_switch-to-usable-DFS-channel-fa.patch
@@ -0,0 +1,44 @@
+From 9f8c94852992afe2d6f354464a692779bb12015a Mon Sep 17 00:00:00 2001
+From: "fancy.liu" <fancy.liu@mediatek.com>
+Date: Wed, 1 Nov 2023 19:58:05 +0800
+Subject: [PATCH 56/69] mtk: hostapd: Fix chan_switch to usable DFS channel
+ fail due to ACS
+
+Step and issue:
+1. Enable ACS in hostapd config;
+2. Bootup and then use hostapd_cli cmd switch channel to a DFS channel;
+3. Will do ACS again, and no work on channel specified in step 2.
+
+Root cause:
+When need do DFS-CAC, hostapd will do intf disable, then set the new
+channel into running config settings, and finally enable intf;
+In the test case, new DFS channel is set to runnint config settings, but
+another param "acs" is still 1 (enable), caused the ACS running when
+intf enabled.
+
+Solution:
+In the hostapd_switch_channel_fallback, need to disable acs if channel
+is valid.
+
+Signed-off-by: fancy.liu <fancy.liu@mediatek.com>
+---
+ src/ap/hostapd.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index 43b479e9b..627c9ba6e 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -4267,6 +4267,9 @@ hostapd_switch_channel_fallback(struct hostapd_iface *iface,
+
+ iface->freq = freq_params->freq;
+ iface->conf->channel = freq_params->channel;
++ if (iface->conf->channel != 0) /* If channel not zero, will disable acs. */
++ iface->conf->acs = 0;
++
+ 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);
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0057-Revert-ACS-upstream-changes.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0057-Revert-ACS-upstream-changes.patch
new file mode 100644
index 0000000..92c6d31
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0057-Revert-ACS-upstream-changes.patch
@@ -0,0 +1,398 @@
+From 6207a83b3f0a6de5427740b167b4594c557083b5 Mon Sep 17 00:00:00 2001
+From: Michael-CY Lee <michael-cy.lee@mediatek.com>
+Date: Mon, 29 Jan 2024 10:26:53 +0800
+Subject: [PATCH 57/69] Revert ACS upstream changes
+
+- 348c047af ACS: More consistent checking of the best channel pointer
+- 98f3bd26d ACS: Extend the 320 MHz support
+- 733de8568 ACS: Fix not selecting the best channel in the segment
+- dc57ede01 tests: Full validation of ACS selecting HT40- channel
+- 4881accbb ACS: Add HT40- support in the 2.4 GHz band
+- 29f38ebcf ACS: Check whether iface->current_mode is NULL before use
+- 6f014c0d0 ACS: Add 320 MHz support for EHT
+
+Note that "e6f2494c3 hostapd: Add eht_bw320_offset configuration option"
+is not reverted due to conflict.
+---
+ src/ap/acs.c | 160 +++++++++----------------------------
+ tests/hwsim/test_ap_acs.py | 19 ++---
+ 2 files changed, 41 insertions(+), 138 deletions(-)
+
+diff --git a/src/ap/acs.c b/src/ap/acs.c
+index cb4db7147..cfa4a7d27 100644
+--- a/src/ap/acs.c
++++ b/src/ap/acs.c
+@@ -245,8 +245,6 @@ enum bw_type {
+ ACS_BW40,
+ ACS_BW80,
+ ACS_BW160,
+- ACS_BW320_1,
+- ACS_BW320_2,
+ };
+
+ struct bw_item {
+@@ -288,20 +286,10 @@ static const struct bw_item bw_160[] = {
+ { 6435, 6575, 111 }, { 6595, 6735, 143 },
+ { 6755, 6895, 175 }, { 6915, 7055, 207 }, { -1, -1, -1 }
+ };
+-static const struct bw_item bw_320_1[] = {
+- { 5955, 6255, 31 }, { 6275, 6575, 95 }, { 6595, 6895, 159 },
+- { -1, -1, -1 }
+-};
+-static const struct bw_item bw_320_2[] = {
+- { 6115, 6415, 63 }, { 6435, 6735, 127 }, { 6755, 7055, 191 },
+- { -1, -1, -1 }
+-};
+ static const struct bw_item *bw_desc[] = {
+ [ACS_BW40] = bw_40,
+ [ACS_BW80] = bw_80,
+ [ACS_BW160] = bw_160,
+- [ACS_BW320_1] = bw_320_1,
+- [ACS_BW320_2] = bw_320_2,
+ };
+
+
+@@ -773,42 +761,6 @@ static void acs_update_puncturing_bitmap(struct hostapd_iface *iface,
+ #endif /* CONFIG_IEEE80211BE */
+
+
+-static bool
+-acs_usable_bw320_chan(struct hostapd_iface *iface,
+- struct hostapd_channel_data *chan, int *bw320_offset)
+-{
+- const char *bw320_str[] = { "320 MHz", "320 MHz-1", "320 MHz-2" };
+- int conf_bw320_offset = hostapd_get_bw320_offset(iface->conf);
+-
+- *bw320_offset = 0;
+- switch (conf_bw320_offset) {
+- case 1:
+- if (acs_usable_bw_chan(chan, ACS_BW320_1))
+- *bw320_offset = 1;
+- break;
+- case 2:
+- if (acs_usable_bw_chan(chan, ACS_BW320_2))
+- *bw320_offset = 2;
+- break;
+- case 0:
+- default:
+- conf_bw320_offset = 0;
+- if (acs_usable_bw_chan(chan, ACS_BW320_1))
+- *bw320_offset = 1;
+- else if (acs_usable_bw_chan(chan, ACS_BW320_2))
+- *bw320_offset = 2;
+- break;
+- }
+-
+- if (!*bw320_offset)
+- wpa_printf(MSG_DEBUG,
+- "ACS: Channel %d: not allowed as primary channel for %s bandwidth",
+- chan->chan, bw320_str[conf_bw320_offset]);
+-
+- return *bw320_offset != 0;
+-}
+-
+-
+ static void
+ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ struct hostapd_hw_modes *mode,
+@@ -820,18 +772,14 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ struct hostapd_channel_data *chan, *adj_chan = NULL, *best;
+ long double factor;
+ int i, j;
+- int bw320_offset = 0, ideal_bw320_offset = 0;
+ unsigned int k;
+- int secondary_channel = 1, freq_offset;
+-
+- if (is_24ghz_mode(mode->mode))
+- secondary_channel = iface->conf->secondary_channel;
+
+ for (i = 0; i < mode->num_channels; i++) {
+- double total_weight = 0;
++ double total_weight;
+ struct acs_bias *bias, tmp_bias;
++ bool update_best = true;
+
+- chan = &mode->channels[i];
++ best = chan = &mode->channels[i];
+
+ /* Since in the current ACS implementation the first channel is
+ * always a primary channel, skip channels not available as
+@@ -863,7 +811,7 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ iface->conf->country[2] == 0x4f)
+ continue;
+
+- if (!chan_bw_allowed(chan, bw, secondary_channel != -1, 1)) {
++ if (!chan_bw_allowed(chan, bw, 1, 1)) {
+ wpa_printf(MSG_DEBUG,
+ "ACS: Channel %d: BW %u is not supported",
+ chan->chan, bw);
+@@ -884,8 +832,7 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ }
+
+ if (mode->mode == HOSTAPD_MODE_IEEE80211A &&
+- (iface->conf->ieee80211ac || iface->conf->ieee80211ax ||
+- iface->conf->ieee80211be)) {
++ (iface->conf->ieee80211ac || iface->conf->ieee80211ax)) {
+ if (hostapd_get_oper_chwidth(iface->conf) ==
+ CONF_OPER_CHWIDTH_80MHZ &&
+ !acs_usable_bw_chan(chan, ACS_BW80)) {
+@@ -905,25 +852,13 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ }
+ }
+
+- if (mode->mode == HOSTAPD_MODE_IEEE80211A &&
+- iface->conf->ieee80211be) {
+- if (hostapd_get_oper_chwidth(iface->conf) ==
+- CONF_OPER_CHWIDTH_320MHZ &&
+- !acs_usable_bw320_chan(iface, chan, &bw320_offset))
+- continue;
+- }
+-
+ factor = 0;
+- best = NULL;
+- if (acs_usable_chan(chan)) {
++ if (acs_usable_chan(chan))
+ factor = chan->interference_factor;
+- total_weight = 1;
+- best = chan;
+- }
++ total_weight = 1;
+
+ for (j = 1; j < n_chans; j++) {
+- adj_chan = acs_find_chan(iface, chan->freq +
+- j * secondary_channel * 20);
++ adj_chan = acs_find_chan(iface, chan->freq + (j * 20));
+ if (!adj_chan)
+ break;
+
+@@ -934,14 +869,16 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ break;
+ }
+
+- if (!acs_usable_chan(adj_chan))
+- continue;
+-
+- factor += adj_chan->interference_factor;
+- total_weight += 1;
++ if (acs_usable_chan(adj_chan)) {
++ factor += adj_chan->interference_factor;
++ total_weight += 1;
++ } else {
++ update_best = false;
++ }
+
+ /* find the best channel in this segment */
+- if (!best || adj_chan->interference_factor <
++ if (update_best &&
++ adj_chan->interference_factor <
+ best->interference_factor)
+ best = adj_chan;
+ }
+@@ -954,9 +891,8 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+
+ /* If the AP is in the 5 GHz or 6 GHz band, lets prefer a less
+ * crowded primary channel if one was found in the segment */
+- if (iface->current_mode &&
+- iface->current_mode->mode == HOSTAPD_MODE_IEEE80211A &&
+- best && chan != best) {
++ if (iface->current_mode->mode == HOSTAPD_MODE_IEEE80211A &&
++ chan != best) {
+ wpa_printf(MSG_DEBUG,
+ "ACS: promoting channel %d over %d (less interference %Lg/%Lg)",
+ best->chan, chan->chan,
+@@ -969,9 +905,8 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ * channel interference factor. */
+ if (is_24ghz_mode(mode->mode)) {
+ for (j = 0; j < n_chans; j++) {
+- freq_offset = j * 20 * secondary_channel;
+ adj_chan = acs_find_chan(iface, chan->freq +
+- freq_offset - 5);
++ (j * 20) - 5);
+ if (adj_chan && acs_usable_chan(adj_chan)) {
+ factor += ACS_ADJ_WEIGHT *
+ adj_chan->interference_factor;
+@@ -979,7 +914,7 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ }
+
+ adj_chan = acs_find_chan(iface, chan->freq +
+- freq_offset - 10);
++ (j * 20) - 10);
+ if (adj_chan && acs_usable_chan(adj_chan)) {
+ factor += ACS_NEXT_ADJ_WEIGHT *
+ adj_chan->interference_factor;
+@@ -987,7 +922,7 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ }
+
+ adj_chan = acs_find_chan(iface, chan->freq +
+- freq_offset + 5);
++ (j * 20) + 5);
+ if (adj_chan && acs_usable_chan(adj_chan)) {
+ factor += ACS_ADJ_WEIGHT *
+ adj_chan->interference_factor;
+@@ -995,7 +930,7 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ }
+
+ adj_chan = acs_find_chan(iface, chan->freq +
+- freq_offset + 10);
++ (j * 20) + 10);
+ if (adj_chan && acs_usable_chan(adj_chan)) {
+ factor += ACS_NEXT_ADJ_WEIGHT *
+ adj_chan->interference_factor;
+@@ -1004,9 +939,6 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ }
+ }
+
+- if (total_weight == 0)
+- continue;
+-
+ factor /= total_weight;
+
+ bias = NULL;
+@@ -1044,7 +976,6 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+
+ *ideal_factor = factor;
+ *ideal_chan = chan;
+- ideal_bw320_offset = bw320_offset;
+
+ #ifdef CONFIG_IEEE80211BE
+ if (iface->conf->ieee80211be)
+@@ -1055,13 +986,9 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ }
+
+ /* This channel would at least be usable */
+- if (!(*rand_chan)) {
++ if (!(*rand_chan))
+ *rand_chan = chan;
+- ideal_bw320_offset = bw320_offset;
+- }
+ }
+-
+- hostapd_set_and_check_bw320_offset(iface->conf, ideal_bw320_offset);
+ }
+
+
+@@ -1088,12 +1015,19 @@ acs_find_ideal_chan(struct hostapd_iface *iface)
+ goto bw_selected;
+ }
+
++ /* TODO: HT40- support */
++
++ if (iface->conf->ieee80211n &&
++ iface->conf->secondary_channel == -1) {
++ wpa_printf(MSG_ERROR, "ACS: HT40- is not supported yet. Please try HT40+");
++ return NULL;
++ }
++
+ if (iface->conf->ieee80211n &&
+ iface->conf->secondary_channel)
+ n_chans = 2;
+
+- if (iface->conf->ieee80211ac || iface->conf->ieee80211ax ||
+- iface->conf->ieee80211be) {
++ if (iface->conf->ieee80211ac || iface->conf->ieee80211ax) {
+ switch (hostapd_get_oper_chwidth(iface->conf)) {
+ case CONF_OPER_CHWIDTH_80MHZ:
+ n_chans = 4;
+@@ -1101,9 +1035,6 @@ acs_find_ideal_chan(struct hostapd_iface *iface)
+ case CONF_OPER_CHWIDTH_160MHZ:
+ n_chans = 8;
+ break;
+- case CONF_OPER_CHWIDTH_320MHZ:
+- n_chans = 16;
+- break;
+ default:
+ break;
+ }
+@@ -1153,8 +1084,7 @@ static void acs_adjust_secondary(struct hostapd_iface *iface)
+ acs_find_mode(iface, iface->freq) != HOSTAPD_MODE_IEEE80211A)
+ return;
+
+- wpa_printf(MSG_DEBUG,
+- "ACS: Adjusting HT/VHT/HE/EHT secondary frequency");
++ wpa_printf(MSG_DEBUG, "ACS: Adjusting HT/VHT/HE secondary frequency");
+
+ for (i = 0; bw_desc[ACS_BW40][i].first != -1; i++) {
+ if (iface->freq == bw_desc[ACS_BW40][i].first)
+@@ -1169,7 +1099,7 @@ static void acs_adjust_center_freq(struct hostapd_iface *iface)
+ {
+ int center;
+
+- wpa_printf(MSG_DEBUG, "ACS: Adjusting center frequency");
++ wpa_printf(MSG_DEBUG, "ACS: Adjusting VHT center frequency");
+
+ switch (hostapd_get_oper_chwidth(iface->conf)) {
+ case CONF_OPER_CHWIDTH_USE_HT:
+@@ -1187,29 +1117,12 @@ static void acs_adjust_center_freq(struct hostapd_iface *iface)
+ break;
+ case CONF_OPER_CHWIDTH_160MHZ:
+ center = acs_get_bw_center_chan(iface->freq, ACS_BW160);
+- break;
+- case CONF_OPER_CHWIDTH_320MHZ:
+- switch (hostapd_get_bw320_offset(iface->conf)) {
+- case 1:
+- center = acs_get_bw_center_chan(iface->freq,
+- ACS_BW320_1);
+- break;
+- case 2:
+- center = acs_get_bw_center_chan(iface->freq,
+- ACS_BW320_2);
+- break;
+- default:
+- wpa_printf(MSG_INFO,
+- "ACS: BW320 offset is not selected");
+- return;
+- }
+-
+ break;
+ default:
+ /* TODO: How can this be calculated? Adjust
+ * acs_find_ideal_chan() */
+ wpa_printf(MSG_INFO,
+- "ACS: Only VHT20/40/80/160/320 is supported now");
++ "ACS: Only VHT20/40/80/160 is supported now");
+ return;
+ }
+
+@@ -1272,8 +1185,7 @@ static void acs_study(struct hostapd_iface *iface)
+ iface->conf->punct_bitmap = ideal_chan->punct_bitmap;
+ #endif /* CONFIG_IEEE80211BE */
+
+- if (iface->conf->ieee80211ac || iface->conf->ieee80211ax ||
+- iface->conf->ieee80211be) {
++ if (iface->conf->ieee80211ac || iface->conf->ieee80211ax) {
+ acs_adjust_secondary(iface);
+ acs_adjust_center_freq(iface);
+ }
+diff --git a/tests/hwsim/test_ap_acs.py b/tests/hwsim/test_ap_acs.py
+index 001a5d4fd..e1359b6eb 100644
+--- a/tests/hwsim/test_ap_acs.py
++++ b/tests/hwsim/test_ap_acs.py
+@@ -205,20 +205,11 @@ def test_ap_acs_40mhz_minus(dev, apdev):
+ params['acs_num_scans'] = '1'
+ params['chanlist'] = '1 11'
+ hapd = hostapd.add_ap(apdev[0], params, wait_enabled=False)
+- wait_acs(hapd)
+-
+- freq = hapd.get_status_field("freq")
+- if int(freq) < 2400:
+- raise Exception("Unexpected frequency")
+- sec = hapd.get_status_field("secondary_channel")
+- if int(sec) != -1:
+- raise Exception("Unexpected secondary_channel: " + sec)
+-
+- dev[0].connect("test-acs", psk="12345678", scan_freq=freq)
+- sig = dev[0].request("SIGNAL_POLL").splitlines()
+- logger.info("SIGNAL_POLL: " + str(sig))
+- if "WIDTH=40 MHz" not in sig:
+- raise Exception("Station did not report 40 MHz bandwidth")
++ ev = hapd.wait_event(["AP-ENABLED", "AP-DISABLED"], timeout=10)
++ if not ev:
++ raise Exception("ACS start timed out")
++ # HT40- is not currently supported in hostapd ACS, so do not try to connect
++ # or verify that this operation succeeded.
+
+ def test_ap_acs_5ghz(dev, apdev):
+ """Automatic channel selection on 5 GHz"""
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0058-mtk-hostapd-ACS-Add-EHT320-and-HT40-support-fix-issu.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0058-mtk-hostapd-ACS-Add-EHT320-and-HT40-support-fix-issu.patch
new file mode 100644
index 0000000..a7e6eda
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0058-mtk-hostapd-ACS-Add-EHT320-and-HT40-support-fix-issu.patch
@@ -0,0 +1,379 @@
+From 764f22a43d00cf3dc1d1f2bee9cbf7b7a7dafc9a Mon Sep 17 00:00:00 2001
+From: "fancy.liu" <fancy.liu@mediatek.com>
+Date: Thu, 28 Sep 2023 18:03:08 +0800
+Subject: [PATCH 58/69] mtk: hostapd: ACS: Add EHT320 and HT40- support, fix
+ issue
+
+1. Add 6G EHT320 support;
+2. Add 2.4G HT40- support;
+3. Fix issue: selected best channel is out of channels;
+
+Signed-off-by: fancy.liu <fancy.liu@mediatek.com>
+---
+ src/ap/acs.c | 191 +++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 124 insertions(+), 67 deletions(-)
+
+diff --git a/src/ap/acs.c b/src/ap/acs.c
+index cfa4a7d27..1fa8b8e64 100644
+--- a/src/ap/acs.c
++++ b/src/ap/acs.c
+@@ -245,6 +245,7 @@ enum bw_type {
+ ACS_BW40,
+ ACS_BW80,
+ ACS_BW160,
++ ACS_BW320,
+ };
+
+ struct bw_item {
+@@ -286,10 +287,16 @@ static const struct bw_item bw_160[] = {
+ { 6435, 6575, 111 }, { 6595, 6735, 143 },
+ { 6755, 6895, 175 }, { 6915, 7055, 207 }, { -1, -1, -1 }
+ };
++static const struct bw_item bw_320[] = {
++ { 5955, 6255, 31 }, { 6115, 6415, 63 }, { 6275, 6575, 95 },
++ { 6435, 6735, 127 }, { 6595, 6895, 159 }, { 6755, 7055, 191 },
++ { -1, -1, -1 }
++};
+ static const struct bw_item *bw_desc[] = {
+ [ACS_BW40] = bw_40,
+ [ACS_BW80] = bw_80,
+ [ACS_BW160] = bw_160,
++ [ACS_BW320] = bw_320,
+ };
+
+
+@@ -769,10 +776,19 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ struct hostapd_channel_data **ideal_chan,
+ long double *ideal_factor)
+ {
+- struct hostapd_channel_data *chan, *adj_chan = NULL, *best;
++ struct hostapd_channel_data *chan, *adj_chan = NULL, *tmp_chan = NULL, *best;
+ long double factor;
+ int i, j;
+ unsigned int k;
++ int ht40_plus = 1, sec_ch_factor = 1;
++
++ if (is_24ghz_mode(mode->mode)) {
++ ht40_plus = (iface->conf->secondary_channel == -1) ? 0 : 1;
++ sec_ch_factor = (iface->conf->secondary_channel == -1) ? -1 : 1;
++ }
++
++ wpa_printf(MSG_INFO, "%s:%d, bw(%u), n_chans(%d), num_channels(%d), sec_ch(%d)",
++ __func__, __LINE__, bw, n_chans, mode->num_channels, iface->conf->secondary_channel);
+
+ for (i = 0; i < mode->num_channels; i++) {
+ double total_weight;
+@@ -780,6 +796,9 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ bool update_best = true;
+
+ best = chan = &mode->channels[i];
++ wpa_printf(MSG_INFO,
++ "ACS: Channel[%d] %d: interference_factor %Lg",
++ i, chan->chan, chan->interference_factor);
+
+ /* Since in the current ACS implementation the first channel is
+ * always a primary channel, skip channels not available as
+@@ -811,7 +830,7 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ iface->conf->country[2] == 0x4f)
+ continue;
+
+- if (!chan_bw_allowed(chan, bw, 1, 1)) {
++ if (!chan_bw_allowed(chan, bw, ht40_plus, 1)) {
+ wpa_printf(MSG_DEBUG,
+ "ACS: Channel %d: BW %u is not supported",
+ chan->chan, bw);
+@@ -832,7 +851,8 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ }
+
+ if (mode->mode == HOSTAPD_MODE_IEEE80211A &&
+- (iface->conf->ieee80211ac || iface->conf->ieee80211ax)) {
++ (iface->conf->ieee80211ac || iface->conf->ieee80211ax ||
++ iface->conf->ieee80211be)) {
+ if (hostapd_get_oper_chwidth(iface->conf) ==
+ CONF_OPER_CHWIDTH_80MHZ &&
+ !acs_usable_bw_chan(chan, ACS_BW80)) {
+@@ -850,63 +870,86 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ chan->chan);
+ continue;
+ }
+- }
+
+- factor = 0;
+- if (acs_usable_chan(chan))
+- factor = chan->interference_factor;
+- total_weight = 1;
+-
+- for (j = 1; j < n_chans; j++) {
+- adj_chan = acs_find_chan(iface, chan->freq + (j * 20));
+- if (!adj_chan)
+- break;
+-
+- if (!chan_bw_allowed(adj_chan, bw, 1, 0)) {
++ if (iface->conf->ieee80211be &&
++ hostapd_get_oper_chwidth(iface->conf) ==
++ CONF_OPER_CHWIDTH_320MHZ &&
++ !acs_usable_bw_chan(chan, ACS_BW320)) {
+ wpa_printf(MSG_DEBUG,
+- "ACS: PRI Channel %d: secondary channel %d BW %u is not supported",
+- chan->chan, adj_chan->chan, bw);
+- break;
++ "ACS: Channel %d: not allowed as primary channel for 320 MHz bandwidth",
++ chan->chan);
++ continue;
+ }
++ }
+
+- if (acs_usable_chan(adj_chan)) {
+- factor += adj_chan->interference_factor;
++ factor = 0;
++ total_weight = 0;
++
++ if (!is_24ghz_mode(mode->mode)) {
++ /* If the AP is in the 5 GHz or 6 GHz band, lets prefer a less
++ * crowded primary channel if one was found in the segment */
++ if (acs_usable_chan(chan)) {
++ factor += chan->interference_factor;
+ total_weight += 1;
+- } else {
+- update_best = false;
+ }
+
+- /* find the best channel in this segment */
+- if (update_best &&
+- adj_chan->interference_factor <
+- best->interference_factor)
+- best = adj_chan;
+- }
++ for (j = 1; j < n_chans; j++) {
++ adj_chan = acs_find_chan(iface, chan->freq + j * 20);
++ if (!adj_chan)
++ break;
+
+- if (j != n_chans) {
+- wpa_printf(MSG_DEBUG, "ACS: Channel %d: not enough bandwidth",
+- chan->chan);
+- continue;
+- }
++ if (!is_in_chanlist(iface, adj_chan) || !is_in_freqlist(iface, adj_chan))
++ break;
+
+- /* If the AP is in the 5 GHz or 6 GHz band, lets prefer a less
+- * crowded primary channel if one was found in the segment */
+- if (iface->current_mode->mode == HOSTAPD_MODE_IEEE80211A &&
+- chan != best) {
+- wpa_printf(MSG_DEBUG,
+- "ACS: promoting channel %d over %d (less interference %Lg/%Lg)",
+- best->chan, chan->chan,
+- chan->interference_factor,
+- best->interference_factor);
+- chan = best;
+- }
++ if (!chan_bw_allowed(adj_chan, bw, 1, 0)) {
++ wpa_printf(MSG_DEBUG,
++ "ACS: PRI Channel %d: secondary channel %d BW %u is not supported",
++ chan->chan, adj_chan->chan, bw);
++ break;
++ }
++
++ update_best = true;
++ if (acs_usable_chan(adj_chan)) {
++ factor += adj_chan->interference_factor;
++ total_weight += 1;
++ } else {
++ update_best = false;
++ }
+
+- /* 2.4 GHz has overlapping 20 MHz channels. Include adjacent
+- * channel interference factor. */
+- if (is_24ghz_mode(mode->mode)) {
++ /* find the best channel in this segment */
++ if (update_best &&
++ adj_chan->interference_factor < best->interference_factor)
++ best = adj_chan;
++ }
++
++ if (j != n_chans) {
++ wpa_printf(MSG_DEBUG, "ACS: Channel %d: not enough bandwidth",
++ chan->chan);
++ continue;
++ }
++
++ if (chan != best) {
++ wpa_printf(MSG_INFO,
++ "ACS: promoting channel %d over %d (less interference %Lg/%Lg)",
++ best->chan, chan->chan,
++ chan->interference_factor,
++ best->interference_factor);
++ chan = best;
++ }
++ } else {
+ for (j = 0; j < n_chans; j++) {
++ /* Will set primary_channel / secondary_channel(40M case) weight to 1 */
++ tmp_chan = acs_find_chan(iface, chan->freq +
++ (j * sec_ch_factor * 20));
++ if (tmp_chan && acs_usable_chan(tmp_chan)) {
++ factor += tmp_chan->interference_factor;
++ total_weight += 1;
++ }
++
++ /* 2.4 GHz has overlapping 20 MHz channels. Include adjacent channel
++ interference factor, separately for primary/secondary channel. */
+ adj_chan = acs_find_chan(iface, chan->freq +
+- (j * 20) - 5);
++ (j * sec_ch_factor * 20) - 5);
+ if (adj_chan && acs_usable_chan(adj_chan)) {
+ factor += ACS_ADJ_WEIGHT *
+ adj_chan->interference_factor;
+@@ -914,7 +957,7 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ }
+
+ adj_chan = acs_find_chan(iface, chan->freq +
+- (j * 20) - 10);
++ (j * sec_ch_factor * 20) - 10);
+ if (adj_chan && acs_usable_chan(adj_chan)) {
+ factor += ACS_NEXT_ADJ_WEIGHT *
+ adj_chan->interference_factor;
+@@ -922,7 +965,7 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ }
+
+ adj_chan = acs_find_chan(iface, chan->freq +
+- (j * 20) + 5);
++ (j * sec_ch_factor * 20) + 5);
+ if (adj_chan && acs_usable_chan(adj_chan)) {
+ factor += ACS_ADJ_WEIGHT *
+ adj_chan->interference_factor;
+@@ -930,7 +973,7 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ }
+
+ adj_chan = acs_find_chan(iface, chan->freq +
+- (j * 20) + 10);
++ (j * sec_ch_factor * 20) + 10);
+ if (adj_chan && acs_usable_chan(adj_chan)) {
+ factor += ACS_NEXT_ADJ_WEIGHT *
+ adj_chan->interference_factor;
+@@ -939,7 +982,8 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+ }
+ }
+
+- factor /= total_weight;
++ if (total_weight)
++ factor /= total_weight;
+
+ bias = NULL;
+ if (iface->conf->acs_chan_bias) {
+@@ -958,11 +1002,11 @@ acs_find_ideal_chan_mode(struct hostapd_iface *iface,
+
+ if (bias) {
+ factor *= bias->bias;
+- wpa_printf(MSG_DEBUG,
++ wpa_printf(MSG_INFO,
+ "ACS: * channel %d: total interference = %Lg (%f bias)",
+ chan->chan, factor, bias->bias);
+ } else {
+- wpa_printf(MSG_DEBUG,
++ wpa_printf(MSG_INFO,
+ "ACS: * channel %d: total interference = %Lg",
+ chan->chan, factor);
+ }
+@@ -1015,19 +1059,12 @@ acs_find_ideal_chan(struct hostapd_iface *iface)
+ goto bw_selected;
+ }
+
+- /* TODO: HT40- support */
+-
+- if (iface->conf->ieee80211n &&
+- iface->conf->secondary_channel == -1) {
+- wpa_printf(MSG_ERROR, "ACS: HT40- is not supported yet. Please try HT40+");
+- return NULL;
+- }
+-
+ if (iface->conf->ieee80211n &&
+ iface->conf->secondary_channel)
+ n_chans = 2;
+
+- if (iface->conf->ieee80211ac || iface->conf->ieee80211ax) {
++ if (iface->conf->ieee80211ac || iface->conf->ieee80211ax ||
++ iface->conf->ieee80211be) {
+ switch (hostapd_get_oper_chwidth(iface->conf)) {
+ case CONF_OPER_CHWIDTH_80MHZ:
+ n_chans = 4;
+@@ -1037,6 +1074,7 @@ acs_find_ideal_chan(struct hostapd_iface *iface)
+ break;
+ default:
+ break;
++ /* 320 is supported only in 6GHz 11be mode */
+ }
+ }
+
+@@ -1057,7 +1095,7 @@ bw_selected:
+ }
+
+ if (ideal_chan) {
+- wpa_printf(MSG_DEBUG, "ACS: Ideal channel is %d (%d MHz) with total interference factor of %Lg",
++ wpa_printf(MSG_INFO, "ACS: Ideal channel is %d (%d MHz) with total interference factor of %Lg",
+ ideal_chan->chan, ideal_chan->freq, ideal_factor);
+
+ #ifdef CONFIG_IEEE80211BE
+@@ -1072,6 +1110,21 @@ bw_selected:
+ return rand_chan;
+ }
+
++static int acs_get_center_freq_320mhz(int channel)
++{
++ if (channel >= 1 && channel <= 45)
++ return 31;
++ else if (channel >= 49 && channel <= 77)
++ return 63;
++ else if (channel >= 81 && channel <= 109)
++ return 95;
++ else if (channel >= 113 && channel <= 141)
++ return 127;
++ else if (channel >= 145 && channel <= 173)
++ return 159;
++ else
++ return 191;
++}
+
+ static void acs_adjust_secondary(struct hostapd_iface *iface)
+ {
+@@ -1099,7 +1152,7 @@ static void acs_adjust_center_freq(struct hostapd_iface *iface)
+ {
+ int center;
+
+- wpa_printf(MSG_DEBUG, "ACS: Adjusting VHT center frequency");
++ wpa_printf(MSG_DEBUG, "ACS: Adjusting center frequency");
+
+ switch (hostapd_get_oper_chwidth(iface->conf)) {
+ case CONF_OPER_CHWIDTH_USE_HT:
+@@ -1115,6 +1168,9 @@ static void acs_adjust_center_freq(struct hostapd_iface *iface)
+ case CONF_OPER_CHWIDTH_80MHZ:
+ center = acs_get_bw_center_chan(iface->freq, ACS_BW80);
+ break;
++ case CONF_OPER_CHWIDTH_320MHZ:
++ center = acs_get_center_freq_320mhz(iface->conf->channel);
++ break;
+ case CONF_OPER_CHWIDTH_160MHZ:
+ center = acs_get_bw_center_chan(iface->freq, ACS_BW160);
+ break;
+@@ -1122,7 +1178,7 @@ static void acs_adjust_center_freq(struct hostapd_iface *iface)
+ /* TODO: How can this be calculated? Adjust
+ * acs_find_ideal_chan() */
+ wpa_printf(MSG_INFO,
+- "ACS: Only VHT20/40/80/160 is supported now");
++ "ACS: Only VHT20/40/80/160 EHT320 is supported now");
+ return;
+ }
+
+@@ -1185,7 +1241,8 @@ static void acs_study(struct hostapd_iface *iface)
+ iface->conf->punct_bitmap = ideal_chan->punct_bitmap;
+ #endif /* CONFIG_IEEE80211BE */
+
+- if (iface->conf->ieee80211ac || iface->conf->ieee80211ax) {
++ if (iface->conf->ieee80211ac || iface->conf->ieee80211ax ||
++ iface->conf->ieee80211be) {
+ acs_adjust_secondary(iface);
+ acs_adjust_center_freq(iface);
+ }
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0059-mtk-hostapd-initialize-i802_bss-s-flink-freq-with-if.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0059-mtk-hostapd-initialize-i802_bss-s-flink-freq-with-if.patch
new file mode 100644
index 0000000..66298fb
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0059-mtk-hostapd-initialize-i802_bss-s-flink-freq-with-if.patch
@@ -0,0 +1,122 @@
+From be38342ebe7341c3a235e5797d1e2a792265ca17 Mon Sep 17 00:00:00 2001
+From: Bo Jiao <Bo.Jiao@mediatek.com>
+Date: Thu, 19 Oct 2023 13:38:11 +0800
+Subject: [PATCH 59/69] mtk: hostapd: initialize i802_bss's flink->freq with
+ iface freq.
+
+Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
+---
+ src/ap/ap_drv_ops.c | 6 +++---
+ src/ap/ap_drv_ops.h | 2 +-
+ src/ap/hostapd.c | 2 +-
+ src/drivers/driver.h | 2 +-
+ src/drivers/driver_nl80211.c | 4 ++--
+ wpa_supplicant/driver_i.h | 2 +-
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index c5a990691..12d0fb985 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -368,7 +368,7 @@ int hostapd_vlan_if_add(struct hostapd_data *hapd, const char *ifname)
+ char force_ifname[IFNAMSIZ];
+ u8 if_addr[ETH_ALEN];
+ return hostapd_if_add(hapd, WPA_IF_AP_VLAN, ifname, hapd->own_addr,
+- NULL, NULL, force_ifname, if_addr, NULL, 0);
++ NULL, NULL, force_ifname, if_addr, NULL, 0, hapd->iface->freq);
+ }
+
+
+@@ -560,13 +560,13 @@ int hostapd_set_ssid(struct hostapd_data *hapd, const u8 *buf, size_t len)
+ int hostapd_if_add(struct hostapd_data *hapd, enum wpa_driver_if_type type,
+ const char *ifname, const u8 *addr, void *bss_ctx,
+ void **drv_priv, char *force_ifname, u8 *if_addr,
+- const char *bridge, int use_existing)
++ const char *bridge, int use_existing, int freq)
+ {
+ if (hapd->driver == NULL || hapd->driver->if_add == NULL)
+ return -1;
+ return hapd->driver->if_add(hapd->drv_priv, type, ifname, addr,
+ bss_ctx, drv_priv, force_ifname, if_addr,
+- bridge, use_existing, 1);
++ bridge, use_existing, 1, freq);
+ }
+
+
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index 0c29f90a8..6a97b0203 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -56,7 +56,7 @@ int hostapd_set_ssid(struct hostapd_data *hapd, const u8 *buf, size_t len);
+ int hostapd_if_add(struct hostapd_data *hapd, enum wpa_driver_if_type type,
+ const char *ifname, const u8 *addr, void *bss_ctx,
+ void **drv_priv, char *force_ifname, u8 *if_addr,
+- const char *bridge, int use_existing);
++ const char *bridge, int use_existing, int freq);
+ int hostapd_if_remove(struct hostapd_data *hapd, enum wpa_driver_if_type type,
+ const char *ifname);
+ int hostapd_set_ieee8021x(struct hostapd_data *hapd,
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index 627c9ba6e..b85525c28 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -1386,7 +1386,7 @@ int hostapd_setup_bss(struct hostapd_data *hapd, int first, bool start_beacon)
+ conf->iface, addr, hapd,
+ &hapd->drv_priv, force_ifname, if_addr,
+ conf->bridge[0] ? conf->bridge : NULL,
+- first == -1)) {
++ first == -1, hapd->iface->freq)) {
+ wpa_printf(MSG_ERROR, "Failed to add BSS (BSSID="
+ MACSTR ")", MAC2STR(hapd->own_addr));
+ hapd->interface_added = 0;
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index a657f3285..dbe32517e 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -3864,7 +3864,7 @@ struct wpa_driver_ops {
+ int (*if_add)(void *priv, enum wpa_driver_if_type type,
+ const char *ifname, const u8 *addr, void *bss_ctx,
+ void **drv_priv, char *force_ifname, u8 *if_addr,
+- const char *bridge, int use_existing, int setup_ap);
++ const char *bridge, int use_existing, int setup_ap, int freq);
+
+ /**
+ * if_remove - Remove a virtual interface
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index c0bbd92a7..17774cce0 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -8865,7 +8865,7 @@ static int wpa_driver_nl80211_if_add(void *priv, enum wpa_driver_if_type type,
+ void *bss_ctx, void **drv_priv,
+ char *force_ifname, u8 *if_addr,
+ const char *bridge, int use_existing,
+- int setup_ap)
++ int setup_ap, int freq)
+ {
+ enum nl80211_iftype nlmode;
+ struct i802_bss *bss = priv;
+@@ -8985,7 +8985,7 @@ static int wpa_driver_nl80211_if_add(void *priv, enum wpa_driver_if_type type,
+ new_bss->valid_links = 0;
+ os_memcpy(new_bss->flink->addr, new_bss->addr, ETH_ALEN);
+
+- new_bss->flink->freq = drv->first_bss->flink->freq;
++ new_bss->flink->freq = (freq == -1) ? drv->first_bss->flink->freq : freq;
+ new_bss->ctx = bss_ctx;
+ new_bss->added_if = added;
+ drv->first_bss->next = new_bss;
+diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h
+index 0b7182f49..273bb024a 100644
+--- a/wpa_supplicant/driver_i.h
++++ b/wpa_supplicant/driver_i.h
+@@ -454,7 +454,7 @@ static inline int wpa_drv_if_add(struct wpa_supplicant *wpa_s,
+ if (wpa_s->driver->if_add)
+ return wpa_s->driver->if_add(wpa_s->drv_priv, type, ifname,
+ addr, bss_ctx, NULL, force_ifname,
+- if_addr, bridge, 0, 0);
++ if_addr, bridge, 0, 0, -1);
+ return -1;
+ }
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0060-mtk-hostapd-fix-issue-that-tx-status-handle-with-unm.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0060-mtk-hostapd-fix-issue-that-tx-status-handle-with-unm.patch
new file mode 100644
index 0000000..b08e3a3
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0060-mtk-hostapd-fix-issue-that-tx-status-handle-with-unm.patch
@@ -0,0 +1,77 @@
+From 618f55fdab5d0045b063622585d96cbb9d00758f Mon Sep 17 00:00:00 2001
+From: Bo Jiao <Bo.Jiao@mediatek.com>
+Date: Thu, 19 Oct 2023 14:08:50 +0800
+Subject: [PATCH 60/69] mtk: hostapd: fix issue that tx status handle with
+ unmatch hostapd_data.
+
+Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
+---
+ src/ap/ieee802_11.c | 11 ++++++++++-
+ src/drivers/driver_nl80211_event.c | 7 ++++---
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+index dc362a589..f1c5c5a82 100644
+--- a/src/ap/ieee802_11.c
++++ b/src/ap/ieee802_11.c
+@@ -6561,11 +6561,20 @@ static void handle_assoc_cb(struct hostapd_data *hapd,
+ #ifdef CONFIG_IEEE80211BE
+ if (ap_sta_is_mld(hapd, sta) &&
+ hapd->mld_link_id != sta->mld_assoc_link_id) {
++ struct hostapd_data *temp_hapd = hapd;
++
+ /* See ieee80211_ml_link_sta_assoc_cb() for the MLD case */
+ wpa_printf(MSG_DEBUG,
+ "%s: MLD: ignore on link station (%d != %d)",
+ __func__, hapd->mld_link_id, sta->mld_assoc_link_id);
+- return;
++
++ if (temp_hapd->conf->mld_ap && sta->mld_assoc_link_id >= 0) {
++ struct hostapd_data *link_bss;
++
++ link_bss = hostapd_mld_get_link_bss(temp_hapd, sta->mld_assoc_link_id);
++ if (link_bss)
++ hapd = link_bss;
++ }
+ }
+ #endif /* CONFIG_IEEE80211BE */
+
+diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c
+index 78c9e58f9..0ead113f9 100644
+--- a/src/drivers/driver_nl80211_event.c
++++ b/src/drivers/driver_nl80211_event.c
+@@ -1363,11 +1363,12 @@ static void mlme_event_mgmt(struct i802_bss *bss,
+ event.rx_mgmt.drv_priv = bss;
+ event.rx_mgmt.link_id = link_id;
+
+- wpa_supplicant_event(drv->ctx, EVENT_RX_MGMT, &event);
++ wpa_supplicant_event(bss->ctx, EVENT_RX_MGMT, &event);
+ }
+
+
+ static void mlme_event_mgmt_tx_status(struct wpa_driver_nl80211_data *drv,
++ struct i802_bss *bss,
+ struct nlattr *cookie, const u8 *frame,
+ size_t len, struct nlattr *ack)
+ {
+@@ -1427,7 +1428,7 @@ static void mlme_event_mgmt_tx_status(struct wpa_driver_nl80211_data *drv,
+ event.tx_status.ack = ack != NULL;
+ event.tx_status.link_id = cookie_val == drv->send_frame_cookie ?
+ drv->send_frame_link_id : NL80211_DRV_LINK_ID_NA;
+- wpa_supplicant_event(drv->ctx, EVENT_TX_STATUS, &event);
++ wpa_supplicant_event(bss->ctx, EVENT_TX_STATUS, &event);
+ }
+
+
+@@ -1735,7 +1736,7 @@ static void mlme_event(struct i802_bss *bss,
+ nla_len(frame), link_id);
+ break;
+ case NL80211_CMD_FRAME_TX_STATUS:
+- mlme_event_mgmt_tx_status(drv, cookie, nla_data(frame),
++ mlme_event_mgmt_tx_status(drv, bss, cookie, nla_data(frame),
+ nla_len(frame), ack);
+ break;
+ case NL80211_CMD_UNPROT_DEAUTHENTICATE:
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0061-mtk-hostapd-fix-mld_assoc_link_id.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0061-mtk-hostapd-fix-mld_assoc_link_id.patch
new file mode 100644
index 0000000..202d608
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0061-mtk-hostapd-fix-mld_assoc_link_id.patch
@@ -0,0 +1,35 @@
+From 7990c3399f01c4d87a2e0b660a0f3f79c34cd45a Mon Sep 17 00:00:00 2001
+From: Shayne Chen <shayne.chen@mediatek.com>
+Date: Mon, 29 Jan 2024 11:24:28 +0800
+Subject: [PATCH 61/69] mtk: hostapd: fix mld_assoc_link_id
+
+Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
+---
+ src/ap/hostapd.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index b85525c28..03d34a178 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -3721,11 +3721,13 @@ void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
+ }
+
+ #ifdef CONFIG_IEEE80211BE
+- if (ap_sta_is_mld(hapd, sta) &&
+- sta->mld_assoc_link_id != hapd->mld_link_id)
+- return;
++ if (ap_sta_is_mld(hapd, sta)) {
++ if (sta->mld_assoc_link_id != hapd->mld_link_id)
++ return;
++ mld_assoc_link_id = sta->mld_assoc_link_id;
++ }
+ #endif /* CONFIG_IEEE80211BE */
+- if (mld_assoc_link_id != -2)
++ if (mld_assoc_link_id != -2)
+ hostapd_prune_associations(hapd, sta->addr, mld_assoc_link_id);
+
+ ap_sta_clear_disconnect_timeouts(hapd, sta);
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0062-mtk-wpa_s-correctly-get-assoc-frequency.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0062-mtk-wpa_s-correctly-get-assoc-frequency.patch
new file mode 100644
index 0000000..28729cc
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0062-mtk-wpa_s-correctly-get-assoc-frequency.patch
@@ -0,0 +1,25 @@
+From ed15e8b17477abad79bbacb76b79ce5332096a27 Mon Sep 17 00:00:00 2001
+From: Shayne Chen <shayne.chen@mediatek.com>
+Date: Thu, 19 Oct 2023 10:48:11 +0800
+Subject: [PATCH 62/69] mtk: wpa_s: correctly get assoc frequency
+
+Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
+---
+ src/drivers/driver_nl80211_event.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c
+index 0ead113f9..ef55a3e5c 100644
+--- a/src/drivers/driver_nl80211_event.c
++++ b/src/drivers/driver_nl80211_event.c
+@@ -328,6 +328,7 @@ static void mlme_event_assoc(struct wpa_driver_nl80211_data *drv,
+ wpa_ssid_txt(drv->ssid, drv->ssid_len));
+ }
+
++ drv->assoc_freq = nl80211_get_assoc_freq(drv);
+ event.assoc_info.freq = drv->assoc_freq;
+ drv->first_bss->flink->freq = drv->assoc_freq;
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0063-mtk-wpa_s-force-MLD-STA-to-use-SAE-H2E-during-authen.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0063-mtk-wpa_s-force-MLD-STA-to-use-SAE-H2E-during-authen.patch
new file mode 100644
index 0000000..1b0c37e
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0063-mtk-wpa_s-force-MLD-STA-to-use-SAE-H2E-during-authen.patch
@@ -0,0 +1,29 @@
+From b6d6f2ff400c7824574ffead18585aadb60a02ef Mon Sep 17 00:00:00 2001
+From: Shayne Chen <shayne.chen@mediatek.com>
+Date: Thu, 19 Oct 2023 10:51:55 +0800
+Subject: [PATCH 63/69] mtk: wpa_s: force MLD STA to use SAE H2E during
+ authentication
+
+Otherwise the MLD STA setup will fail with hostapd MLD AP.
+
+Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
+---
+ wpa_supplicant/sme.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
+index f08184f98..e1183722f 100644
+--- a/wpa_supplicant/sme.c
++++ b/wpa_supplicant/sme.c
+@@ -199,7 +199,7 @@ static struct wpabuf * sme_auth_build_sae_commit(struct wpa_supplicant *wpa_s,
+ if (wpa_key_mgmt_sae_ext_key(key_mgmt) &&
+ wpa_s->conf->sae_pwe != SAE_PWE_FORCE_HUNT_AND_PECK)
+ use_pt = 1;
+- if (bss && is_6ghz_freq(bss->freq) &&
++ if (bss && (is_6ghz_freq(bss->freq) || !is_zero_ether_addr(bss->mld_addr)) &&
+ wpa_s->conf->sae_pwe != SAE_PWE_FORCE_HUNT_AND_PECK)
+ use_pt = 1;
+ #ifdef CONFIG_SAE_PK
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0064-mtk-hostapd-extend-ap_get_sta-to-find-the-correct-st.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0064-mtk-hostapd-extend-ap_get_sta-to-find-the-correct-st.patch
new file mode 100644
index 0000000..6e6a41d
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0064-mtk-hostapd-extend-ap_get_sta-to-find-the-correct-st.patch
@@ -0,0 +1,71 @@
+From d5221e296c5e9c398bb8b83c7e47d14576afea71 Mon Sep 17 00:00:00 2001
+From: Shayne Chen <shayne.chen@mediatek.com>
+Date: Mon, 11 Dec 2023 17:02:05 +0800
+Subject: [PATCH 64/69] mtk: hostapd: extend ap_get_sta() to find the correct
+ sta
+
+There're still some mld address tranlation issues that need to be dealt
+with on driver side (e.g. RX eapol frames). So add the code that find
+station also with link address and across hapds at the moment.
+
+Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
+---
+ src/ap/ieee802_11.c | 1 +
+ src/ap/sta_info.c | 16 ++++++++++++++++
+ src/ap/sta_info.h | 1 +
+ 3 files changed, 18 insertions(+)
+
+diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+index f1c5c5a82..a4f1e20b7 100644
+--- a/src/ap/ieee802_11.c
++++ b/src/ap/ieee802_11.c
+@@ -3119,6 +3119,7 @@ static void handle_auth(struct hostapd_data *hapd,
+ mgmt->sa, ETH_ALEN);
+ os_memcpy(sta->mld_info.links[link_id].local_addr,
+ hapd->own_addr, ETH_ALEN);
++ os_memcpy(sta->setup_link_addr, mgmt->sa, ETH_ALEN);
+ }
+ }
+ #endif /* CONFIG_IEEE80211BE */
+diff --git a/src/ap/sta_info.c b/src/ap/sta_info.c
+index ebb23d1f1..fa81b34ac 100644
+--- a/src/ap/sta_info.c
++++ b/src/ap/sta_info.c
+@@ -73,6 +73,22 @@ struct sta_info * ap_get_sta(struct hostapd_data *hapd, const u8 *sta)
+ s = hapd->sta_hash[STA_HASH(sta)];
+ while (s != NULL && os_memcmp(s->addr, sta, 6) != 0)
+ s = s->hnext;
++
++ if (hapd->conf->mld_ap && !s) {
++ u8 link_id;
++
++ for (link_id = 0; link_id < MAX_NUM_MLD_LINKS; link_id++) {
++ struct hostapd_data *h = hostapd_mld_get_link_bss(hapd, link_id);
++
++ if (!h)
++ continue;
++
++ for (s = h->sta_list; s; s = s->next)
++ if (!os_memcmp(s->setup_link_addr, sta, 6))
++ return s;
++ }
++ }
++
+ return s;
+ }
+
+diff --git a/src/ap/sta_info.h b/src/ap/sta_info.h
+index d18dd2fcd..10ab4114f 100644
+--- a/src/ap/sta_info.h
++++ b/src/ap/sta_info.h
+@@ -102,6 +102,7 @@ struct sta_info {
+ struct sta_info *next; /* next entry in sta list */
+ struct sta_info *hnext; /* next entry in hash table list */
+ u8 addr[6];
++ u8 setup_link_addr[6];
+ be32 ipaddr;
+ struct dl_list ip6addr; /* list head for struct ip6addr */
+ u16 aid; /* STA's unique AID (1 .. 2007) or 0 if not yet assigned */
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0065-mtk-hostapd-update-cookie-only-when-noack-is-unset.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0065-mtk-hostapd-update-cookie-only-when-noack-is-unset.patch
new file mode 100644
index 0000000..5a606de
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0065-mtk-hostapd-update-cookie-only-when-noack-is-unset.patch
@@ -0,0 +1,39 @@
+From 198cde72f44444efc1036880cd038bd9c3534142 Mon Sep 17 00:00:00 2001
+From: Shayne Chen <shayne.chen@mediatek.com>
+Date: Mon, 18 Dec 2023 18:53:35 +0800
+Subject: [PATCH 65/69] mtk: hostapd: update cookie only when noack is unset
+
+This can prevent cookie unmatched problems during setup.
+
+Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
+---
+ src/drivers/driver_nl80211.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index 17774cce0..7ba021578 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -4472,7 +4472,7 @@ send_frame_cmd:
+ res = nl80211_send_frame_cmd(bss, freq, wait_time, data, data_len,
+ use_cookie, no_cck, noack, offchanok,
+ csa_offs, csa_offs_len, link_id);
+- if (!res)
++ if (!res && !noack)
+ drv->send_frame_link_id = link_id;
+
+ return res;
+@@ -9194,8 +9194,8 @@ static int nl80211_send_frame_cmd(struct i802_bss *bss,
+ "cookie 0x%llx", no_ack ? " (no ACK)" : "",
+ (long long unsigned int) cookie);
+
+- if (save_cookie)
+- drv->send_frame_cookie = no_ack ? (u64) -1 : cookie;
++ if (save_cookie && !no_ack)
++ drv->send_frame_cookie = cookie;
+
+ if (!wait) {
+ /* There is no need to store this cookie since there
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0066-mtk-wpa_s-fix-bss-selection-when-setting-mld_connect.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0066-mtk-wpa_s-fix-bss-selection-when-setting-mld_connect.patch
new file mode 100644
index 0000000..7338bc5
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0066-mtk-wpa_s-fix-bss-selection-when-setting-mld_connect.patch
@@ -0,0 +1,34 @@
+From 1a3026d455651ba9bb99f20ba7f1b07549eb7fee Mon Sep 17 00:00:00 2001
+From: Shayne Chen <shayne.chen@mediatek.com>
+Date: Fri, 29 Dec 2023 15:04:27 +0800
+Subject: [PATCH 66/69] mtk: wpa_s: fix bss selection when setting
+ mld_connect_band_pref
+
+Without this patch, when setting mld_connect_band_pref as 5g, wrong bss
+will be selected.
+
+Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
+---
+ wpa_supplicant/sme.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
+index e1183722f..5b69812b5 100644
+--- a/wpa_supplicant/sme.c
++++ b/wpa_supplicant/sme.c
+@@ -437,8 +437,11 @@ static struct wpa_bss * wpas_ml_connect_pref(struct wpa_supplicant *wpa_s,
+ }
+
+ for_each_link(wpa_s->valid_links, i) {
+- if (wpa_s->mlo_assoc_link_id == i)
++ if (wpa_s->mlo_assoc_link_id == i) {
++ if (bss->freq >= low && bss->freq <= high)
++ return bss;
+ continue;
++ }
+
+ if (wpa_s->links[i].freq >= low && wpa_s->links[i].freq <= high)
+ goto found;
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0067-mtk-hostapd-add-mld_primary-option.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0067-mtk-hostapd-add-mld_primary-option.patch
new file mode 100644
index 0000000..b48516b
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0067-mtk-hostapd-add-mld_primary-option.patch
@@ -0,0 +1,42 @@
+From 9717b3c93581752f466da137223793fc751a1f5f Mon Sep 17 00:00:00 2001
+From: Michael-CY Lee <michael-cy.lee@mediatek.com>
+Date: Tue, 26 Dec 2023 08:05:41 +0800
+Subject: [PATCH 67/69] mtk: hostapd: add mld_primary option
+
+CR-Id: WCNCR00289305
+Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
+---
+ hostapd/config_file.c | 2 ++
+ src/ap/ap_config.h | 3 +++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/hostapd/config_file.c b/hostapd/config_file.c
+index 7bc19479d..e9caa45f3 100644
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -5349,6 +5349,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ conf->punct_acs_threshold = val;
+ } else if (os_strcmp(buf, "mld_ap") == 0) {
+ bss->mld_ap = !!atoi(pos);
++ } else if (os_strcmp(buf, "mld_primary") == 0) {
++ bss->mld_primary = !!atoi(pos);
+ } else if (os_strcmp(buf, "mld_addr") == 0) {
+ if (hwaddr_aton(pos, bss->mld_addr)) {
+ wpa_printf(MSG_ERROR, "Line %d: Invalid mld_addr",
+diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
+index 7f48c71f5..1f686550e 100644
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -966,6 +966,9 @@ struct hostapd_bss_config {
+ /* The AP is part of an AP MLD */
+ u8 mld_ap;
+
++ /* The AP is the primary AP of an AP MLD */
++ u8 mld_primary;
++
+ /* The MLD ID to which the AP MLD is affiliated with */
+ u8 mld_id;
+
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0068-mtk-wpa_supplicant-add-mld_allowed_phy-configuration.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0068-mtk-wpa_supplicant-add-mld_allowed_phy-configuration.patch
new file mode 100644
index 0000000..6e58fad
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0068-mtk-wpa_supplicant-add-mld_allowed_phy-configuration.patch
@@ -0,0 +1,104 @@
+From 934ce986f46bbbb7d2b76e4ccfb7acaf76a9e2a7 Mon Sep 17 00:00:00 2001
+From: Michael-CY Lee <michael-cy.lee@mediatek.com>
+Date: Wed, 6 Mar 2024 15:01:33 +0800
+Subject: [PATCH 68/69] mtk: wpa_supplicant: add 'mld_allowed_phy'
+ configuration option for MLD STA
+
+A new configuration option named 'mld_allowed_phy' is added for MLD STA.
+This option indicates the bitmap of allowed phy for MLO connection.
+Note that setting 'mld_allowed_phy' to 0 makes no phy allowed for MLO.
+In other word, the STA becomes a legacy STA.
+
+CR-Id: WCNCR00289305
+Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
+Change-Id: I5ad15d3748c6fef476aa067cc4901157a96f8804
+---
+ wpa_supplicant/config.c | 1 +
+ wpa_supplicant/config.h | 1 +
+ wpa_supplicant/config_file.c | 2 ++
+ wpa_supplicant/sme.c | 18 ++++++++++++++++++
+ 4 files changed, 22 insertions(+)
+
+diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
+index 7bb57e2ab..d3c75ee94 100644
+--- a/wpa_supplicant/config.c
++++ b/wpa_supplicant/config.c
+@@ -5680,6 +5680,7 @@ static const struct global_parse_data global_fields[] = {
+ #endif /* CONFIG_PASN */
+ #ifdef CONFIG_TESTING_OPTIONS
+ { INT_RANGE(mld_force_single_link, 0, 1), 0 },
++ { INT_RANGE(mld_allowed_phy, 0, 7), 0 },
+ { INT_RANGE(mld_connect_band_pref, 0, MLD_CONNECT_BAND_PREF_MAX), 0 },
+ { FUNC(mld_connect_bssid_pref), 0 },
+ #endif /* CONFIG_TESTING_OPTIONS */
+diff --git a/wpa_supplicant/config.h b/wpa_supplicant/config.h
+index 8981305c2..c0164fa76 100644
+--- a/wpa_supplicant/config.h
++++ b/wpa_supplicant/config.h
+@@ -1800,6 +1800,7 @@ struct wpa_config {
+ u8 mld_connect_bssid_pref[ETH_ALEN];
+
+ int mld_force_single_link;
++ u8 mld_allowed_phy; /* bitmap of allowed phy for MLO connection */
+ #endif /* CONFIG_TESTING_OPTIONS */
+ };
+
+diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c
+index 7a3ed6373..875d00bb4 100644
+--- a/wpa_supplicant/config_file.c
++++ b/wpa_supplicant/config_file.c
+@@ -1622,6 +1622,8 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config)
+ #ifdef CONFIG_TESTING_OPTIONS
+ if (config->mld_force_single_link)
+ fprintf(f, "mld_force_single_link=1\n");
++ if (config->mld_allowed_phy)
++ fprintf(f, "mld_allowed_phy=%u\n", config->mld_allowed_phy);
+ if (config->mld_connect_band_pref != MLD_CONNECT_BAND_PREF_AUTO)
+ fprintf(f, "mld_connect_band_pref=%d\n",
+ config->mld_connect_band_pref);
+diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
+index 5b69812b5..ef258fadc 100644
+--- a/wpa_supplicant/sme.c
++++ b/wpa_supplicant/sme.c
+@@ -517,6 +517,16 @@ out:
+ }
+
+
++#ifdef CONFIG_TESTING_OPTIONS
++static bool check_mld_allowed_phy(struct wpa_supplicant *wpa_s, int freq)
++{
++ return ((wpa_s->conf->mld_allowed_phy & BIT(0)) && IS_2P4GHZ(freq)) ||
++ ((wpa_s->conf->mld_allowed_phy & BIT(1)) && IS_5GHZ(freq)) ||
++ ((wpa_s->conf->mld_allowed_phy & BIT(2)) && is_6ghz_freq(freq));
++}
++#endif /* CONFIG_TESTING_OPTIONS */
++
++
+ static void wpas_sme_set_mlo_links(struct wpa_supplicant *wpa_s,
+ struct wpa_bss *bss)
+ {
+@@ -528,6 +538,11 @@ static void wpas_sme_set_mlo_links(struct wpa_supplicant *wpa_s,
+ for_each_link(bss->valid_links, i) {
+ const u8 *bssid = bss->mld_links[i].bssid;
+
++#ifdef CONFIG_TESTING_OPTIONS
++ if (!check_mld_allowed_phy(wpa_s, bss->mld_links[i].freq))
++ continue;
++#endif /* CONFIG_TESTING_OPTIONS */
++
+ wpa_s->valid_links |= BIT(i);
+ os_memcpy(wpa_s->links[i].bssid, bssid, ETH_ALEN);
+ wpa_s->links[i].freq = bss->mld_links[i].freq;
+@@ -577,6 +592,9 @@ static void sme_send_authentication(struct wpa_supplicant *wpa_s,
+ if ((wpa_s->drv_flags2 & WPA_DRIVER_FLAGS2_MLO) &&
+ !wpa_bss_parse_basic_ml_element(wpa_s, bss, wpa_s->ap_mld_addr,
+ NULL, ssid, NULL) &&
++#ifdef CONFIG_TESTING_OPTIONS
++ wpa_s->conf->mld_allowed_phy &&
++#endif /* CONFIG_TESTING_OPTIONS */
+ bss->valid_links) {
+ wpa_printf(MSG_DEBUG, "MLD: In authentication");
+ wpas_sme_set_mlo_links(wpa_s, bss);
+--
+2.39.2
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0069-mtk-hostapd-support-band_idx-option-for-set_mu-get_m.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0069-mtk-hostapd-support-band_idx-option-for-set_mu-get_m.patch
new file mode 100644
index 0000000..936ff92
--- /dev/null
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0069-mtk-hostapd-support-band_idx-option-for-set_mu-get_m.patch
@@ -0,0 +1,286 @@
+From 4969fa2bae91fde39e7114aa9636657459f59991 Mon Sep 17 00:00:00 2001
+From: Howard Hsu <howard-yh.hsu@mediatek.com>
+Date: Thu, 29 Feb 2024 19:55:34 +0800
+Subject: [PATCH 69/69] mtk: hostapd: support band_idx option for set_mu/get_mu
+ vendor command
+
+Support band_idx for set_mu and get_mu vendor command. The usage shows
+as below:
+1. get_mu: $ hostapd_cli -i <intf> get_mu <band_idx>
+2. set_mu: $ hostapd_cli -i <intf> set_mu <mu_onff>:<band_idx>
+
+CR-Id: WCNCR00240772
+Signed-off-by: Howard Hsu <howard-yh.hsu@mediatek.com>
+Change-Id: I58635e588225a8876a77346c417ec281f9b76e4c
+---
+ hostapd/config_file.c | 9 +++++
+ hostapd/ctrl_iface.c | 78 ++++++++++++++++++++++++++++--------
+ hostapd/hostapd_cli.c | 2 +-
+ src/ap/ap_config.h | 1 +
+ src/ap/ap_drv_ops.c | 2 +-
+ src/common/mtk_vendor.h | 1 +
+ src/drivers/driver.h | 2 +-
+ src/drivers/driver_nl80211.c | 15 +++----
+ 8 files changed, 82 insertions(+), 28 deletions(-)
+
+diff --git a/hostapd/config_file.c b/hostapd/config_file.c
+index e9caa45f3..ef9bafb28 100644
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -5431,6 +5431,15 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+ return 1;
+ }
+ conf->pp_mode = (u8) val;
++ } else if (os_strcmp(buf, "band_idx") == 0) {
++ int val = atoi(pos);
++
++ if (val < 0) {
++ wpa_printf(MSG_ERROR, "Line %d: invalid band_idx value",
++ line);
++ return 1;
++ }
++ conf->band_idx = (u8) val;
+ } else {
+ wpa_printf(MSG_ERROR,
+ "Line %d: unknown configuration item '%s'",
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index 63655b149..18d7520b3 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -4199,17 +4199,42 @@ hostapd_ctrl_iface_set_mu(struct hostapd_data *hapd, char *cmd,
+ value = pos;
+
+ if (os_strcmp(config, "onoff") == 0) {
+- int mu = atoi(value);
+- if (mu < 0 || mu > 15) {
+- wpa_printf(MSG_ERROR, "Invalid value for mu");
+- return -1;
++ cnt = hostapd_parse_argument_helper(value, &val);
++ if (cnt == -1)
++ goto fail;
++ if (cnt < 1 || val[0] > 15)
++ goto para_fail;
++
++ if (hostapd_is_mld_ap(hapd)) {
++ u8 band_idx;
++
++ if (cnt != 2)
++ goto para_fail;
++
++ band_idx = val[1];
++
++ for (i = 0; i < hapd->iface->interfaces->count; i++) {
++ struct hostapd_iface *iface;
++
++ iface = hapd->iface->interfaces->iface[i];
++ if (!iface || !iface->conf)
++ continue;
++
++ if (iface->conf->band_idx == band_idx) {
++ hapd = iface->bss[0];
++ break;
++ }
++ }
++ if (hapd->iface->conf->band_idx != band_idx)
++ goto para_fail;
+ }
+- hapd->iconf->mu_onoff = (u8) mu;
+
+- if (hostapd_drv_mu_ctrl(hapd, MU_CTRL_ONOFF) == 0)
+- return os_snprintf(buf, buflen, "OK\n");
+- else
++ hapd->iconf->mu_onoff = val[0];
++ os_free(val);
++ if (hostapd_drv_mu_ctrl(hapd, MU_CTRL_ONOFF) != 0)
+ goto fail;
++
++ return os_snprintf(buf, buflen, "OK\n");
+ }
+
+ if (hapd->iconf->muru_config == NULL)
+@@ -4221,6 +4246,7 @@ hostapd_ctrl_iface_set_mu(struct hostapd_data *hapd, char *cmd,
+ comm = &muru->comm;
+
+ if (os_strncmp(config, "update", 6) == 0) {
++ // [ToDo] "update" needs to support band_idx argument
+ ret = hostapd_drv_mu_ctrl(hapd, MU_CTRL_UPDATE);
+
+ os_free(hapd->iconf->muru_config);
+@@ -4363,15 +4389,14 @@ hostapd_ctrl_iface_set_mu(struct hostapd_data *hapd, char *cmd,
+
+ para_fail:
+ os_free(val);
+- wpa_printf(MSG_ERROR, "Incorrect input number\n");
++ wpa_printf(MSG_ERROR, "Input number or value is incorrect\n");
+ fail:
+ return os_snprintf(buf, buflen, "FAIL\n");
+ }
+
+-
+ static int
+-hostapd_ctrl_iface_get_mu(struct hostapd_data *hapd, char *buf,
+- size_t buflen)
++hostapd_ctrl_iface_get_mu(struct hostapd_data *hapd, char *input, char *buf,
++ size_t buflen)
+ {
+ u8 mu_onoff;
+ char *pos, *end;
+@@ -4379,14 +4404,35 @@ hostapd_ctrl_iface_get_mu(struct hostapd_data *hapd, char *buf,
+ pos = buf;
+ end = buf + buflen;
+
++ if (hostapd_is_mld_ap(hapd)) {
++ u8 band_idx, i;
++
++ band_idx = (u8)atoi(input);
++
++ for (i = 0; i < hapd->iface->interfaces->count; i++) {
++ struct hostapd_iface *iface;
++
++ iface = hapd->iface->interfaces->iface[i];
++ if (!iface || !iface->conf)
++ continue;
++
++ if (iface->conf->band_idx == band_idx) {
++ hapd = iface->bss[0];
++ break;
++ }
++ }
++ if (hapd->iface->conf->band_idx != band_idx)
++ return os_snprintf(pos, end - pos, "Invalid band idx to get_mu\n");
++ }
++
+ if (hapd->iface->state != HAPD_IFACE_ENABLED)
+ return os_snprintf(pos, end - pos, "Not allowed to get_mu when current state is %s\n",
+ hostapd_state_text(hapd->iface->state));
+
+ if (hostapd_drv_mu_dump(hapd, &mu_onoff) == 0) {
+ hapd->iconf->mu_onoff = mu_onoff;
+- return os_snprintf(pos, end - pos, "[hostapd_cli] = UL MU-MIMO: %d, DL MU-MIMO: %d, UL OFDMA: %d, DL OFDMA: %d\n",
+- !!(mu_onoff&BIT(3)), !!(mu_onoff&BIT(2)), !!(mu_onoff&BIT(1)), !!(mu_onoff&BIT(0)));
++ return os_snprintf(pos, end - pos, "Band idx %u: UL MU-MIMO: %d, DL MU-MIMO: %d, UL OFDMA: %d, DL OFDMA: %d\n",
++ hapd->iconf->band_idx, !!(mu_onoff&BIT(3)), !!(mu_onoff&BIT(2)), !!(mu_onoff&BIT(1)), !!(mu_onoff&BIT(0)));
+ } else {
+ wpa_printf(MSG_INFO, "ctrl iface failed to call");
+ return -1;
+@@ -5509,8 +5555,8 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ reply_size);
+ } else if (os_strncmp(buf, "SET_MU ", 7) == 0) {
+ reply_len = hostapd_ctrl_iface_set_mu(hapd, buf + 7, reply, reply_size);
+- } else if (os_strncmp(buf, "GET_MU", 6) == 0) {
+- reply_len = hostapd_ctrl_iface_get_mu(hapd, reply, reply_size);
++ } else if (os_strncmp(buf, "GET_MU ", 7) == 0) {
++ reply_len = hostapd_ctrl_iface_get_mu(hapd, buf + 7, reply, reply_size);
+ } else if (os_strncmp(buf, "GET_IBF", 7) == 0) {
+ reply_len = hostapd_ctrl_iface_get_ibf(hapd, reply, reply_size);
+ } else if (os_strncmp(buf, "DFS_DETECT_MODE ", 16) == 0) {
+diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
+index 7e4485cb8..100896c34 100644
+--- a/hostapd/hostapd_cli.c
++++ b/hostapd/hostapd_cli.c
+@@ -1461,7 +1461,7 @@ static int hostapd_cli_cmd_set_mu(struct wpa_ctrl *ctrl, int argc,
+ static int hostapd_cli_cmd_get_mu(struct wpa_ctrl *ctrl, int argc,
+ char *argv[])
+ {
+- return hostapd_cli_cmd(ctrl, "GET_MU", 0, NULL, NULL);
++ return hostapd_cli_cmd(ctrl, "GET_MU", 0, argc, argv);
+ }
+
+ static int hostapd_cli_cmd_disable_beacon(struct wpa_ctrl *ctrl, int argc,
+diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
+index 1f686550e..3bd8df9ce 100644
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -1298,6 +1298,7 @@ struct hostapd_config {
+ u8 amsdu;
+ void *muru_config;
+ u8 pp_mode;
++ u8 band_idx;
+ };
+
+ enum three_wire_mode {
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index 12d0fb985..e0757d050 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -1252,7 +1252,7 @@ int hostapd_drv_mu_dump(struct hostapd_data *hapd, u8 *mu_onoff)
+ {
+ if (!hapd->driver || !hapd->driver->mu_dump)
+ return 0;
+- return hapd->driver->mu_dump(hapd->drv_priv, mu_onoff);
++ return hapd->driver->mu_dump(hapd->drv_priv, mu_onoff, hapd->iconf->band_idx);
+ }
+
+ int hostapd_drv_three_wire_ctrl(struct hostapd_data *hapd)
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+index 5531802b8..1e4c3670e 100644
+--- a/src/common/mtk_vendor.h
++++ b/src/common/mtk_vendor.h
+@@ -207,6 +207,7 @@ enum mtk_vendor_attr_mu_ctrl {
+ * above data structure.
+ */
+ MTK_VENDOR_ATTR_MU_CTRL_STRUCT,
++ MTK_VENDOR_ATTR_MU_CTRL_BAND_IDX,
+
+ /* keep last */
+ NUM_MTK_VENDOR_ATTRS_MU_CTRL,
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index dbe32517e..05b9aad52 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -5204,7 +5204,7 @@ struct wpa_driver_ops {
+ *
+ */
+ int (*mu_ctrl)(void *priv, u8 mode, void *config);
+- int (*mu_dump)(void *priv, u8 *mu_onoff);
++ int (*mu_dump)(void *priv, u8 *mu_onoff, u8 band_idx);
+
+ /**
+ * beacon_ctrl - ctrl on off for beacon
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index 7ba021578..301e07691 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -13922,7 +13922,8 @@ static int nl80211_mu_ctrl(void *priv, u8 mode, void *config)
+
+ switch (mode) {
+ case MU_CTRL_ONOFF:
+- if (nla_put_u8(msg, MTK_VENDOR_ATTR_MU_CTRL_ONOFF, cfg->mu_onoff))
++ if (nla_put_u8(msg, MTK_VENDOR_ATTR_MU_CTRL_ONOFF, cfg->mu_onoff) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_MU_CTRL_BAND_IDX, cfg->band_idx))
+ goto fail;
+ break;
+ case MU_CTRL_UPDATE:
+@@ -13986,7 +13987,7 @@ static int mu_dump_handler(struct nl_msg *msg, void *arg)
+ return 0;
+ }
+
+-static int nl80211_mu_dump(void *priv, u8 *mu_onoff)
++static int nl80211_mu_dump(void *priv, u8 *mu_onoff, u8 band_idx)
+ {
+ struct i802_bss *bss = priv;
+ struct wpa_driver_nl80211_data *drv = bss->drv;
+@@ -14002,17 +14003,13 @@ static int nl80211_mu_dump(void *priv, u8 *mu_onoff)
+
+ if (!(msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_VENDOR)) ||
+ nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
+- nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, MTK_NL80211_VENDOR_SUBCMD_MU_CTRL)) {
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, MTK_NL80211_VENDOR_SUBCMD_MU_CTRL) ||
++ !(attr = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_MU_CTRL_BAND_IDX, band_idx)) {
+ nlmsg_free(msg);
+ return -ENOBUFS;
+ }
+
+- attr = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA);
+- if (!attr) {
+- nlmsg_free(msg);
+- return -1;
+- }
+-
+ nla_nest_end(msg, attr);
+
+ ret = send_and_recv_resp(drv, msg, mu_dump_handler, mu_onoff);
+--
+2.39.2
+