Merge branch 'feature/wifi_kconfig_merge' into 'master'

esp_wifi: Merge wpa_supplicant and esp_wifi Kconfig

Closes WIFI-4541 and IDF-1830

See merge request espressif/esp-idf!18998

components/bt/controller/esp32c3/Kconfig.in

@@ -315,7 +315,7 @@ config BT_CTRL_MESH_DUPL_SCAN_CACHE_SIZE
 choice BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM
     prompt "Coexistence: limit on MAX Tx/Rx time for coded-PHY connection"
     default BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_DIS
-    depends on ESP32_WIFI_SW_COEXIST_ENABLE
+    depends on ESP_WIFI_SW_COEXIST_ENABLE
     help
         When using PHY-Coded in BLE connection, limitation on max tx/rx time can be applied to
         better avoid dramatic performance deterioration of Wi-Fi.
@@ -333,7 +333,7 @@ endchoice
 
 config BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_EFF
     int
-    default 0 if (!ESP32_WIFI_SW_COEXIST_ENABLE)
+    default 0 if (!ESP_WIFI_SW_COEXIST_ENABLE)
     default 1 if BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_EN
     default 0 if BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_DIS
 

components/bt/controller/esp32s3/Kconfig.in

@@ -332,7 +332,7 @@ config BT_CTRL_MESH_DUPL_SCAN_CACHE_SIZE
 choice BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM
     prompt "Coexistence: limit on MAX Tx/Rx time for coded-PHY connection"
     default BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_DIS
-    depends on ESP32_WIFI_SW_COEXIST_ENABLE
+    depends on ESP_WIFI_SW_COEXIST_ENABLE
     help
         When using PHY-Coded in BLE connection, limitation on max tx/rx time can be applied to
         better avoid dramatic performance deterioration of Wi-Fi.
@@ -350,7 +350,7 @@ endchoice
 
 config BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_EFF
     int
-    default 0 if (!ESP32_WIFI_SW_COEXIST_ENABLE)
+    default 0 if (!ESP_WIFI_SW_COEXIST_ENABLE)
     default 1 if BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_EN
     default 0 if BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_DIS
 

components/bt/host/nimble/Kconfig.in

@@ -602,7 +602,7 @@ config BT_NIMBLE_BLE_POWER_CONTROL
 choice BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM
     prompt "Coexistence: limit on MAX Tx/Rx time for coded-PHY connection"
     default BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_DIS
-    depends on ESP32_WIFI_SW_COEXIST_ENABLE && BT_NIMBLE_ENABLED
+    depends on ESP_WIFI_SW_COEXIST_ENABLE && BT_NIMBLE_ENABLED
     help
             When using PHY-Coded in BLE connection, limitation on max tx/rx time can be applied to
             better avoid dramatic performance deterioration of Wi-Fi.
@@ -620,7 +620,7 @@ endchoice
 
 config BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EFF
     int
-    default 0 if !(ESP32_WIFI_SW_COEXIST_ENABLE && BT_NIMBLE_ENABLED)
+    default 0 if !(ESP_WIFI_SW_COEXIST_ENABLE && BT_NIMBLE_ENABLED)
     default 1 if BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EN
     default 0 if BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_DIS
 

components/esp_hw_support/linker.lf

@@ -25,7 +25,7 @@ entries:
         rtc_wdt (noflash_text)
     if PERIPH_CTRL_FUNC_IN_IRAM = y:
         periph_ctrl: periph_module_reset (noflash)
-    if PERIPH_CTRL_FUNC_IN_IRAM = y && ESP32_WIFI_ENABLED = y:
+    if PERIPH_CTRL_FUNC_IN_IRAM = y && ESP_WIFI_ENABLED = y:
         periph_ctrl: wifi_module_enable (noflash)
         periph_ctrl: wifi_module_disable (noflash)
     if GDMA_CTRL_FUNC_IN_IRAM = y:

components/esp_hw_support/mac_addr.c

@@ -39,7 +39,7 @@ typedef struct {
 } mac_t;
 
 static mac_t s_mac_table[] = {
-#ifdef CONFIG_ESP32_WIFI_ENABLED
+#ifdef CONFIG_ESP_WIFI_ENABLED
     {ESP_MAC_WIFI_STA,      STATE_INIT, 6,                   {0}},
     {ESP_MAC_WIFI_SOFTAP,   STATE_INIT, 6,                   {0}},
 #endif

components/esp_hw_support/periph_ctrl.c

@@ -76,7 +76,7 @@ IRAM_ATTR void wifi_bt_common_module_disable(void)
 }
 #endif
 
-#if CONFIG_ESP32_WIFI_ENABLED
+#if CONFIG_ESP_WIFI_ENABLED
 void wifi_module_enable(void)
 {
 #if SOC_MODEM_CLOCK_IS_INDEPENDENT
@@ -98,4 +98,4 @@ void wifi_module_disable(void)
     portEXIT_CRITICAL_SAFE(&periph_spinlock);
 #endif
 }
-#endif // CONFIG_ESP32_WIFI_ENABLED
+#endif // CONFIG_ESP_WIFI_ENABLED

components/esp_netif/test_apps/test_app_esp_netif/main/esp_netif_test.c

@@ -129,7 +129,7 @@ TEST(esp_netif, create_delete_multiple_netifs)
 
 }
 
-#ifdef CONFIG_ESP32_WIFI_ENABLED
+#ifdef CONFIG_ESP_WIFI_ENABLED
 TEST(esp_netif, dhcp_client_state_transitions_wifi_sta)
 {
     // init default wifi netif
@@ -176,9 +176,9 @@ TEST(esp_netif, dhcp_client_state_transitions_wifi_sta)
     TEST_ASSERT(esp_wifi_deinit() == ESP_OK);
     nvs_flash_deinit();
 }
-#endif // CONFIG_ESP32_WIFI_ENABLED
+#endif // CONFIG_ESP_WIFI_ENABLED
 
-#if defined(CONFIG_ESP32_WIFI_ENABLED) && defined(CONFIG_ESP_WIFI_SOFTAP_SUPPORT)
+#if defined(CONFIG_ESP_WIFI_ENABLED) && defined(CONFIG_ESP_WIFI_SOFTAP_SUPPORT)
 TEST(esp_netif, dhcp_server_state_transitions_wifi_ap)
 {
     // init default wifi netif
@@ -282,9 +282,9 @@ TEST(esp_netif, dhcp_server_state_transitions_mesh)
     TEST_ASSERT(esp_wifi_deinit() == ESP_OK);
     nvs_flash_deinit();
 }
-#endif // CONFIG_ESP32_WIFI_ENABLED && CONFIG_ESP_WIFI_SOFTAP_SUPPORT
+#endif // CONFIG_ESP_WIFI_ENABLED && CONFIG_ESP_WIFI_SOFTAP_SUPPORT
 
-#ifdef CONFIG_ESP32_WIFI_ENABLED
+#ifdef CONFIG_ESP_WIFI_ENABLED
 TEST(esp_netif, create_custom_wifi_interfaces)
 {
     esp_netif_t *ap = NULL;
@@ -389,7 +389,7 @@ TEST(esp_netif, get_set_hostname)
 
     esp_netif_destroy(esp_netif);
 }
-#endif // CONFIG_ESP32_WIFI_ENABLED
+#endif // CONFIG_ESP_WIFI_ENABLED
 
 static esp_err_t dummy_transmit(void* hd, void *buf, size_t length)
 {
@@ -461,18 +461,18 @@ TEST_GROUP_RUNNER(esp_netif)
     RUN_TEST_CASE(esp_netif, convert_ip_addresses)
     RUN_TEST_CASE(esp_netif, get_from_if_key)
     RUN_TEST_CASE(esp_netif, create_delete_multiple_netifs)
-#ifdef CONFIG_ESP32_WIFI_ENABLED
+#ifdef CONFIG_ESP_WIFI_ENABLED
     RUN_TEST_CASE(esp_netif, create_custom_wifi_interfaces)
     RUN_TEST_CASE(esp_netif, create_destroy_default_wifi)
 #endif
     /**
      * After follow tests which start lwIP and thus expect some mem-leaks by TCP/IP stack
      */
-#ifdef CONFIG_ESP32_WIFI_ENABLED
+#ifdef CONFIG_ESP_WIFI_ENABLED
     RUN_TEST_CASE(esp_netif, get_set_hostname)
     RUN_TEST_CASE(esp_netif, dhcp_client_state_transitions_wifi_sta)
 #endif
-#if defined(CONFIG_ESP32_WIFI_ENABLED) && defined(CONFIG_ESP_WIFI_SOFTAP_SUPPORT)
+#if defined(CONFIG_ESP_WIFI_ENABLED) && defined(CONFIG_ESP_WIFI_SOFTAP_SUPPORT)
     RUN_TEST_CASE(esp_netif, dhcp_server_state_transitions_wifi_ap)
     RUN_TEST_CASE(esp_netif, dhcp_server_state_transitions_mesh)
 #endif

components/esp_wifi/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(CONFIG_ESP32_WIFI_ENABLED)
+if(CONFIG_ESP_WIFI_ENABLED)
     idf_build_get_property(idf_target IDF_TARGET)
 
     if(CONFIG_APP_NO_BLOBS)
@@ -39,7 +39,7 @@ idf_component_register(SRCS "${srcs}"
                                   wpa_supplicant hal lwip ${extra_priv_requires}
                     LDFRAGMENTS "${ldfragments}")
 
-if(CONFIG_ESP32_WIFI_ENABLED)
+if(CONFIG_ESP_WIFI_ENABLED)
     idf_build_get_property(build_dir BUILD_DIR)
 
     set(target_name "${idf_target}")

components/esp_wifi/Kconfig

@@ -2,13 +2,13 @@
 menu "Wi-Fi"
     visible if !IDF_TARGET_ESP32H4
 
-    config ESP32_WIFI_ENABLED
+    config ESP_WIFI_ENABLED
         bool
         default y if SOC_WIFI_SUPPORTED
 
-    config ESP32_WIFI_SW_COEXIST_ENABLE
+    config ESP_WIFI_SW_COEXIST_ENABLE
         bool "Software controls WiFi/Bluetooth coexistence"
-        depends on ESP32_WIFI_ENABLED && BT_ENABLED
+        depends on ESP_WIFI_ENABLED && BT_ENABLED
         default y
         select ESP_WIFI_STA_DISCONNECTED_PM_ENABLE
         help
@@ -18,7 +18,7 @@ menu "Wi-Fi"
             If only Bluetooth is used, it is recommended to disable this option to reduce binary file
             size.
 
-    config ESP32_WIFI_STATIC_RX_BUFFER_NUM
+    config ESP_WIFI_STATIC_RX_BUFFER_NUM
         int "Max number of WiFi static RX buffers"
         range 2 25 if !SOC_WIFI_HE_SUPPORT
         range 2 128 if SOC_WIFI_HE_SUPPORT
@@ -30,11 +30,11 @@ menu "Wi-Fi"
             until esp_wifi_deinit is called.
 
             WiFi hardware use these buffers to receive all 802.11 frames.
-            A higher number may allow higher throughput but increases memory use. If ESP32_WIFI_AMPDU_RX_ENABLED
-            is enabled, this value is recommended to set equal or bigger than ESP32_WIFI_RX_BA_WIN in order to
+            A higher number may allow higher throughput but increases memory use. If ESP_WIFI_AMPDU_RX_ENABLED
+            is enabled, this value is recommended to set equal or bigger than ESP_WIFI_RX_BA_WIN in order to
             achieve better throughput and compatibility with both stations and APs.
 
-    config ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM
+    config ESP_WIFI_DYNAMIC_RX_BUFFER_NUM
         int "Max number of WiFi dynamic RX buffers"
         range 0 128 if !LWIP_WND_SCALE
         range 0 1024 if LWIP_WND_SCALE
@@ -53,9 +53,9 @@ menu "Wi-Fi"
 
             If a dynamic RX buffer limit is set, it should be at least the number of static RX buffers.
 
-    choice ESP32_WIFI_TX_BUFFER
+    choice ESP_WIFI_TX_BUFFER
         prompt "Type of WiFi TX buffers"
-        default ESP32_WIFI_DYNAMIC_TX_BUFFER
+        default ESP_WIFI_DYNAMIC_TX_BUFFER
         help
             Select type of WiFi TX buffers:
 
@@ -70,21 +70,21 @@ menu "Wi-Fi"
             If PSRAM is enabled, "Static" should be selected to guarantee enough WiFi TX buffers.
             If PSRAM is disabled, "Dynamic" should be selected to improve the utilization of RAM.
 
-        config ESP32_WIFI_STATIC_TX_BUFFER
+        config ESP_WIFI_STATIC_TX_BUFFER
             bool "Static"
-        config ESP32_WIFI_DYNAMIC_TX_BUFFER
+        config ESP_WIFI_DYNAMIC_TX_BUFFER
             bool "Dynamic"
             depends on !SPIRAM_USE_MALLOC
     endchoice
 
-    config ESP32_WIFI_TX_BUFFER_TYPE
+    config ESP_WIFI_TX_BUFFER_TYPE
         int
-        default 0 if ESP32_WIFI_STATIC_TX_BUFFER
-        default 1 if ESP32_WIFI_DYNAMIC_TX_BUFFER
+        default 0 if ESP_WIFI_STATIC_TX_BUFFER
+        default 1 if ESP_WIFI_DYNAMIC_TX_BUFFER
 
-    config ESP32_WIFI_STATIC_TX_BUFFER_NUM
+    config ESP_WIFI_STATIC_TX_BUFFER_NUM
         int "Max number of WiFi static TX buffers"
-        depends on ESP32_WIFI_STATIC_TX_BUFFER
+        depends on ESP_WIFI_STATIC_TX_BUFFER
         range 1 64
         default 16
         help
@@ -97,7 +97,7 @@ menu "Wi-Fi"
             layer can deliver frames faster than WiFi layer can transmit. In these cases, we may run out
             of TX buffers.
 
-    config ESP32_WIFI_CACHE_TX_BUFFER_NUM
+    config ESP_WIFI_CACHE_TX_BUFFER_NUM
         int "Max number of WiFi cache TX buffers"
         depends on SPIRAM
         range 16 128
@@ -110,9 +110,9 @@ menu "Wi-Fi"
             it caches the uplayer packets to a dedicated buffer queue, this option is used to configure the
             size of the cached TX queue.
 
-    config ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM
+    config ESP_WIFI_DYNAMIC_TX_BUFFER_NUM
         int "Max number of WiFi dynamic TX buffers"
-        depends on ESP32_WIFI_DYNAMIC_TX_BUFFER
+        depends on ESP_WIFI_DYNAMIC_TX_BUFFER
         range 1 128
         default 32
         help
@@ -124,25 +124,25 @@ menu "Wi-Fi"
             can deliver frames faster than WiFi layer can transmit. In these cases, we may run out of TX
             buffers.
 
-    config ESP32_WIFI_CSI_ENABLED
+    config ESP_WIFI_CSI_ENABLED
         bool "WiFi CSI(Channel State Information)"
         depends on SOC_WIFI_CSI_SUPPORT
         default n
         help
             Select this option to enable CSI(Channel State Information) feature. CSI takes about
-            CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM KB of RAM. If CSI is not used, it is better to disable
+            CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM KB of RAM. If CSI is not used, it is better to disable
             this feature in order to save memory.
 
-    config ESP32_WIFI_AMPDU_TX_ENABLED
+    config ESP_WIFI_AMPDU_TX_ENABLED
         bool "WiFi AMPDU TX"
         default y
         help
             Select this option to enable AMPDU TX feature
 
 
-    config ESP32_WIFI_TX_BA_WIN
+    config ESP_WIFI_TX_BA_WIN
         int "WiFi AMPDU TX BA window size"
-        depends on ESP32_WIFI_AMPDU_TX_ENABLED
+        depends on ESP_WIFI_AMPDU_TX_ENABLED
         range 2 32 if !SOC_WIFI_HE_SUPPORT
         range 2 64 if SOC_WIFI_HE_SUPPORT
         default 6
@@ -152,15 +152,15 @@ menu "Wi-Fi"
             test the maximum UDP TX throughput with iperf etc. For iperf test in shieldbox, the recommended
             value is 9~12.
 
-    config ESP32_WIFI_AMPDU_RX_ENABLED
+    config ESP_WIFI_AMPDU_RX_ENABLED
         bool "WiFi AMPDU RX"
         default y
         help
             Select this option to enable AMPDU RX feature
 
-    config ESP32_WIFI_RX_BA_WIN
+    config ESP_WIFI_RX_BA_WIN
         int "WiFi AMPDU RX BA window size"
-        depends on ESP32_WIFI_AMPDU_RX_ENABLED
+        depends on ESP_WIFI_AMPDU_RX_ENABLED
         range 2 32 if !SOC_WIFI_HE_SUPPORT
         range 2 64 if SOC_WIFI_HE_SUPPORT
         default 6 if !SPIRAM_TRY_ALLOCATE_WIFI_LWIP
@@ -173,33 +173,33 @@ menu "Wi-Fi"
             the default and minimum value should be 16 to achieve better throughput and compatibility with both
             stations and APs.
 
-    config ESP32_WIFI_AMSDU_TX_ENABLED
+    config ESP_WIFI_AMSDU_TX_ENABLED
         bool "WiFi AMSDU TX"
         depends on SPIRAM
         default n
         help
             Select this option to enable AMSDU TX feature
 
-    config ESP32_WIFI_NVS_ENABLED
+    config ESP_WIFI_NVS_ENABLED
         bool "WiFi NVS flash"
         default y
         help
             Select this option to enable WiFi NVS flash
 
-    choice ESP32_WIFI_TASK_CORE_ID
+    choice ESP_WIFI_TASK_CORE_ID
         depends on !FREERTOS_UNICORE
         prompt "WiFi Task Core ID"
-        default ESP32_WIFI_TASK_PINNED_TO_CORE_0
+        default ESP_WIFI_TASK_PINNED_TO_CORE_0
         help
             Pinned WiFi task to core 0 or core 1.
 
-        config ESP32_WIFI_TASK_PINNED_TO_CORE_0
+        config ESP_WIFI_TASK_PINNED_TO_CORE_0
             bool "Core 0"
-        config ESP32_WIFI_TASK_PINNED_TO_CORE_1
+        config ESP_WIFI_TASK_PINNED_TO_CORE_1
             bool "Core 1"
     endchoice
 
-    config ESP32_WIFI_SOFTAP_BEACON_MAX_LEN
+    config ESP_WIFI_SOFTAP_BEACON_MAX_LEN
         int "Max length of WiFi SoftAP Beacon"
         range 752 1256
         default 752
@@ -221,14 +221,14 @@ menu "Wi-Fi"
             Setting a longer beacon length also assists with debugging as the conflicting root nodes can be identified
             more quickly.
 
-    config ESP32_WIFI_MGMT_SBUF_NUM
+    config ESP_WIFI_MGMT_SBUF_NUM
         int "WiFi mgmt short buffer number"
         range 6 32
         default 32
         help
             Set the number of WiFi management short buffer.
 
-    config ESP32_WIFI_IRAM_OPT
+    config ESP_WIFI_IRAM_OPT
         bool "WiFi IRAM speed optimization"
         default n if (BT_ENABLED && SPIRAM && IDF_TARGET_ESP32)
         default y
@@ -237,7 +237,7 @@ menu "Wi-Fi"
             When this option is disabled, more than 10Kbytes of IRAM memory will be saved
             but Wi-Fi throughput will be reduced.
 
-    config ESP32_WIFI_RX_IRAM_OPT
+    config ESP_WIFI_RX_IRAM_OPT
         bool "WiFi RX IRAM speed optimization"
         default n if (BT_ENABLED && SPIRAM && IDF_TARGET_ESP32)
         default y
@@ -246,19 +246,19 @@ menu "Wi-Fi"
             When this option is disabled, more than 17Kbytes of IRAM memory will be saved
             but Wi-Fi performance will be reduced.
 
-    config ESP32_WIFI_ENABLE_WPA3_SAE
+    config ESP_WIFI_ENABLE_WPA3_SAE
         bool "Enable WPA3-Personal"
         default y
-        depends on WPA_MBEDTLS_CRYPTO
+        depends on ESP_WIFI_MBEDTLS_CRYPTO
         help
             Select this option to allow the device to establish a WPA3-Personal connection with eligible AP's.
             PMF (Protected Management Frames) is a prerequisite feature for a WPA3 connection, it needs to be
             explicitly configured before attempting connection. Please refer to the Wi-Fi Driver API Guide for details.
 
-    config ESP32_WIFI_ENABLE_WPA3_OWE_STA
+    config ESP_WIFI_ENABLE_WPA3_OWE_STA
         bool "Enable OWE STA"
         default y
-        select WPA_MBEDTLS_CRYPTO
+        select ESP_WIFI_MBEDTLS_CRYPTO
         help
             Select this option to allow the device to establish OWE connection with eligible AP's.
             PMF (Protected Management Frames) is a prerequisite feature for a WPA3 connection, it needs to be
@@ -270,9 +270,9 @@ menu "Wi-Fi"
         select PERIPH_CTRL_FUNC_IN_IRAM
         help
             Select this option to place called Wi-Fi library TBTT process and receive beacon functions in IRAM.
-            Some functions can be put in IRAM either by ESP32_WIFI_IRAM_OPT and ESP32_WIFI_RX_IRAM_OPT, or this one.
-            If already enabled ESP32_WIFI_IRAM_OPT, the other 7.3KB IRAM memory would be taken by this option.
-            If already enabled ESP32_WIFI_RX_IRAM_OPT, the other 1.3KB IRAM memory would be taken by this option.
+            Some functions can be put in IRAM either by ESP_WIFI_IRAM_OPT and ESP_WIFI_RX_IRAM_OPT, or this one.
+            If already enabled ESP_WIFI_IRAM_OPT, the other 7.3KB IRAM memory would be taken by this option.
+            If already enabled ESP_WIFI_RX_IRAM_OPT, the other 1.3KB IRAM memory would be taken by this option.
             If neither of them are enabled, the other 7.4KB IRAM memory would be taken by this option.
             Wi-Fi power-save mode average current would be reduced if this option is enabled.
 
@@ -410,6 +410,107 @@ menu "Wi-Fi"
             Enable Wi-Fi transmission statistics. Total support 4 access category. Each access category
             will use 346 bytes memory.
 
+    config ESP_WIFI_MBEDTLS_CRYPTO
+        bool "Use MbedTLS crypto APIs"
+        default y
+        select MBEDTLS_AES_C
+        select MBEDTLS_ECP_C
+        select MBEDTLS_ECDH_C
+        select MBEDTLS_ECDSA_C
+        select MBEDTLS_TLS_ENABLED
+        help
+            Select this option to use MbedTLS crypto APIs which utilize hardware acceleration.
+
+    if ESP_WIFI_MBEDTLS_CRYPTO
+        config ESP_WIFI_MBEDTLS_TLS_CLIENT
+            bool "Use MbedTLS TLS client for WiFi Enterprise connection"
+            default y
+            select MBEDTLS_TLS_ENABLED
+            help
+                Select this option to use MbedTLS TLS client for WPA2 enterprise connection.
+                Please note that from MbedTLS-3.0 onwards, MbedTLS does not support SSL-3.0
+                TLS-v1.0, TLS-v1.1 versions. Incase your server is using one of these version,
+                it is advisable to update your server.
+                Please disable this option for compatibilty with older TLS versions.
+    endif
+
+    config ESP_WIFI_WAPI_PSK
+        bool "Enable WAPI PSK support"
+        depends on SOC_WIFI_WAPI_SUPPORT
+        default n
+        help
+            Select this option to enable WAPI-PSK
+            which is a Chinese National Standard Encryption for Wireless LANs (GB 15629.11-2003).
+
+    config ESP_WIFI_SUITE_B_192
+        bool "Enable NSA suite B support with 192 bit key"
+        default n
+        select ESP_WIFI_GCMP_SUPPORT
+        select ESP_WIFI_GMAC_SUPPORT
+        help
+            Select this option to enable 192 bit NSA suite-B.
+            This is necessary to support WPA3 192 bit security.
+
+    config ESP_WIFI_WPS_STRICT
+        bool "Strictly validate all WPS attributes"
+        default n
+        help
+            Select this option to enable validate each WPS attribute
+            rigorously. Disabling this add the workaorunds with various APs.
+            Enabling this may cause inter operability issues with some APs.
+
+    config ESP_WIFI_11KV_SUPPORT
+        bool "Enable 802.11k, 802.11v APIs Support"
+        default n
+        help
+            Select this option to enable 802.11k 802.11v APIs(RRM and BTM support).
+            Only APIs which are helpful for network assisted roaming
+            are supported for now.
+            Enable this option with BTM and RRM enabled in sta config
+            to make device ready for network assisted roaming.
+            BTM: BSS transition management enables an AP to request a station to transition
+            to a specific AP, or to indicate to a station a set of preferred APs.
+            RRM: Radio measurements enable STAs to understand the radio environment,
+            it enables STAs to observe and gather data on radio link performance
+            and on the radio environment. Current implementation adds beacon report,
+            link measurement, neighbor report.
+
+    config ESP_WIFI_SCAN_CACHE
+        bool "Keep scan results in cache"
+        depends on ESP_WIFI_11KV_SUPPORT
+        default n
+        help
+            Keep scan results in cache, if not enabled, those
+            will be flushed immediately.
+
+    config ESP_WIFI_MBO_SUPPORT
+        bool "Enable Multi Band Operation Certification Support"
+        default n
+        select ESP_WIFI_11KV_SUPPORT
+        select ESP_WIFI_SCAN_CACHE
+        help
+            Select this option to enable WiFi Multiband operation certification support.
+
+    config ESP_WIFI_DPP_SUPPORT
+        bool "Enable DPP support"
+        default n
+        select ESP_WIFI_MBEDTLS_CRYPTO
+        help
+            Select this option to enable WiFi Easy Connect Support.
+
+    config ESP_WIFI_11R_SUPPORT
+        bool "Enable 802.11R (Fast Transition) Support"
+        default n
+        help
+            Select this option to enable WiFi Fast Transition Support.
+
+    config ESP_WIFI_WPS_SOFTAP_REGISTRAR
+        bool "Add WPS Registrar support in SoftAP mode"
+        depends on ESP_WIFI_SOFTAP_SUPPORT
+        default n
+        help
+            Select this option to enable WPS registrar support in softAP mode.
+
     config ESP_WIFI_ENABLE_WIFI_RX_STATS
         bool "Enable Wi-Fi reception statistics"
         depends on SOC_WIFI_HE_SUPPORT
@@ -425,4 +526,21 @@ menu "Wi-Fi"
         help
             Enable Wi-Fi DL MU-MIMO and DL OFDMA reception statistics. Will use 10932 bytes memory.
 
+    config ESP_WIFI_DEBUG_PRINT
+        bool "Print debug messages from WPA Supplicant"
+        default n
+        help
+            Select this option to print logging information from WPA supplicant,
+            this includes handshake information and key hex dumps depending
+            on the project logging level.
+
+            Enabling this could increase the build size ~60kb
+            depending on the project logging level.
+
+    config ESP_WIFI_TESTING_OPTIONS
+        bool "Add DPP testing code"
+        default n
+        help
+            Select this to enable unity test for DPP.
+
 endmenu # Wi-Fi

components/esp_wifi/include/esp_private/wifi.h

@@ -485,7 +485,7 @@ esp_err_t esp_wifi_internal_get_config_channel(wifi_interface_t ifx, uint8_t *pr
   * @param     aid : the connection number when a STA connects to the softAP
   * @param     primary : store the negotiated primary channel
   * @param     second : store the negotiated second channel
-  * @attention the aid param is only works when the ESP32 in softAP/softAP+STA mode
+  * @attention the aid param is only works when the device in softAP/softAP+STA mode
   *
   * @return
   *    - ESP_OK: succeed

components/esp_wifi/include/esp_smartconfig.h

@@ -1,16 +1,8 @@
-// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #ifndef __ESP_SMARTCONFIG_H__
 #define __ESP_SMARTCONFIG_H__
@@ -33,10 +25,10 @@ typedef enum {
 
 /** Smartconfig event declarations */
 typedef enum {
-    SC_EVENT_SCAN_DONE,                /*!< ESP32 station smartconfig has finished to scan for APs */
-    SC_EVENT_FOUND_CHANNEL,            /*!< ESP32 station smartconfig has found the channel of the target AP */
-    SC_EVENT_GOT_SSID_PSWD,            /*!< ESP32 station smartconfig got the SSID and password */
-    SC_EVENT_SEND_ACK_DONE,            /*!< ESP32 station smartconfig has sent ACK to cellphone */
+    SC_EVENT_SCAN_DONE,                /*!< Station smartconfig has finished to scan for APs */
+    SC_EVENT_FOUND_CHANNEL,            /*!< Station smartconfig has found the channel of the target AP */
+    SC_EVENT_GOT_SSID_PSWD,            /*!< Station smartconfig got the SSID and password */
+    SC_EVENT_SEND_ACK_DONE,            /*!< Station smartconfig has sent ACK to cellphone */
 } smartconfig_event_t;
 
 /** @brief smartconfig event base declaration */

components/esp_wifi/include/esp_wifi.h

@@ -7,7 +7,7 @@
 
 /*               Notes about WiFi Programming
  *
- *  The esp32 WiFi programming model can be depicted as following picture:
+ *  WiFi programming model can be depicted as following picture:
  *
  *
  *                            default handler              user handler
@@ -113,49 +113,49 @@ typedef struct {
     int                    magic;                  /**< WiFi init magic number, it should be the last field */
 } wifi_init_config_t;
 
-#ifdef CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM
-#define WIFI_STATIC_TX_BUFFER_NUM CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM
+#ifdef CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM
+#define WIFI_STATIC_TX_BUFFER_NUM CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM
 #else
 #define WIFI_STATIC_TX_BUFFER_NUM 0
 #endif
 
 #if CONFIG_SPIRAM
-#define WIFI_CACHE_TX_BUFFER_NUM  CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM
+#define WIFI_CACHE_TX_BUFFER_NUM  CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM
 #else
 #define WIFI_CACHE_TX_BUFFER_NUM  0
 #endif
 
-#ifdef CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM
-#define WIFI_DYNAMIC_TX_BUFFER_NUM CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM
+#ifdef CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM
+#define WIFI_DYNAMIC_TX_BUFFER_NUM CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM
 #else
 #define WIFI_DYNAMIC_TX_BUFFER_NUM 0
 #endif
 
-#if CONFIG_ESP32_WIFI_CSI_ENABLED
+#if CONFIG_ESP_WIFI_CSI_ENABLED
 #define WIFI_CSI_ENABLED         1
 #else
 #define WIFI_CSI_ENABLED         0
 #endif
 
-#if CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED
+#if CONFIG_ESP_WIFI_AMPDU_RX_ENABLED
 #define WIFI_AMPDU_RX_ENABLED        1
 #else
 #define WIFI_AMPDU_RX_ENABLED        0
 #endif
 
-#if CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED
+#if CONFIG_ESP_WIFI_AMPDU_TX_ENABLED
 #define WIFI_AMPDU_TX_ENABLED        1
 #else
 #define WIFI_AMPDU_TX_ENABLED        0
 #endif
 
-#if CONFIG_ESP32_WIFI_AMSDU_TX_ENABLED
+#if CONFIG_ESP_WIFI_AMSDU_TX_ENABLED
 #define WIFI_AMSDU_TX_ENABLED        1
 #else
 #define WIFI_AMSDU_TX_ENABLED        0
 #endif
 
-#if CONFIG_ESP32_WIFI_NVS_ENABLED
+#if CONFIG_ESP_WIFI_NVS_ENABLED
 #define WIFI_NVS_ENABLED          1
 #else
 #define WIFI_NVS_ENABLED          0
@@ -172,26 +172,26 @@ extern uint64_t g_wifi_feature_caps;
 
 #define WIFI_INIT_CONFIG_MAGIC    0x1F2F3F4F
 
-#ifdef CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED
-#define WIFI_DEFAULT_RX_BA_WIN CONFIG_ESP32_WIFI_RX_BA_WIN
+#ifdef CONFIG_ESP_WIFI_AMPDU_RX_ENABLED
+#define WIFI_DEFAULT_RX_BA_WIN CONFIG_ESP_WIFI_RX_BA_WIN
 #else
 #define WIFI_DEFAULT_RX_BA_WIN 0 /* unused if ampdu_rx_enable == false */
 #endif
 
-#if CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1
+#if CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1
 #define WIFI_TASK_CORE_ID 1
 #else
 #define WIFI_TASK_CORE_ID 0
 #endif
 
-#ifdef CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN
-#define WIFI_SOFTAP_BEACON_MAX_LEN CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN
+#ifdef CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN
+#define WIFI_SOFTAP_BEACON_MAX_LEN CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN
 #else
 #define WIFI_SOFTAP_BEACON_MAX_LEN 752
 #endif
 
-#ifdef CONFIG_ESP32_WIFI_MGMT_SBUF_NUM
-#define WIFI_MGMT_SBUF_NUM CONFIG_ESP32_WIFI_MGMT_SBUF_NUM
+#ifdef CONFIG_ESP_WIFI_MGMT_SBUF_NUM
+#define WIFI_MGMT_SBUF_NUM CONFIG_ESP_WIFI_MGMT_SBUF_NUM
 #else
 #define WIFI_MGMT_SBUF_NUM 32
 #endif
@@ -210,9 +210,9 @@ extern uint64_t g_wifi_feature_caps;
 #define WIFI_INIT_CONFIG_DEFAULT() { \
     .osi_funcs = &g_wifi_osi_funcs, \
     .wpa_crypto_funcs = g_wifi_default_wpa_crypto_funcs, \
-    .static_rx_buf_num = CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM,\
-    .dynamic_rx_buf_num = CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM,\
-    .tx_buf_type = CONFIG_ESP32_WIFI_TX_BUFFER_TYPE,\
+    .static_rx_buf_num = CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM,\
+    .dynamic_rx_buf_num = CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM,\
+    .tx_buf_type = CONFIG_ESP_WIFI_TX_BUFFER_TYPE,\
     .static_tx_buf_num = WIFI_STATIC_TX_BUFFER_NUM,\
     .dynamic_tx_buf_num = WIFI_DYNAMIC_TX_BUFFER_NUM,\
     .cache_tx_buf_num = WIFI_CACHE_TX_BUFFER_NUM,\
@@ -337,15 +337,15 @@ esp_err_t esp_wifi_stop(void);
 esp_err_t esp_wifi_restore(void);
 
 /**
-  * @brief     Connect the ESP32 WiFi station to the AP.
+  * @brief     Connect WiFi station to the AP.
   *
   * @attention 1. This API only impact WIFI_MODE_STA or WIFI_MODE_APSTA mode
-  * @attention 2. If the ESP32 is connected to an AP, call esp_wifi_disconnect to disconnect.
-  * @attention 3. The scanning triggered by esp_wifi_scan_start() will not be effective until connection between ESP32 and the AP is established.
-  *               If ESP32 is scanning and connecting at the same time, ESP32 will abort scanning and return a warning message and error
+  * @attention 2. If station interface is connected to an AP, call esp_wifi_disconnect to disconnect.
+  * @attention 3. The scanning triggered by esp_wifi_scan_start() will not be effective until connection between device and the AP is established.
+  *               If device is scanning and connecting at the same time, it will abort scanning and return a warning message and error
   *               number ESP_ERR_WIFI_STATE.
-  *               If you want to do reconnection after ESP32 received disconnect event, remember to add the maximum retry time, otherwise the called
-  *               scan will not work. This is especially true when the AP doesn't exist, and you still try reconnection after ESP32 received disconnect
+  *               If you want to do reconnection after device received disconnect event, remember to add the maximum retry time, otherwise the called
+  *               scan will not work. This is especially true when the AP doesn't exist, and you still try reconnection after device received disconnect
   *               event with the reason code WIFI_REASON_NO_AP_FOUND.
   *
   * @return
@@ -358,7 +358,7 @@ esp_err_t esp_wifi_restore(void);
 esp_err_t esp_wifi_connect(void);
 
 /**
-  * @brief     Disconnect the ESP32 WiFi station from the AP.
+  * @brief     Disconnect WiFi station from the AP.
   *
   * @return
   *    - ESP_OK: succeed
@@ -473,7 +473,7 @@ esp_err_t esp_wifi_clear_ap_list(void);
 
 
 /**
-  * @brief     Get information of AP which the ESP32 station is associated with
+  * @brief     Get information of AP to which the device is associated with
   *
   * @attention When the obtained country information is empty, it means that the AP does not carry country information
   *
@@ -545,7 +545,7 @@ esp_err_t esp_wifi_set_protocol(wifi_interface_t ifx, uint8_t protocol_bitmap);
 esp_err_t esp_wifi_get_protocol(wifi_interface_t ifx, uint8_t *protocol_bitmap);
 
 /**
-  * @brief     Set the bandwidth of ESP32 specified interface
+  * @brief     Set the bandwidth of specified interface
   *
   * @attention 1. API return false if try to configure an interface that is not enabled
   * @attention 2. WIFI_BW_HT40 is supported only when the interface support 11N
@@ -563,7 +563,7 @@ esp_err_t esp_wifi_get_protocol(wifi_interface_t ifx, uint8_t *protocol_bitmap);
 esp_err_t esp_wifi_set_bandwidth(wifi_interface_t ifx, wifi_bandwidth_t bw);
 
 /**
-  * @brief     Get the bandwidth of ESP32 specified interface
+  * @brief     Get the bandwidth of specified interface
   *
   * @attention 1. API return false if try to get a interface that is not enable
   *
@@ -579,12 +579,12 @@ esp_err_t esp_wifi_set_bandwidth(wifi_interface_t ifx, wifi_bandwidth_t bw);
 esp_err_t esp_wifi_get_bandwidth(wifi_interface_t ifx, wifi_bandwidth_t *bw);
 
 /**
-  * @brief     Set primary/secondary channel of ESP32
+  * @brief     Set primary/secondary channel of device
   *
   * @attention 1. This API should be called after esp_wifi_start()
-  * @attention 2. When ESP32 is in STA mode, this API should not be called when STA is scanning or connecting to an external AP
-  * @attention 3. When ESP32 is in softAP mode, this API should not be called when softAP has connected to external STAs
-  * @attention 4. When ESP32 is in STA+softAP mode, this API should not be called when in the scenarios described above
+  * @attention 2. When device is in STA mode, this API should not be called when STA is scanning or connecting to an external AP
+  * @attention 3. When device is in softAP mode, this API should not be called when softAP has connected to external STAs
+  * @attention 4. When device is in STA+softAP mode, this API should not be called when in the scenarios described above
   * @attention 5. The channel info set by this API will not be stored in NVS. So If you want to remeber the channel used before wifi stop,
   *               you need to call this API again after wifi start, or you can call `esp_wifi_set_config()` to store the channel info in NVS.
   *
@@ -600,7 +600,7 @@ esp_err_t esp_wifi_get_bandwidth(wifi_interface_t ifx, wifi_bandwidth_t *bw);
 esp_err_t esp_wifi_set_channel(uint8_t primary, wifi_second_chan_t second);
 
 /**
-  * @brief     Get the primary/secondary channel of ESP32
+  * @brief     Get the primary/secondary channel of device
   *
   * @attention 1. API return false if try to get a interface that is not enable
   *
@@ -658,11 +658,11 @@ esp_err_t esp_wifi_get_country(wifi_country_t *country);
 
 
 /**
-  * @brief     Set MAC address of the ESP32 WiFi station or the soft-AP interface.
+  * @brief     Set MAC address of WiFi station or the soft-AP interface.
   *
   * @attention 1. This API can only be called when the interface is disabled
-  * @attention 2. ESP32 soft-AP and station have different MAC addresses, do not set them to be the same.
-  * @attention 3. The bit 0 of the first byte of ESP32 MAC address can not be 1. For example, the MAC address
+  * @attention 2. Soft-AP and station have different MAC addresses, do not set them to be the same.
+  * @attention 3. The bit 0 of the first byte of MAC address can not be 1. For example, the MAC address
   *      can set to be "1a:XX:XX:XX:XX:XX", but can not be "15:XX:XX:XX:XX:XX".
   *
   * @param     ifx  interface
@@ -790,12 +790,12 @@ esp_err_t esp_wifi_set_promiscuous_ctrl_filter(const wifi_promiscuous_filter_t *
 esp_err_t esp_wifi_get_promiscuous_ctrl_filter(wifi_promiscuous_filter_t *filter);
 
 /**
-  * @brief     Set the configuration of the ESP32 STA or AP
+  * @brief     Set the configuration of the STA or AP
   *
   * @attention 1. This API can be called only when specified interface is enabled, otherwise, API fail
   * @attention 2. For station configuration, bssid_set needs to be 0; and it needs to be 1 only when users need to check the MAC address of the AP.
-  * @attention 3. ESP32 is limited to only one channel, so when in the soft-AP+station mode, the soft-AP will adjust its channel automatically to be the same as
-  *               the channel of the ESP32 station.
+  * @attention 3. ESP devices are limited to only one channel, so when in the soft-AP+station mode, the soft-AP will adjust its channel automatically to be the same as
+  *               the channel of the station.
   * @attention 4. The configuration will be stored in NVS
   *
   * @param     interface  interface
@@ -1121,7 +1121,7 @@ esp_err_t esp_wifi_get_ant(wifi_ant_config_t *config);
 int64_t esp_wifi_get_tsf_time(wifi_interface_t interface);
 
 /**
-  * @brief     Set the inactive time of the ESP32 STA or AP
+  * @brief     Set the inactive time of the STA or AP
   *
   * @attention 1. For Station, If the station does not receive a beacon frame from the connected SoftAP during the inactive time,
   *               disconnect from SoftAP. Default 6s.

components/esp_wifi/include/esp_wifi_crypto_types.h

@@ -367,7 +367,7 @@ typedef int (*esp_aes_gmac_t)(const uint8_t *key, size_t keylen, const uint8_t *
 
 /**
   * @brief The crypto callback function structure used when do station security connect.
-  *        The structure can be set as software crypto or the crypto optimized by ESP32
+  *        The structure can be set as software crypto or the crypto optimized by device's
   *        hardware.
   */
 typedef struct {
@@ -402,7 +402,7 @@ typedef struct {
 
 /**
   * @brief The crypto callback function structure used in mesh vendor IE encryption. The
-  *        structure can be set as software crypto or the crypto optimized by ESP32
+  *        structure can be set as software crypto or the crypto optimized by device's
   *        hardware.
   */
 typedef struct{

components/esp_wifi/include/esp_wifi_types.h

@@ -267,13 +267,13 @@ typedef enum {
     WPA3_SAE_PWE_BOTH,
 } wifi_sae_pwe_method_t;
 
-/** @brief Soft-AP configuration settings for the ESP32 */
+/** @brief Soft-AP configuration settings for the device */
 typedef struct {
-    uint8_t ssid[32];           /**< SSID of ESP32 soft-AP. If ssid_len field is 0, this must be a Null terminated string. Otherwise, length is set according to ssid_len. */
-    uint8_t password[64];       /**< Password of ESP32 soft-AP. */
+    uint8_t ssid[32];           /**< SSID of soft-AP. If ssid_len field is 0, this must be a Null terminated string. Otherwise, length is set according to ssid_len. */
+    uint8_t password[64];       /**< Password of soft-AP. */
     uint8_t ssid_len;           /**< Optional length of SSID field. */
-    uint8_t channel;            /**< Channel of ESP32 soft-AP */
-    wifi_auth_mode_t authmode;  /**< Auth mode of ESP32 soft-AP. Do not support AUTH_WEP in soft-AP mode */
+    uint8_t channel;            /**< Channel of soft-AP */
+    wifi_auth_mode_t authmode;  /**< Auth mode of soft-AP. Do not support AUTH_WEP in soft-AP mode */
     uint8_t ssid_hidden;        /**< Broadcast SSID or not, default 0, broadcast the SSID */
     uint8_t max_connection;     /**< Max number of stations allowed to connect in */
     uint16_t beacon_interval;   /**< Beacon interval which should be multiples of 100. Unit: TU(time unit, 1 TU = 1024 us). Range: 100 ~ 60000. Default value: 100 */
@@ -282,7 +282,7 @@ typedef struct {
     wifi_pmf_config_t pmf_cfg;  /**< Configuration for Protected Management Frame */
 } wifi_ap_config_t;
 
-/** @brief STA configuration settings for the ESP32 */
+/** @brief STA configuration settings for the device */
 typedef struct {
     uint8_t ssid[32];                         /**< SSID of target AP. */
     uint8_t password[64];                     /**< Password of target AP. */
@@ -312,7 +312,7 @@ typedef struct {
     uint8_t he_mcs9_enabled:1;                /**< Whether to support HE-MCS 0 to 9. The default value is 0. */
 } wifi_sta_config_t;
 
-/** @brief Configuration data for ESP32 AP or STA.
+/** @brief Configuration data for device's AP or STA.
  *
  * The usage of this union (for ap or sta configuration) is determined by the accompanying
  * interface argument passed to esp_wifi_set_config() or esp_wifi_get_config()
@@ -344,7 +344,7 @@ typedef struct {
 #define ESP_WIFI_MAX_CONN_NUM  (15)       /**< max number of stations which can connect to ESP32/ESP32S3/ESP32S2 soft-AP */
 #endif
 
-/** @brief List of stations associated with the ESP32 Soft-AP */
+/** @brief List of stations associated with the Soft-AP */
 typedef struct {
     wifi_sta_info_t sta[ESP_WIFI_MAX_CONN_NUM]; /**< station list */
     int       num; /**< number of stations in the list (other entries are invalid) */
@@ -670,24 +670,24 @@ typedef enum {
 
 /** WiFi event declarations */
 typedef enum {
-    WIFI_EVENT_WIFI_READY = 0,           /**< ESP32 WiFi ready */
-    WIFI_EVENT_SCAN_DONE,                /**< ESP32 finish scanning AP */
-    WIFI_EVENT_STA_START,                /**< ESP32 station start */
-    WIFI_EVENT_STA_STOP,                 /**< ESP32 station stop */
-    WIFI_EVENT_STA_CONNECTED,            /**< ESP32 station connected to AP */
-    WIFI_EVENT_STA_DISCONNECTED,         /**< ESP32 station disconnected from AP */
-    WIFI_EVENT_STA_AUTHMODE_CHANGE,      /**< the auth mode of AP connected by ESP32 station changed */
-
-    WIFI_EVENT_STA_WPS_ER_SUCCESS,       /**< ESP32 station wps succeeds in enrollee mode */
-    WIFI_EVENT_STA_WPS_ER_FAILED,        /**< ESP32 station wps fails in enrollee mode */
-    WIFI_EVENT_STA_WPS_ER_TIMEOUT,       /**< ESP32 station wps timeout in enrollee mode */
-    WIFI_EVENT_STA_WPS_ER_PIN,           /**< ESP32 station wps pin code in enrollee mode */
-    WIFI_EVENT_STA_WPS_ER_PBC_OVERLAP,   /**< ESP32 station wps overlap in enrollee mode */
-
-    WIFI_EVENT_AP_START,                 /**< ESP32 soft-AP start */
-    WIFI_EVENT_AP_STOP,                  /**< ESP32 soft-AP stop */
-    WIFI_EVENT_AP_STACONNECTED,          /**< a station connected to ESP32 soft-AP */
-    WIFI_EVENT_AP_STADISCONNECTED,       /**< a station disconnected from ESP32 soft-AP */
+    WIFI_EVENT_WIFI_READY = 0,           /**< WiFi ready */
+    WIFI_EVENT_SCAN_DONE,                /**< Finished scanning AP */
+    WIFI_EVENT_STA_START,                /**< Station start */
+    WIFI_EVENT_STA_STOP,                 /**< Station stop */
+    WIFI_EVENT_STA_CONNECTED,            /**< Station connected to AP */
+    WIFI_EVENT_STA_DISCONNECTED,         /**< Station disconnected from AP */
+    WIFI_EVENT_STA_AUTHMODE_CHANGE,      /**< the auth mode of AP connected by device's station changed */
+
+    WIFI_EVENT_STA_WPS_ER_SUCCESS,       /**< Station wps succeeds in enrollee mode */
+    WIFI_EVENT_STA_WPS_ER_FAILED,        /**< Station wps fails in enrollee mode */
+    WIFI_EVENT_STA_WPS_ER_TIMEOUT,       /**< Station wps timeout in enrollee mode */
+    WIFI_EVENT_STA_WPS_ER_PIN,           /**< Station wps pin code in enrollee mode */
+    WIFI_EVENT_STA_WPS_ER_PBC_OVERLAP,   /**< Station wps overlap in enrollee mode */
+
+    WIFI_EVENT_AP_START,                 /**< Soft-AP start */
+    WIFI_EVENT_AP_STOP,                  /**< Soft-AP stop */
+    WIFI_EVENT_AP_STACONNECTED,          /**< a station connected to Soft-AP */
+    WIFI_EVENT_AP_STADISCONNECTED,       /**< a station disconnected from Soft-AP */
     WIFI_EVENT_AP_PROBEREQRECVED,        /**< Receive probe request packet in soft-AP interface */
 
     WIFI_EVENT_FTM_REPORT,               /**< Receive report of FTM procedure */
@@ -697,9 +697,9 @@ typedef enum {
     WIFI_EVENT_ACTION_TX_STATUS,         /**< Status indication of Action Tx operation */
     WIFI_EVENT_ROC_DONE,                 /**< Remain-on-Channel operation complete */
 
-    WIFI_EVENT_STA_BEACON_TIMEOUT,       /**< ESP32 station beacon timeout */
+    WIFI_EVENT_STA_BEACON_TIMEOUT,       /**< Station beacon timeout */
 
-    WIFI_EVENT_CONNECTIONLESS_MODULE_WAKE_INTERVAL_START,   /**< ESP32 connectionless module wake interval start */
+    WIFI_EVENT_CONNECTIONLESS_MODULE_WAKE_INTERVAL_START,   /**< Connectionless module wake interval start */
 
     WIFI_EVENT_AP_WPS_RG_SUCCESS,       /**< Soft-AP wps succeeds in registrar mode */
     WIFI_EVENT_AP_WPS_RG_FAILED,        /**< Soft-AP wps fails in registrar mode */
@@ -759,8 +759,8 @@ typedef struct {
 
 /** Argument structure for WIFI_EVENT_STA_WPS_ER_FAILED event */
 typedef enum {
-    WPS_FAIL_REASON_NORMAL = 0,     /**< ESP32 WPS normal fail reason */
-    WPS_FAIL_REASON_RECV_M2D,       /**< ESP32 WPS receive M2D frame */
+    WPS_FAIL_REASON_NORMAL = 0,     /**< WPS normal fail reason */
+    WPS_FAIL_REASON_RECV_M2D,       /**< WPS receive M2D frame */
     WPS_FAIL_REASON_MAX
 } wifi_event_sta_wps_fail_reason_t;
 
@@ -779,15 +779,15 @@ typedef struct {
 
 /** Argument structure for WIFI_EVENT_AP_STACONNECTED event */
 typedef struct {
-    uint8_t mac[6];           /**< MAC address of the station connected to ESP32 soft-AP */
-    uint8_t aid;              /**< the aid that ESP32 soft-AP gives to the station connected to  */
+    uint8_t mac[6];           /**< MAC address of the station connected to Soft-AP */
+    uint8_t aid;              /**< the aid that soft-AP gives to the station connected to  */
     bool is_mesh_child;       /**< flag to identify mesh child */
 } wifi_event_ap_staconnected_t;
 
 /** Argument structure for WIFI_EVENT_AP_STADISCONNECTED event */
 typedef struct {
-    uint8_t mac[6];           /**< MAC address of the station disconnects to ESP32 soft-AP */
-    uint8_t aid;              /**< the aid that ESP32 soft-AP gave to the station disconnects to  */
+    uint8_t mac[6];           /**< MAC address of the station disconnects to soft-AP */
+    uint8_t aid;              /**< the aid that soft-AP gave to the station disconnects to  */
     bool is_mesh_child;       /**< flag to identify mesh child */
 } wifi_event_ap_stadisconnected_t;
 

components/esp_wifi/lib

@@ -1 +1 @@
-Subproject commit acc9f01ca9652973410cd4e6ba8c21ed541e14ff
+Subproject commit 41fa4f18bd21fee18842914aeabbd5c4132dbf2f

components/esp_wifi/linker.lf

@@ -99,19 +99,19 @@ entries:
 [mapping:pp]
 archive: libpp.a
 entries:
-    if ESP32_WIFI_IRAM_OPT = y:
+    if ESP_WIFI_IRAM_OPT = y:
         * (wifi_iram)
 
-    if ESP32_WIFI_RX_IRAM_OPT = y:
+    if ESP_WIFI_RX_IRAM_OPT = y:
         * (wifi_rx_iram)
 
     if ESP_WIFI_SLP_IRAM_OPT = y:
         * (wifi_slp_iram)
 
-    if ESP32_WIFI_IRAM_OPT || ESP_WIFI_SLP_IRAM_OPT:
+    if ESP_WIFI_IRAM_OPT || ESP_WIFI_SLP_IRAM_OPT:
         * (wifi_or_slp_iram)
 
-    if ESP32_WIFI_RX_IRAM_OPT || ESP_WIFI_SLP_IRAM_OPT:
+    if ESP_WIFI_RX_IRAM_OPT || ESP_WIFI_SLP_IRAM_OPT:
         * (wifi_slp_rx_iram)
 
     if ESP_ALLOW_BSS_SEG_EXTERNAL_MEMORY = y:
@@ -120,10 +120,10 @@ entries:
 [mapping:net80211]
 archive: libnet80211.a
 entries:
-    if ESP32_WIFI_IRAM_OPT = y:
+    if ESP_WIFI_IRAM_OPT = y:
         * (wifi_iram)
 
-    if ESP32_WIFI_RX_IRAM_OPT = y:
+    if ESP_WIFI_RX_IRAM_OPT = y:
         * (wifi_rx_iram)
 
     if ESP_ALLOW_BSS_SEG_EXTERNAL_MEMORY = y:
@@ -132,7 +132,7 @@ entries:
     if ESP_WIFI_SLP_IRAM_OPT = y:
         * (wifi_slp_iram)
 
-    if ESP32_WIFI_RX_IRAM_OPT || ESP_WIFI_SLP_IRAM_OPT:
+    if ESP_WIFI_RX_IRAM_OPT || ESP_WIFI_SLP_IRAM_OPT:
         * (wifi_slp_rx_iram)
 
 [mapping:coexist]

components/esp_wifi/sdkconfig.rename

@@ -1,5 +1,52 @@
 # sdkconfig replacement configurations for deprecated options formatted as
 # CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
 
-CONFIG_SW_COEXIST_ENABLE                CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE
+CONFIG_SW_COEXIST_ENABLE                CONFIG_ESP_WIFI_SW_COEXIST_ENABLE
+CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE     CONFIG_ESP_WIFI_SW_COEXIST_ENABLE
 CONFIG_EXTERNAL_COEX_ENABLE             CONFIG_ESP_WIFI_EXTERNAL_COEXIST_ENABLE
+
+# renaming of esp_wifi kconfig options
+CONFIG_ESP32_WIFI_ENABLED               CONFIG_ESP_WIFI_ENABLED
+CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE     CONFIG_ESP_WIFI_SW_COEXIST_ENABLE
+CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM  CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM
+CONFIG_ESP32_WIFI_RX_BA_WIN             CONFIG_ESP_WIFI_RX_BA_WIN
+CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED      CONFIG_ESP_WIFI_AMPDU_RX_ENABLED
+CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM
+CONFIG_ESP32_WIFI_TX_BUFFER             CONFIG_ESP_WIFI_TX_BUFFER
+CONFIG_ESP32_WIFI_STATIC_TX_BUFFER      CONFIG_ESP_WIFI_STATIC_TX_BUFFER
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER     CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER
+CONFIG_ESP32_WIFI_TX_BUFFER_TYPE        CONFIG_ESP_WIFI_TX_BUFFER_TYPE
+CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM  CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM
+CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM   CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM
+CONFIG_ESP32_WIFI_CSI_ENABLED           CONFIG_ESP_WIFI_CSI_ENABLED
+CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED      CONFIG_ESP_WIFI_AMPDU_TX_ENABLED
+CONFIG_ESP32_WIFI_TX_BA_WIN             CONFIG_ESP_WIFI_TX_BA_WIN
+CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED      CONFIG_ESP_WIFI_AMPDU_RX_ENABLED
+CONFIG_ESP32_WIFI_RX_BA_WIN             CONFIG_ESP_WIFI_RX_BA_WIN
+CONFIG_ESP32_WIFI_AMSDU_TX_ENABLED      CONFIG_ESP_WIFI_AMSDU_TX_ENABLED
+CONFIG_ESP32_WIFI_NVS_ENABLED           CONFIG_ESP_WIFI_NVS_ENABLED
+CONFIG_ESP32_WIFI_TASK_CORE_ID          CONFIG_ESP_WIFI_TASK_CORE_ID
+CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0 CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0
+CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1
+CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN
+CONFIG_ESP32_WIFI_MGMT_SBUF_NUM         CONFIG_ESP_WIFI_MGMT_SBUF_NUM
+CONFIG_ESP32_WIFI_IRAM_OPT              CONFIG_ESP_WIFI_IRAM_OPT
+CONFIG_ESP32_WIFI_RX_IRAM_OPT           CONFIG_ESP_WIFI_RX_IRAM_OPT
+CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE       CONFIG_ESP_WIFI_ENABLE_WPA3_SAE
+CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA   CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA
+
+# renaming supplicant kconfig to esp_wifi kconfig
+CONFIG_WPA_MBEDTLS_CRYPTO               CONFIG_ESP_WIFI_MBEDTLS_CRYPTO
+CONFIG_WPA_MBEDTLS_TLS_CLIENT           CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
+CONFIG_WPA_WAPI_PSK                     CONFIG_ESP_WIFI_WAPI_PSK
+CONFIG_WPA_SUITE_B_192                  CONFIG_ESP_WIFI_SUITE_B_192
+CONFIG_WPA_DEBUG_PRINT                  CONFIG_ESP_WIFI_DEBUG_PRINT
+CONFIG_WPA_TESTING_OPTIONS              CONFIG_ESP_WIFI_TESTING_OPTIONS
+CONFIG_WPA_WPS_STRICT                   CONFIG_ESP_WIFI_WPS_STRICT
+CONFIG_WPA_11KV_SUPPORT                 CONFIG_ESP_WIFI_11KV_SUPPORT
+CONFIG_WPA_SCAN_CACHE                   CONFIG_ESP_WIFI_SCAN_CACHE
+CONFIG_WPA_MBO_SUPPORT                  CONFIG_ESP_WIFI_MBO_SUPPORT
+CONFIG_WPA_DPP_SUPPORT                  CONFIG_ESP_WIFI_DPP_SUPPORT
+CONFIG_WPA_11R_SUPPORT                  CONFIG_ESP_WIFI_11R_SUPPORT
+CONFIG_WPA_WPS_SOFTAP_REGISTRAR         CONFIG_ESP_WIFI_WPS_SOFTAP_REGISTRAR

components/esp_wifi/src/wifi_init.c

@@ -19,11 +19,11 @@
 #include "esp_phy_init.h"
 #include "esp_private/phy.h"
 
-#if (CONFIG_ESP32_WIFI_RX_BA_WIN > CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM)
+#if (CONFIG_ESP_WIFI_RX_BA_WIN > CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM)
 #error "WiFi configuration check: WARNING, WIFI_RX_BA_WIN should not be larger than WIFI_DYNAMIC_RX_BUFFER_NUM!"
 #endif
 
-#if (CONFIG_ESP32_WIFI_RX_BA_WIN > (CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM << 1))
+#if (CONFIG_ESP_WIFI_RX_BA_WIN > (CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM << 1))
 #error "WiFi configuration check: WARNING, WIFI_RX_BA_WIN should not be larger than double of the WIFI_STATIC_RX_BUFFER_NUM!"
 #endif
 
@@ -41,7 +41,7 @@ wifi_mac_time_update_cb_t s_wifi_mac_time_update_cb = NULL;
 
 /* Set additional WiFi features and capabilities */
 uint64_t g_wifi_feature_caps =
-#if CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE
+#if CONFIG_ESP_WIFI_ENABLE_WPA3_SAE
     CONFIG_FEATURE_WPA3_SAE_BIT |
 #endif
 #if CONFIG_SPIRAM
@@ -140,8 +140,8 @@ esp_err_t esp_wifi_deinit(void)
 
 static void esp_wifi_config_info(void)
 {
-#ifdef CONFIG_ESP32_WIFI_RX_BA_WIN
-    ESP_LOGI(TAG, "rx ba win: %d", CONFIG_ESP32_WIFI_RX_BA_WIN);
+#ifdef CONFIG_ESP_WIFI_RX_BA_WIN
+    ESP_LOGI(TAG, "rx ba win: %d", CONFIG_ESP_WIFI_RX_BA_WIN);
 #endif
 
 #ifdef CONFIG_ESP_NETIF_TCPIP_LWIP
@@ -156,11 +156,11 @@ static void esp_wifi_config_info(void)
     ESP_LOGI(TAG, "WiFi/LWIP prefer SPIRAM");
 #endif
 
-#ifdef CONFIG_ESP32_WIFI_IRAM_OPT
+#ifdef CONFIG_ESP_WIFI_IRAM_OPT
     ESP_LOGI(TAG, "WiFi IRAM OP enabled");
 #endif
 
-#ifdef CONFIG_ESP32_WIFI_RX_IRAM_OPT
+#ifdef CONFIG_ESP_WIFI_RX_IRAM_OPT
     ESP_LOGI(TAG, "WiFi RX IRAM OP enabled");
 #endif
 

components/wpa_supplicant/CMakeLists.txt

@@ -69,7 +69,7 @@ if(CONFIG_ESP_WIFI_SOFTAP_SUPPORT)
     set(esp_srcs ${esp_srcs} "esp_supplicant/src/esp_hostap.c")
 endif()
 
-if(CONFIG_WPA_MBEDTLS_TLS_CLIENT)
+if(CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT)
     set(tls_src "esp_supplicant/src/crypto/tls_mbedtls.c")
 else()
     set(tls_src
@@ -91,7 +91,7 @@ else()
     "src/tls/x509v3.c")
 endif()
 
-if(CONFIG_WPA_MBEDTLS_CRYPTO)
+if(CONFIG_ESP_WIFI_MBEDTLS_CRYPTO)
     set(crypto_src
     "esp_supplicant/src/crypto/crypto_mbedtls.c"
     "esp_supplicant/src/crypto/crypto_mbedtls-bignum.c"
@@ -149,36 +149,36 @@ else()
     "src/crypto/sha256.c")
 endif()
 
-if(CONFIG_WPA_11KV_SUPPORT OR CONFIG_WPA_11R_SUPPORT)
+if(CONFIG_ESP_WIFI_11KV_SUPPORT OR CONFIG_ESP_WIFI_11R_SUPPORT)
     set(roaming_src
     "src/common/bss.c"
     "src/common/scan.c"
     "src/common/ieee802_11_common.c"
     "esp_supplicant/src/esp_scan.c")
-    if(CONFIG_WPA_11KV_SUPPORT)
+    if(CONFIG_ESP_WIFI_11KV_SUPPORT)
         set(roaming_src ${roaming_src} "src/common/rrm.c" "src/common/wnm_sta.c")
     endif()
-    if(CONFIG_WPA_11R_SUPPORT)
+    if(CONFIG_ESP_WIFI_11R_SUPPORT)
         set(roaming_src ${roaming_src} "src/rsn_supp/wpa_ft.c")
     endif()
 else()
     set(roaming_src "")
 endif()
 
-if(CONFIG_WPA_MBO_SUPPORT)
+if(CONFIG_ESP_WIFI_MBO_SUPPORT)
     set(mbo_src "src/common/mbo.c")
 else()
     set(mbo_src "")
 endif()
 
-if(CONFIG_WPA_DPP_SUPPORT)
+if(CONFIG_ESP_WIFI_DPP_SUPPORT)
     set(dpp_src "src/common/dpp.c"
     "esp_supplicant/src/esp_dpp.c")
 else()
     set(dpp_src "")
 endif()
 
-if(CONFIG_WPA_WPS_SOFTAP_REGISTRAR)
+if(CONFIG_ESP_WIFI_WPS_SOFTAP_REGISTRAR)
     set(wps_registrar_src
     "src/ap/wps_hostapd.c"
     "src/eap_server/eap_server.c"
@@ -213,20 +213,19 @@ target_compile_definitions(${COMPONENT_LIB} PRIVATE
     CONFIG_WPS
     USE_WPS_TASK
     ESPRESSIF_USE
-    ESP32_WORKAROUND
     CONFIG_ECC
     CONFIG_IEEE80211W
     CONFIG_SHA256
     CONFIG_NO_RADIUS
     )
 
-if(CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE)
+if(CONFIG_ESP_WIFI_ENABLE_WPA3_SAE)
     target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_WPA3_SAE)
 endif()
-if(CONFIG_WPA_WPS_STRICT)
+if(CONFIG_ESP_WIFI_WPS_STRICT)
     target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_WPS_STRICT)
 endif()
-if(CONFIG_WPA_SUITE_B_192)
+if(CONFIG_ESP_WIFI_SUITE_B_192)
     target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_SUITEB192)
 endif()
 if(CONFIG_WPA_SUITE_B)
@@ -238,31 +237,34 @@ endif()
 if(CONFIG_ESP_WIFI_GMAC_SUPPORT)
     target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_GMAC)
 endif()
-if(CONFIG_WPA_MBO_SUPPORT)
+if(CONFIG_ESP_WIFI_MBO_SUPPORT)
     target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_MBO)
 endif()
-if(CONFIG_WPA_DPP_SUPPORT)
+if(CONFIG_ESP_WIFI_DPP_SUPPORT)
     target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_DPP)
 endif()
-if(CONFIG_WPA_11KV_SUPPORT)
-    target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_SUPPLICANT_TASK CONFIG_WNM CONFIG_RRM)
+if(CONFIG_ESP_WIFI_11KV_SUPPORT)
+    target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_SUPPLICANT_TASK CONFIG_WNM CONFIG_RRM CONFIG_IEEE80211KV)
 endif()
-if(CONFIG_WPA_11R_SUPPORT)
+if(CONFIG_ESP_WIFI_11R_SUPPORT)
     target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_IEEE80211R)
 endif()
-if(NOT CONFIG_WPA_MBEDTLS_TLS_CLIENT)
+if(CONFIG_ESP_WIFI_TESTING_OPTIONS)
+    target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_TESTING_OPTIONS)
+endif()
+if(NOT CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT)
     target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_TLS_INTERNAL_CLIENT
                 CONFIG_TLSV11 CONFIG_TLSV12 EAP_FAST)
 endif()
-if(CONFIG_WPA_MBEDTLS_CRYPTO)
+if(CONFIG_ESP_WIFI_MBEDTLS_CRYPTO)
     target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_CRYPTO_MBEDTLS)
 else()
     target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_CRYPTO_INTERNAL)
 endif()
-if(CONFIG_WPA_WPS_SOFTAP_REGISTRAR)
+if(CONFIG_ESP_WIFI_WPS_SOFTAP_REGISTRAR)
     target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_WPS_REGISTRAR)
 endif()
-if(CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA)
+if(CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA)
         target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_OWE_STA)
 endif()
 set_property(TARGET ${COMPONENT_LIB} APPEND PROPERTY LINK_INTERFACE_MULTIPLICITY 3)

components/wpa_supplicant/Kconfig

@@ -1,121 +0,0 @@
-menu "Supplicant"
-
-    config WPA_MBEDTLS_CRYPTO
-        bool "Use MbedTLS crypto APIs"
-        default y
-        select MBEDTLS_AES_C
-        select MBEDTLS_ECP_C
-        select MBEDTLS_ECDH_C
-        select MBEDTLS_ECDSA_C
-        select MBEDTLS_TLS_ENABLED
-        help
-            Select this option to use MbedTLS crypto APIs which utilize hardware acceleration.
-
-    if WPA_MBEDTLS_CRYPTO
-        config WPA_MBEDTLS_TLS_CLIENT
-            bool "Use MbedTLS TLS client for WiFi Enterprise connection"
-            default y
-            select MBEDTLS_TLS_ENABLED
-            help
-                Select this option to use MbedTLS TLS client for WPA2 enterprise connection.
-                Please note that from MbedTLS-3.0 onwards, MbedTLS does not support SSL-3.0
-                TLS-v1.0, TLS-v1.1 versions. Incase your server is using one of these version,
-                it is advisable to update your server.
-                Please disable this option for compatibilty with older TLS versions.
-    endif
-
-    config WPA_WAPI_PSK
-        bool "Enable WAPI PSK support"
-        depends on SOC_WIFI_WAPI_SUPPORT
-        default n
-        help
-            Select this option to enable WAPI-PSK
-            which is a Chinese National Standard Encryption for Wireless LANs (GB 15629.11-2003).
-
-    config WPA_SUITE_B_192
-        bool "Enable NSA suite B support with 192 bit key"
-        default n
-        select ESP_WIFI_GCMP_SUPPORT
-        select ESP_WIFI_GMAC_SUPPORT
-        help
-            Select this option to enable 192 bit NSA suite-B.
-            This is necessary to support WPA3 192 bit security.
-
-    config WPA_DEBUG_PRINT
-        bool "Print debug messages from WPA Supplicant"
-        default n
-        help
-            Select this option to print logging information from WPA supplicant,
-            this includes handshake information and key hex dumps depending
-            on the project logging level.
-
-            Enabling this could increase the build size ~60kb
-            depending on the project logging level.
-
-    config WPA_TESTING_OPTIONS
-        bool "Add DPP testing code"
-        default n
-        help
-            Select this to enable unity test for DPP.
-
-    config WPA_WPS_STRICT
-        bool "Strictly validate all WPS attributes"
-        default n
-        help
-            Select this option to enable validate each WPS attribute
-            rigorously. Disabling this add the workaorunds with various APs.
-            Enabling this may cause inter operability issues with some APs.
-
-    config WPA_11KV_SUPPORT
-        bool "Enable 802.11k, 802.11v APIs Support"
-        default n
-        help
-            Select this option to enable 802.11k 802.11v APIs(RRM and BTM support).
-            Only APIs which are helpful for network assisted roaming
-            are supported for now.
-            Enable this option with BTM and RRM enabled in sta config
-            to make device ready for network assisted roaming.
-            BTM: BSS transition management enables an AP to request a station to transition
-            to a specific AP, or to indicate to a station a set of preferred APs.
-            RRM: Radio measurements enable STAs to understand the radio environment,
-            it enables STAs to observe and gather data on radio link performance
-            and on the radio environment. Current implementation adds beacon report,
-            link measurement, neighbor report.
-
-    config WPA_SCAN_CACHE
-        bool "Keep scan results in cache"
-        depends on WPA_11KV_SUPPORT
-        default n
-        help
-            Keep scan results in cache, if not enabled, those
-            will be flushed immediately.
-
-    config WPA_MBO_SUPPORT
-        bool "Enable Multi Band Operation Certification Support"
-        default n
-        select WPA_11KV_SUPPORT
-        select WPA_SCAN_CACHE
-        help
-            Select this option to enable WiFi Multiband operation certification support.
-
-    config WPA_DPP_SUPPORT
-        bool "Enable DPP support"
-        default n
-        select WPA_MBEDTLS_CRYPTO
-        help
-            Select this option to enable WiFi Easy Connect Support.
-
-    config WPA_11R_SUPPORT
-        bool "Enable 802.11R (Fast Transition) Support"
-        default n
-        help
-            Select this option to enable WiFi Fast Transition Support.
-
-    config WPA_WPS_SOFTAP_REGISTRAR
-        bool "Add WPS Registrar support in SoftAP mode"
-        depends on ESP_WIFI_SOFTAP_SUPPORT
-        default n
-        help
-            Select this option to enable WPS registrar support in softAP mode.
-
-endmenu

components/wpa_supplicant/README.md

@@ -3,6 +3,6 @@
 This component contains the upstream wpa_supplicant ported for ESP family of platforms.
 The code is tightly coupled with esp_wifi component which has ESP WiFi libraries and header files that are used in ported supplicant.
 
-ESP uses MbedTLS as crypto library therefore MbedTLS component is also required for some features to work(see WPA_MBEDTLS_CRYPTO).
+ESP uses MbedTLS as crypto library therefore MbedTLS component is also required for some features to work(see ESP_WIFI_MBEDTLS_CRYPTO).
 
 To port it for different OS, esp_wifi and wpa_supplicant should be picked up a whole system(preferably with MbedTLS if we want all features to work.) 

components/wpa_supplicant/esp_supplicant/include/esp_wpa2.h

@@ -221,7 +221,7 @@ esp_err_t esp_wifi_sta_wpa2_set_suiteb_192bit_certification(bool enable);
   * @brief  Set client pac file
   *
   * @attention  1. For files read from the file system, length has to be decremented by 1 byte.
-  * @attention  2. Disabling the WPA_MBEDTLS_CRYPTO config is required to use EAP-FAST.
+  * @attention  2. Disabling the ESP_WIFI_MBEDTLS_TLS_CLIENT config is required to use EAP-FAST.
   *
   * @param  pac_file: pointer to the pac file
   *         pac_file_len: length of the pac file
@@ -235,7 +235,7 @@ esp_err_t esp_wifi_sta_wpa2_ent_set_pac_file(const unsigned char *pac_file, int
 /**
   * @brief  Set Phase 1 parameters for EAP-FAST
   *
-  * @attention  1. Disabling the WPA_MBEDTLS_CRYPTO config is required to use EAP-FAST.
+  * @attention  1. Disabling the ESP_WIFI_MBEDTLS_TLS_CLIENT config is required to use EAP-FAST.
   *
   * @param  config: eap fast phase 1 configuration
   *

components/wpa_supplicant/esp_supplicant/src/esp_common.c

@@ -24,7 +24,7 @@
 #include "rsn_supp/wpa.h"
 
 struct wpa_supplicant g_wpa_supp;
-#if defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R)
+#if defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R)
 
 #ifdef CONFIG_SUPPLICANT_TASK
 static void *s_supplicant_task_hdl = NULL;
@@ -59,7 +59,7 @@ static int handle_action_frm(u8 *frame, size_t len,
 }
 #endif /* CONFIG_SUPPLICANT_TASK */
 
-#if defined(CONFIG_WPA_11KV_SUPPORT)
+#if defined(CONFIG_IEEE80211KV)
 static void handle_rrm_frame(struct wpa_supplicant *wpa_s, u8 *sender,
 			     u8 *payload, size_t len, u32 rssi)
 {
@@ -99,7 +99,7 @@ static int mgmt_rx_action(u8 *frame, size_t len, u8 *sender, u32 rssi, u8 channe
 
 	return 0;
 }
-#endif /* defined(CONFIG_WPA_11KV_SUPPORT) */
+#endif /* defined(CONFIG_IEEE80211KV) */
 
 #ifdef CONFIG_SUPPLICANT_TASK
 static void btm_rrm_task(void *pvParameters)
@@ -185,7 +185,7 @@ static void register_mgmt_frames(struct wpa_supplicant *wpa_s)
 	/* subtype is defined only for action frame */
 	wpa_s->subtype = 0;
 
-#ifdef CONFIG_WPA_11KV_SUPPORT
+#ifdef CONFIG_IEEE80211KV
 	/* current supported features in supplicant: rrm and btm */
 	if (esp_wifi_is_rm_enabled_internal(WIFI_IF_STA))
 		wpa_s->subtype = 1 << WLAN_ACTION_RADIO_MEASUREMENT;
@@ -194,7 +194,7 @@ static void register_mgmt_frames(struct wpa_supplicant *wpa_s)
 
 	if (wpa_s->subtype)
 		wpa_s->type |= 1 << WLAN_FC_STYPE_ACTION;
-#endif /* CONFIG_WPA_11KV_SUPPORT */
+#endif /* CONFIG_IEEE80211KV */
 
 #ifdef CONFIG_IEEE80211R
 	/* register auth/assoc frames if FT is enabled */
@@ -238,10 +238,10 @@ static void supplicant_sta_disconn_handler(void* arg, esp_event_base_t event_bas
 {
 	struct wpa_supplicant *wpa_s = &g_wpa_supp;
 
-#ifdef CONFIG_WPA_11KV_SUPPORT
+#ifdef CONFIG_IEEE80211KV
 	wpas_rrm_reset(wpa_s);
 	wpas_clear_beacon_rep_data(wpa_s);
-#endif /* CONFIG_WPA_11KV_SUPPORT */
+#endif /* CONFIG_IEEE80211KV */
 	if (wpa_s->current_bss) {
 		wpa_s->current_bss = NULL;
 	}
@@ -278,7 +278,7 @@ static int handle_assoc_frame(u8 *frame, size_t len,
 	return 0;
 }
 #endif /* CONFIG_IEEE80211R */
-#endif /* defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R) */
+#endif /* defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) */
 
 static int ieee80211_handle_rx_frm(u8 type, u8 *frame, size_t len, u8 *sender,
 				   u32 rssi, u8 channel, u64 current_tsf)
@@ -286,12 +286,12 @@ static int ieee80211_handle_rx_frm(u8 type, u8 *frame, size_t len, u8 *sender,
 	int ret = 0;
 
 	switch (type) {
-#if defined(CONFIG_IEEE80211R) || defined(CONFIG_WPA_11KV_SUPPORT)
+#if defined(CONFIG_IEEE80211R) || defined(CONFIG_IEEE80211KV)
 	case WLAN_FC_STYPE_BEACON:
 	case WLAN_FC_STYPE_PROBE_RESP:
 		ret = esp_handle_beacon_probe(type, frame, len, sender, rssi, channel, current_tsf);
 		break;
-#endif /* defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R) */
+#endif /* defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) */
 #ifdef CONFIG_IEEE80211R
 	case WLAN_FC_STYPE_AUTH:
 		ret = handle_auth_frame(frame, len, sender, rssi, channel);
@@ -304,7 +304,7 @@ static int ieee80211_handle_rx_frm(u8 type, u8 *frame, size_t len, u8 *sender,
 		ret = handle_assoc_frame(frame, len, sender, rssi, channel);
 #endif /* CONFIG_IEEE80211R */
 		break;
-#if defined(CONFIG_WPA_11KV_SUPPORT)
+#if defined(CONFIG_IEEE80211KV)
 	case WLAN_FC_STYPE_ACTION:
 #ifdef CONFIG_SUPPLICANT_TASK
 		ret = handle_action_frm(frame, len, sender, rssi, channel);
@@ -312,7 +312,7 @@ static int ieee80211_handle_rx_frm(u8 type, u8 *frame, size_t len, u8 *sender,
 		ret = mgmt_rx_action(frame, len, sender, rssi, channel);
 #endif /* CONFIG_SUPPLICANT_TASK */
 		break;
-#endif /* defined(CONFIG_WPA_11KV_SUPPORT) */
+#endif /* defined(CONFIG_IEEE80211KV) */
 	default:
 		ret = -1;
 		break;
@@ -321,7 +321,7 @@ static int ieee80211_handle_rx_frm(u8 type, u8 *frame, size_t len, u8 *sender,
 	return ret;
 }
 
-#if defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R)
+#if defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R)
 #ifdef CONFIG_MBO
 bool mbo_bss_profile_match(u8 *bssid)
 {
@@ -347,14 +347,14 @@ bool mbo_bss_profile_match(u8 *bssid)
 }
 #endif /* CONFIG_MBO */
 
-#endif /* defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R) */
+#endif /* defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) */
 
 int esp_supplicant_common_init(struct wpa_funcs *wpa_cb)
 {
 	struct wpa_supplicant *wpa_s = &g_wpa_supp;
 	int ret = 0;
 
-#if defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R)
+#if defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R)
 #ifdef CONFIG_SUPPLICANT_TASK
 	s_supplicant_api_lock = os_recursive_mutex_create();
 	if (!s_supplicant_api_lock) {
@@ -377,10 +377,10 @@ int esp_supplicant_common_init(struct wpa_funcs *wpa_cb)
 		goto err;
 	}
 #endif /* CONFIG_SUPPLICANT_TASK */
-#ifdef CONFIG_WPA_11KV_SUPPORT
+#ifdef CONFIG_IEEE80211KV
 	wpas_rrm_reset(wpa_s);
 	wpas_clear_beacon_rep_data(wpa_s);
-#endif /* CONFIG_WPA_11KV_SUPPORT */
+#endif /* CONFIG_IEEE80211KV */
 	esp_scan_init(wpa_s);
 
 	esp_event_handler_register(WIFI_EVENT, WIFI_EVENT_STA_CONNECTED,
@@ -388,7 +388,7 @@ int esp_supplicant_common_init(struct wpa_funcs *wpa_cb)
 	esp_event_handler_register(WIFI_EVENT, WIFI_EVENT_STA_DISCONNECTED,
 			&supplicant_sta_disconn_handler, NULL);
 
-#endif /* defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R) */
+#endif /* defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) */
 	wpa_s->type = 0;
 	wpa_s->subtype = 0;
 	wpa_s->type |= (1 << WLAN_FC_STYPE_ASSOC_RESP) | (1 << WLAN_FC_STYPE_REASSOC_RESP) | (1 << WLAN_FC_STYPE_AUTH);
@@ -398,11 +398,11 @@ int esp_supplicant_common_init(struct wpa_funcs *wpa_cb)
 	}
 	wpa_cb->wpa_sta_rx_mgmt = ieee80211_handle_rx_frm;
 
-#if defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R)
+#if defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R)
 #ifdef CONFIG_MBO
 	dl_list_init(&wpa_s->bss_tmp_disallowed);
 #endif /* CONFIG_MBO */
-#endif /* defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R) */
+#endif /* defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) */
 	return 0;
 err:
 	esp_supplicant_common_deinit();
@@ -413,22 +413,22 @@ void esp_supplicant_common_deinit(void)
 {
 	struct wpa_supplicant *wpa_s = &g_wpa_supp;
 
-#if defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R)
+#if defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R)
 	esp_scan_deinit(wpa_s);
-#ifdef CONFIG_WPA_11KV_SUPPORT
+#ifdef CONFIG_IEEE80211KV
 	wpas_rrm_reset(wpa_s);
 	wpas_clear_beacon_rep_data(wpa_s);
-#endif /* CONFIG_WPA_11KV_SUPPORT */
+#endif /* CONFIG_IEEE80211KV */
 	esp_event_handler_unregister(WIFI_EVENT, WIFI_EVENT_STA_CONNECTED,
 			&supplicant_sta_conn_handler);
 	esp_event_handler_unregister(WIFI_EVENT, WIFI_EVENT_STA_DISCONNECTED,
 			&supplicant_sta_disconn_handler);
-#endif /* defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R) */
+#endif /* defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) */
 	if (wpa_s->type) {
 		wpa_s->type = 0;
 		esp_wifi_register_mgmt_frame_internal(wpa_s->type, wpa_s->subtype);
 	}
-#if defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R)
+#if defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R)
 #ifdef CONFIG_SUPPLICANT_TASK
 	if (!s_supplicant_task_hdl && esp_supplicant_post_evt(SIG_SUPPLICANT_DEL_TASK, 0) != 0) {
 		if (s_supplicant_evt_queue) {
@@ -441,11 +441,11 @@ void esp_supplicant_common_deinit(void)
 		}
 	}
 #endif /* CONFIG_SUPPLICANT_TASK */
-#endif /* defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R) */
+#endif /* defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) */
 }
 
-#if defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R)
-#ifdef CONFIG_WPA_11KV_SUPPORT
+#if defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R)
+#ifdef CONFIG_IEEE80211KV
 bool esp_rrm_is_rrm_supported_connection(void)
 {
 	struct wpa_supplicant *wpa_s = &g_wpa_supp;
@@ -656,11 +656,11 @@ static uint8_t get_extended_caps_ie(uint8_t *ie, size_t len)
 	return ext_caps_ie_len + 2;
 }
 
-#endif /* CONFIG_WPA_11KV_SUPPORT */
+#endif /* CONFIG_IEEE80211KV */
 
 void esp_set_scan_ie(void)
 {
-#ifdef CONFIG_WPA_11KV_SUPPORT
+#ifdef CONFIG_IEEE80211KV
 #define SCAN_IE_LEN 64
 	uint8_t *ie, *pos;
 	size_t len = SCAN_IE_LEN, ie_len;
@@ -683,7 +683,7 @@ void esp_set_scan_ie(void)
 	esp_wifi_set_appie_internal(WIFI_APPIE_PROBEREQ, ie, SCAN_IE_LEN - len, 0);
 	os_free(ie);
 #undef SCAN_IE_LEN
-#endif /* CONFIG_WPA_11KV_SUPPORT */
+#endif /* CONFIG_IEEE80211KV */
 }
 
 #ifdef CONFIG_IEEE80211R
@@ -817,7 +817,7 @@ int esp_supplicant_post_evt(uint32_t evt_id, uint32_t data)
 	return 0;
 }
 #endif /* CONFIG_SUPPLICANT_TASK */
-#else /* defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R) */
+#else /* defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) */
 int esp_rrm_send_neighbor_rep_request(neighbor_rep_request_cb cb,
 				      void *cb_ctx)
 {
@@ -836,24 +836,24 @@ int esp_mbo_update_non_pref_chan(struct non_pref_chan_s *non_pref_chan)
 	return -1;
 }
 void esp_set_scan_ie(void) { }
-#endif /* defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R) */
+#endif /* defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) */
 
-#if defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R) || defined(CONFIG_WPA3_SAE)
+#if defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) || defined(CONFIG_WPA3_SAE)
 void esp_set_assoc_ie(uint8_t *bssid, const u8 *ies, size_t ies_len, bool mdie)
 {
 #define ASSOC_IE_LEN 128
 	uint8_t *ie, *pos;
 	size_t len = ASSOC_IE_LEN;
-#if defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R)
+#if defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R)
     size_t ie_len;
-#endif /* defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R) */
+#endif /* defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) */
 	ie = os_malloc(ASSOC_IE_LEN + ies_len);
 	if (!ie) {
 		wpa_printf(MSG_ERROR, "failed to allocate ie");
 		return;
 	}
 	pos = ie;
-#ifdef CONFIG_WPA_11KV_SUPPORT
+#ifdef CONFIG_IEEE80211KV
 	ie_len = get_extended_caps_ie(pos, len);
 	pos += ie_len;
 	len -= ie_len;
@@ -868,7 +868,7 @@ void esp_set_assoc_ie(uint8_t *bssid, const u8 *ies, size_t ies_len, bool mdie)
 	pos += ie_len;
 	len -= ie_len;
 #endif /* CONFIG_MBO */
-#endif /* CONFIG_WPA_11KV_SUPPORT */
+#endif /* CONFIG_IEEE80211KV */
 #ifdef CONFIG_IEEE80211R
 	if (mdie) {
 		ie_len = add_mdie(bssid, pos, len);
@@ -887,4 +887,4 @@ void esp_set_assoc_ie(uint8_t *bssid, const u8 *ies, size_t ies_len, bool mdie)
 }
 #else
 void esp_set_assoc_ie(uint8_t *bssid, const u8 *ies, size_t ies_len, bool mdie) { }
-#endif  /* defined(CONFIG_WPA_11KV_SUPPORT) || defined(CONFIG_IEEE80211R) || defined(CONFIG_WPA3_SAE) */
+#endif  /* defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) || defined(CONFIG_WPA3_SAE) */

components/wpa_supplicant/esp_supplicant/src/esp_common_i.h

@@ -12,7 +12,7 @@
 struct wpa_funcs;
 extern struct wpa_supplicant g_wpa_supp;
 
-#ifdef CONFIG_WPA_11KV_SUPPORT
+#ifdef CONFIG_IEEE80211KV
 struct ieee_mgmt_frame {
 	u8 sender[ETH_ALEN];
 	u8 channel;

components/wpa_supplicant/esp_supplicant/src/esp_scan.c

@@ -37,7 +37,7 @@ static void scan_done_event_handler(void *arg, STATUS status)
 	esp_supplicant_handle_scan_done_evt();
 }
 
-#if defined(CONFIG_WPA_11KV_SUPPORT)
+#if defined(CONFIG_IEEE80211KV)
 static void handle_wnm_scan_done(struct wpa_supplicant *wpa_s)
 {
 	struct wpa_bss *bss = wpa_bss_get_next_bss(wpa_s, wpa_s->current_bss);
@@ -73,7 +73,7 @@ void esp_supplicant_handle_scan_done_evt(void)
 	struct wpa_supplicant *wpa_s = &g_wpa_supp;
 
 	wpa_printf(MSG_INFO, "scan done received");
-#if defined(CONFIG_WPA_11KV_SUPPORT)
+#if defined(CONFIG_IEEE80211KV)
 	/* Check which module started this, call the respective function */
 	if (wpa_s->scan_reason == REASON_RRM_BEACON_REPORT) {
 		wpas_beacon_rep_scan_process(wpa_s, wpa_s->scan_start_tsf);

components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c

@@ -358,7 +358,7 @@ int esp_supplicant_init(void)
 
     esp_wifi_register_wpa_cb_internal(wpa_cb);
 
-#if CONFIG_WPA_WAPI_PSK
+#if CONFIG_ESP_WIFI_WAPI_PSK
     ret =  esp_wifi_internal_wapi_init();
 #endif
 

components/wpa_supplicant/port/include/supplicant_opt.h

@@ -9,14 +9,14 @@
 
 #include "sdkconfig.h"
 
-#if CONFIG_WPA_DEBUG_PRINT
+#if CONFIG_ESP_WIFI_DEBUG_PRINT
 #define DEBUG_PRINT
 #if defined(CONFIG_LOG_DEFAULT_LEVEL_DEBUG) || defined(CONFIG_LOG_DEFAULT_LEVEL_VERBOSE)
 #define ELOOP_DEBUG
 #endif
 #endif
 
-#if CONFIG_WPA_SCAN_CACHE
+#if CONFIG_ESP_WIFI_SCAN_CACHE
 #define SCAN_CACHE_SUPPORTED
 #endif
 

components/wpa_supplicant/src/common/dpp.c

@@ -23,7 +23,7 @@
 
 static const char * dpp_netrole_str(enum dpp_netrole netrole);
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 enum dpp_test_behavior dpp_test = DPP_TEST_DISABLED;
 u8 dpp_protocol_key_override[600];
 size_t dpp_protocol_key_override_len = 0;
@@ -32,7 +32,7 @@ size_t dpp_nonce_override_len = 0;
 
 static int dpp_test_gen_invalid_key(struct wpabuf *msg,
 				    const struct dpp_curve_params *curve);
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 struct dpp_global {
 	void *msg_ctx;
@@ -1000,10 +1000,10 @@ static struct wpabuf * dpp_auth_build_req(struct dpp_authentication *auth,
 		4 + sizeof(wrapped_data);
 	if (neg_freq > 0)
 		attr_len += 4 + 2;
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_AFTER_WRAPPED_DATA_AUTH_REQ)
 		attr_len += 5;
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 	msg = dpp_alloc_msg(DPP_PA_AUTHENTICATION_REQ, attr_len);
 	if (!msg)
 		return NULL;
@@ -1034,17 +1034,17 @@ static struct wpabuf * dpp_auth_build_req(struct dpp_authentication *auth,
 		wpabuf_put_u8(msg, channel);
 	}
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_NO_WRAPPED_DATA_AUTH_REQ) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - no Wrapped Data");
 		goto skip_wrapped_data;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	/* Wrapped data ({I-nonce, I-capabilities}k1) */
 	pos = clear;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_NO_I_NONCE_AUTH_REQ) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - no I-nonce");
 		goto skip_i_nonce;
@@ -1059,7 +1059,7 @@ static struct wpabuf * dpp_auth_build_req(struct dpp_authentication *auth,
 		pos += nonce_len - 1;
 		goto skip_i_nonce;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	/* I-nonce */
 	WPA_PUT_LE16(pos, DPP_ATTR_I_NONCE);
@@ -1069,13 +1069,13 @@ static struct wpabuf * dpp_auth_build_req(struct dpp_authentication *auth,
 	os_memcpy(pos, auth->i_nonce, nonce_len);
 	pos += nonce_len;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 skip_i_nonce:
 	if (dpp_test == DPP_TEST_NO_I_CAPAB_AUTH_REQ) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - no I-capab");
 		goto skip_i_capab;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	/* I-capabilities */
 	WPA_PUT_LE16(pos, DPP_ATTR_I_CAPABILITIES);
@@ -1084,13 +1084,13 @@ skip_i_nonce:
 	pos += 2;
 	auth->i_capab = auth->allowed_roles;
 	*pos++ = auth->i_capab;
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_ZERO_I_CAPAB) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - zero I-capabilities");
 		pos[-1] = 0;
 	}
 skip_i_capab:
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	attr_end = wpabuf_put(msg, 0);
 
@@ -1119,13 +1119,13 @@ skip_i_capab:
 	wpabuf_put_le16(msg, siv_len);
 	wpabuf_put_data(msg, wrapped_data, siv_len);
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_AFTER_WRAPPED_DATA_AUTH_REQ) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - attr after Wrapped Data");
 		dpp_build_attr_status(msg, DPP_STATUS_OK);
 	}
 skip_wrapped_data:
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	wpa_hexdump_buf(MSG_DEBUG,
 			"DPP: Authentication Request frame attributes", msg);
@@ -1160,10 +1160,10 @@ static struct wpabuf * dpp_auth_build_resp(struct dpp_authentication *auth,
 	/* Build DPP Authentication Response frame attributes */
 	attr_len = 4 + 1 + 2 * (4 + SHA256_MAC_LEN) +
 		4 + (pr ? wpabuf_len(pr) : 0) + 4 + sizeof(wrapped_data);
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_AFTER_WRAPPED_DATA_AUTH_RESP)
 		attr_len += 5;
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 	msg = dpp_alloc_msg(DPP_PA_AUTHENTICATION_RESP, attr_len);
 	if (!msg)
 		return NULL;
@@ -1189,12 +1189,12 @@ static struct wpabuf * dpp_auth_build_resp(struct dpp_authentication *auth,
 
 	attr_end = wpabuf_put(msg, 0);
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_NO_WRAPPED_DATA_AUTH_RESP) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - no Wrapped Data");
 		goto skip_wrapped_data;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	/* Wrapped data ({R-nonce, I-nonce, R-capabilities, {R-auth}ke}k2) */
 	pos = clear;
@@ -1216,21 +1216,21 @@ static struct wpabuf * dpp_auth_build_resp(struct dpp_authentication *auth,
 		WPA_PUT_LE16(pos, nonce_len);
 		pos += 2;
 		os_memcpy(pos, i_nonce, nonce_len);
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 		if (dpp_test == DPP_TEST_I_NONCE_MISMATCH_AUTH_RESP) {
 			wpa_printf(MSG_INFO, "DPP: TESTING - I-nonce mismatch");
 			pos[nonce_len / 2] ^= 0x01;
 		}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 		pos += nonce_len;
 	}
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_NO_R_CAPAB_AUTH_RESP) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - no R-capab");
 		goto skip_r_capab;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	/* R-capabilities */
 	WPA_PUT_LE16(pos, DPP_ATTR_R_CAPABILITIES);
@@ -1240,7 +1240,7 @@ static struct wpabuf * dpp_auth_build_resp(struct dpp_authentication *auth,
 	auth->r_capab = auth->configurator ? DPP_CAPAB_CONFIGURATOR :
 		DPP_CAPAB_ENROLLEE;
 	*pos++ = auth->r_capab;
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_ZERO_R_CAPAB) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - zero R-capabilities");
 		pos[-1] = 0;
@@ -1255,7 +1255,7 @@ static struct wpabuf * dpp_auth_build_resp(struct dpp_authentication *auth,
 				DPP_CAPAB_CONFIGURATOR;
 	}
 skip_r_capab:
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	if (wrapped_r_auth) {
 		/* {R-auth}ke */
@@ -1292,13 +1292,13 @@ skip_r_capab:
 	wpabuf_put_le16(msg, siv_len);
 	wpabuf_put_data(msg, wrapped_data, siv_len);
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_AFTER_WRAPPED_DATA_AUTH_RESP) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - attr after Wrapped Data");
 		dpp_build_attr_status(msg, DPP_STATUS_OK);
 	}
 skip_wrapped_data:
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	wpa_hexdump_buf(MSG_DEBUG,
 			"DPP: Authentication Response frame attributes", msg);
@@ -1523,9 +1523,9 @@ struct dpp_authentication * dpp_auth_init(void *msg_ctx,
 	size_t secret_len;
 	struct wpabuf *pi = NULL;
 	const u8 *r_pubkey_hash, *i_pubkey_hash;
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	u8 test_hash[SHA256_MAC_LEN];
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	auth = os_zalloc(sizeof(*auth));
 	if (!auth)
@@ -1543,7 +1543,7 @@ struct dpp_authentication * dpp_auth_init(void *msg_ctx,
 	    dpp_prepare_channel_list(auth, own_modes, num_modes) < 0)
 		goto fail;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_nonce_override_len > 0) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - override I-nonce");
 		nonce_len = dpp_nonce_override_len;
@@ -1556,16 +1556,16 @@ struct dpp_authentication * dpp_auth_init(void *msg_ctx,
 			goto fail;
 		}
 	}
-#else /* CONFIG_WPA_TESTING_OPTIONS */
+#else /* CONFIG_TESTING_OPTIONS */
 	nonce_len = auth->curve->nonce_len;
 	if (random_get_bytes(auth->i_nonce, nonce_len)) {
 		wpa_printf(MSG_ERROR, "DPP: Failed to generate I-nonce");
 		goto fail;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 	wpa_hexdump(MSG_DEBUG, "DPP: I-nonce", auth->i_nonce, nonce_len);
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_protocol_key_override_len) {
 		const struct dpp_curve_params *tmp_curve;
 
@@ -1577,9 +1577,9 @@ struct dpp_authentication * dpp_auth_init(void *msg_ctx,
 	} else {
 		auth->own_protocol_key = dpp_gen_keypair(auth->curve);
 	}
-#else /* CONFIG_WPA_TESTING_OPTIONS */
+#else /* CONFIG_TESTING_OPTIONS */
 	auth->own_protocol_key = dpp_gen_keypair(auth->curve);
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 	if (!auth->own_protocol_key)
 		goto fail;
 
@@ -1604,7 +1604,7 @@ struct dpp_authentication * dpp_auth_init(void *msg_ctx,
 	r_pubkey_hash = auth->peer_bi->pubkey_hash;
 	i_pubkey_hash = auth->own_bi->pubkey_hash;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_NO_R_BOOTSTRAP_KEY_HASH_AUTH_REQ) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - no R-Bootstrap Key Hash");
 		r_pubkey_hash = NULL;
@@ -1634,7 +1634,7 @@ struct dpp_authentication * dpp_auth_init(void *msg_ctx,
 		if (!pi || dpp_test_gen_invalid_key(pi, auth->curve) < 0)
 			goto fail;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	auth->req_msg = dpp_auth_build_req(auth, pi, nonce_len, r_pubkey_hash,
 					   i_pubkey_hash, neg_freq);
@@ -1675,15 +1675,15 @@ static struct wpabuf * dpp_build_conf_req_attr(struct dpp_authentication *auth,
 	clear_len = 4 + nonce_len + 4 + json_len;
 	clear = wpabuf_alloc(clear_len);
 	attr_len = 4 + clear_len + AES_BLOCK_SIZE;
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_AFTER_WRAPPED_DATA_CONF_REQ)
 		attr_len += 5;
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 	msg = wpabuf_alloc(attr_len);
 	if (!clear || !msg)
 		goto fail;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_NO_E_NONCE_CONF_REQ) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - no E-nonce");
 		goto skip_e_nonce;
@@ -1699,29 +1699,29 @@ static struct wpabuf * dpp_build_conf_req_attr(struct dpp_authentication *auth,
 		wpa_printf(MSG_INFO, "DPP: TESTING - no Wrapped Data");
 		goto skip_wrapped_data;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	/* E-nonce */
 	wpabuf_put_le16(clear, DPP_ATTR_ENROLLEE_NONCE);
 	wpabuf_put_le16(clear, nonce_len);
 	wpabuf_put_data(clear, auth->e_nonce, nonce_len);
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 skip_e_nonce:
 	if (dpp_test == DPP_TEST_NO_CONFIG_ATTR_OBJ_CONF_REQ) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - no configAttrib");
 		goto skip_conf_attr_obj;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	/* configAttrib */
 	wpabuf_put_le16(clear, DPP_ATTR_CONFIG_ATTR_OBJ);
 	wpabuf_put_le16(clear, json_len);
 	wpabuf_put_data(clear, json, json_len);
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 skip_conf_attr_obj:
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	wpabuf_put_le16(msg, DPP_ATTR_WRAPPED_DATA);
 	wpabuf_put_le16(msg, wpabuf_len(clear) + AES_BLOCK_SIZE);
@@ -1736,13 +1736,13 @@ skip_conf_attr_obj:
 	wpa_hexdump(MSG_DEBUG, "DPP: AES-SIV ciphertext",
 		    wrapped, wpabuf_len(clear) + AES_BLOCK_SIZE);
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_AFTER_WRAPPED_DATA_CONF_REQ) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - attr after Wrapped Data");
 		dpp_build_attr_status(msg, DPP_STATUS_OK);
 	}
 skip_wrapped_data:
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	wpa_hexdump_buf(MSG_DEBUG,
 			"DPP: Configuration Request frame attributes", msg);
@@ -1815,14 +1815,14 @@ struct wpabuf * dpp_build_conf_req_helper(struct dpp_authentication *auth,
 	const char *dpp_name;
 	struct wpabuf *buf, *json;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_INVALID_CONFIG_ATTR_OBJ_CONF_REQ) {
 		static const char *bogus_tech = "knfra";
 
 		wpa_printf(MSG_INFO, "DPP: TESTING - invalid Config Attr");
 		tech = bogus_tech;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	dpp_name = name ? name : "Test";
 	name_len = os_strlen(dpp_name);
@@ -2151,15 +2151,15 @@ static int dpp_auth_build_resp_ok(struct dpp_authentication *auth)
 	int ret = -1;
 	const u8 *r_pubkey_hash, *i_pubkey_hash, *r_nonce, *i_nonce;
 	enum dpp_status_error status = DPP_STATUS_OK;
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	u8 test_hash[SHA256_MAC_LEN];
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	wpa_printf(MSG_DEBUG, "DPP: Build Authentication Response");
 	if (!auth->own_bi)
 		return -1;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_nonce_override_len > 0) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - override R-nonce");
 		nonce_len = dpp_nonce_override_len;
@@ -2172,17 +2172,17 @@ static int dpp_auth_build_resp_ok(struct dpp_authentication *auth)
 			goto fail;
 		}
 	}
-#else /* CONFIG_WPA_TESTING_OPTIONS */
+#else /* CONFIG_TESTING_OPTIONS */
 	nonce_len = auth->curve->nonce_len;
 	if (random_get_bytes(auth->r_nonce, nonce_len)) {
 		wpa_printf(MSG_ERROR, "DPP: Failed to generate R-nonce");
 		goto fail;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 	wpa_hexdump(MSG_DEBUG, "DPP: R-nonce", auth->r_nonce, nonce_len);
 
 	crypto_ec_free_key(auth->own_protocol_key);
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_protocol_key_override_len) {
 		const struct dpp_curve_params *tmp_curve;
 
@@ -2194,9 +2194,9 @@ static int dpp_auth_build_resp_ok(struct dpp_authentication *auth)
 	} else {
 		auth->own_protocol_key = dpp_gen_keypair(auth->curve);
 	}
-#else /* CONFIG_WPA_TESTING_OPTIONS */
+#else /* CONFIG_TESTING_OPTIONS */
 	auth->own_protocol_key = dpp_gen_keypair(auth->curve);
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 	if (!auth->own_protocol_key)
 		goto fail;
 
@@ -2231,12 +2231,12 @@ static int dpp_auth_build_resp_ok(struct dpp_authentication *auth)
 	WPA_PUT_LE16(&r_auth[2], auth->curve->hash_len);
 	if (dpp_gen_r_auth(auth, r_auth + 4) < 0)
 		goto fail;
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_R_AUTH_MISMATCH_AUTH_RESP) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - R-auth mismatch");
 		r_auth[4 + auth->curve->hash_len / 2] ^= 0x01;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 	if (aes_siv_encrypt(auth->ke, auth->curve->hash_len,
 			    r_auth, 4 + auth->curve->hash_len,
 			    0, NULL, NULL, wrapped_r_auth) < 0)
@@ -2255,7 +2255,7 @@ static int dpp_auth_build_resp_ok(struct dpp_authentication *auth)
 	i_nonce = auth->i_nonce;
 	r_nonce = auth->r_nonce;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_NO_R_BOOTSTRAP_KEY_HASH_AUTH_RESP) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - no R-Bootstrap Key Hash");
 		r_pubkey_hash = NULL;
@@ -2306,7 +2306,7 @@ static int dpp_auth_build_resp_ok(struct dpp_authentication *auth)
 		wpa_printf(MSG_INFO, "DPP: TESTING - no I-nonce");
 		i_nonce = NULL;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	msg = dpp_auth_build_resp(auth, status, pr, nonce_len,
 				  r_pubkey_hash, i_pubkey_hash,
@@ -2329,9 +2329,9 @@ static int dpp_auth_build_resp_status(struct dpp_authentication *auth,
 {
 	struct wpabuf *msg;
 	const u8 *r_pubkey_hash, *i_pubkey_hash, *i_nonce;
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	u8 test_hash[SHA256_MAC_LEN];
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	if (!auth->own_bi)
 		return -1;
@@ -2345,7 +2345,7 @@ static int dpp_auth_build_resp_status(struct dpp_authentication *auth,
 
 	i_nonce = auth->i_nonce;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_NO_R_BOOTSTRAP_KEY_HASH_AUTH_RESP) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - no R-Bootstrap Key Hash");
 		r_pubkey_hash = NULL;
@@ -2376,7 +2376,7 @@ static int dpp_auth_build_resp_status(struct dpp_authentication *auth,
 		wpa_printf(MSG_INFO, "DPP: TESTING - no I-nonce");
 		i_nonce = NULL;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	msg = dpp_auth_build_resp(auth, status, NULL, auth->curve->nonce_len,
 				  r_pubkey_hash, i_pubkey_hash,
@@ -2414,13 +2414,13 @@ dpp_auth_req_rx(void *msg_ctx, u8 dpp_allowed_roles, int qr_mutual,
 	u16 i_bootstrap_len;
 	struct dpp_authentication *auth = NULL;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_STOP_AT_AUTH_REQ) {
 		wpa_printf(MSG_INFO,
 			   "DPP: TESTING - stop at Authentication Request");
 		return NULL;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	wrapped_data = dpp_get_attr(attr_start, attr_len, DPP_ATTR_WRAPPED_DATA,
 				    &wrapped_data_len);
@@ -2679,9 +2679,9 @@ static struct wpabuf * dpp_auth_build_conf(struct dpp_authentication *auth,
 	u8 *wrapped_r_nonce;
 	u8 *attr_start, *attr_end;
 	const u8 *r_pubkey_hash, *i_pubkey_hash;
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	u8 test_hash[SHA256_MAC_LEN];
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	wpa_printf(MSG_DEBUG, "DPP: Build Authentication Confirmation");
 
@@ -2690,10 +2690,10 @@ static struct wpabuf * dpp_auth_build_conf(struct dpp_authentication *auth,
 	/* Build DPP Authentication Confirmation frame attributes */
 	attr_len = 4 + 1 + 2 * (4 + SHA256_MAC_LEN) +
 		4 + i_auth_len + r_nonce_len + AES_BLOCK_SIZE;
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_AFTER_WRAPPED_DATA_AUTH_CONF)
 		attr_len += 5;
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 	msg = dpp_alloc_msg(DPP_PA_AUTHENTICATION_CONF, attr_len);
 	if (!msg)
 		goto fail;
@@ -2706,7 +2706,7 @@ static struct wpabuf * dpp_auth_build_conf(struct dpp_authentication *auth,
 	else
 		i_pubkey_hash = NULL;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_NO_STATUS_AUTH_CONF) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - no Status");
 		goto skip_status;
@@ -2714,12 +2714,12 @@ static struct wpabuf * dpp_auth_build_conf(struct dpp_authentication *auth,
 		wpa_printf(MSG_INFO, "DPP: TESTING - invalid Status");
 		status = 254;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	/* DPP Status */
 	dpp_build_attr_status(msg, status);
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 skip_status:
 	if (dpp_test == DPP_TEST_NO_R_BOOTSTRAP_KEY_HASH_AUTH_CONF) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - no R-Bootstrap Key Hash");
@@ -2745,7 +2745,7 @@ skip_status:
 		test_hash[SHA256_MAC_LEN - 1] ^= 0x01;
 		i_pubkey_hash = test_hash;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	/* Responder Bootstrapping Key Hash */
 	dpp_build_attr_r_bootstrap_key_hash(msg, r_pubkey_hash);
@@ -2753,12 +2753,12 @@ skip_status:
 	/* Initiator Bootstrapping Key Hash (mutual authentication) */
 	dpp_build_attr_i_bootstrap_key_hash(msg, i_pubkey_hash);
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_NO_WRAPPED_DATA_AUTH_CONF)
 		goto skip_wrapped_data;
 	if (dpp_test == DPP_TEST_NO_I_AUTH_AUTH_CONF)
 		i_auth_len = 0;
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	attr_end = wpabuf_put(msg, 0);
 
@@ -2778,10 +2778,10 @@ skip_status:
 		wpabuf_put_le16(msg, i_auth_len + AES_BLOCK_SIZE);
 		wrapped_i_auth = wpabuf_put(msg, i_auth_len + AES_BLOCK_SIZE);
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 		if (dpp_test == DPP_TEST_NO_I_AUTH_AUTH_CONF)
 			goto skip_i_auth;
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 		/* I-auth = H(R-nonce | I-nonce | PR.x | PI.x | BR.x | [BI.x |]
 		 *	      1) */
@@ -2790,13 +2790,13 @@ skip_status:
 		if (dpp_gen_i_auth(auth, i_auth + 4) < 0)
 			goto fail;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 		if (dpp_test == DPP_TEST_I_AUTH_MISMATCH_AUTH_CONF) {
 			wpa_printf(MSG_INFO, "DPP: TESTING - I-auth mismatch");
 			i_auth[4 + auth->curve->hash_len / 2] ^= 0x01;
 		}
 skip_i_auth:
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 		if (aes_siv_encrypt(auth->ke, auth->curve->hash_len,
 				    i_auth, i_auth_len,
 				    2, addr, len, wrapped_i_auth) < 0)
@@ -2821,13 +2821,13 @@ skip_i_auth:
 			    wrapped_r_nonce, r_nonce_len + AES_BLOCK_SIZE);
 	}
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_AFTER_WRAPPED_DATA_AUTH_CONF) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - attr after Wrapped Data");
 		dpp_build_attr_status(msg, DPP_STATUS_OK);
 	}
 skip_wrapped_data:
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	wpa_hexdump_buf(MSG_DEBUG,
 			"DPP: Authentication Confirmation frame attributes",
@@ -2959,13 +2959,13 @@ dpp_auth_resp_rx(struct dpp_authentication *auth, const u8 *hdr,
 	u8 r_auth2[DPP_MAX_HASH_LEN];
 	u8 role;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_STOP_AT_AUTH_RESP) {
 		wpa_printf(MSG_INFO,
 			   "DPP: TESTING - stop at Authentication Response");
 		return NULL;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	if (!auth->initiator || !auth->peer_bi) {
 		dpp_auth_fail(auth, "Unexpected Authentication Response");
@@ -3236,7 +3236,7 @@ dpp_auth_resp_rx(struct dpp_authentication *auth, const u8 *hdr,
 	bin_clear_free(unwrapped, unwrapped_len);
 	bin_clear_free(unwrapped2, unwrapped2_len);
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_AUTH_RESP_IN_PLACE_OF_CONF) {
 		wpa_printf(MSG_INFO,
 			   "DPP: TESTING - Authentication Response in place of Confirm");
@@ -3244,7 +3244,7 @@ dpp_auth_resp_rx(struct dpp_authentication *auth, const u8 *hdr,
 			return NULL;
 		return wpabuf_dup(auth->resp_msg);
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	return dpp_auth_build_conf(auth, DPP_STATUS_OK);
 
@@ -3339,13 +3339,13 @@ int dpp_auth_conf_rx(struct dpp_authentication *auth, const u8 *hdr,
 	size_t unwrapped_len = 0;
 	u8 i_auth2[DPP_MAX_HASH_LEN];
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_STOP_AT_AUTH_CONF) {
 		wpa_printf(MSG_INFO,
 			   "DPP: TESTING - stop at Authentication Confirm");
 		return -1;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	if (auth->initiator || !auth->own_bi) {
 		dpp_auth_fail(auth, "Unexpected Authentication Confirm");
@@ -3627,13 +3627,13 @@ static int dpp_configuration_parse_helper(struct dpp_authentication *auth,
 		    hexstr2bin(pos, conf->ssid, conf->ssid_len) < 0)
 			goto fail;
 	} else {
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 		/* use a default SSID for legacy testing reasons */
 		os_memcpy(conf->ssid, "test", 4);
 		conf->ssid_len = 4;
-#else /* CONFIG_WPA_TESTING_OPTIONS */
+#else /* CONFIG_TESTING_OPTIONS */
 		goto fail;
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 	}
 
 	pos = os_strstr(cmd, " ssid_charset=");
@@ -3834,11 +3834,11 @@ void dpp_auth_deinit(struct dpp_authentication *auth)
 	}
 	wpabuf_free(auth->net_access_key);
 	dpp_bootstrap_info_free(auth->tmp_own_bi);
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	os_free(auth->config_obj_override);
 	os_free(auth->discovery_override);
 	os_free(auth->groups_override);
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 	bin_clear_free(auth, sizeof(*auth));
 }
 
@@ -3849,10 +3849,10 @@ dpp_build_conf_start(struct dpp_authentication *auth,
 {
 	struct wpabuf *buf;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (auth->discovery_override)
 		tailroom += os_strlen(auth->discovery_override);
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	buf = wpabuf_alloc(200 + tailroom);
 	if (!buf)
@@ -3860,7 +3860,7 @@ dpp_build_conf_start(struct dpp_authentication *auth,
 	json_start_object(buf, NULL);
 	json_add_string(buf, "wi-fi_tech", "infra");
 	json_value_sep(buf);
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (auth->discovery_override) {
 		wpa_printf(MSG_DEBUG, "DPP: TESTING - discovery override: '%s'",
 			   auth->discovery_override);
@@ -3869,7 +3869,7 @@ dpp_build_conf_start(struct dpp_authentication *auth,
 		json_value_sep(buf);
 		return buf;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 	json_start_object(buf, "discovery");
 	if (((!conf->ssid_charset || auth->peer_version < 2) &&
 	     json_add_string_escape(buf, "ssid", conf->ssid,
@@ -4014,10 +4014,10 @@ dpp_build_conf_obj_dpp(struct dpp_authentication *auth,
 		akm = DPP_AKM_DPP;
 	}
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (auth->groups_override)
 		extra_len += os_strlen(auth->groups_override);
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	if (conf->group_id)
 		extra_len += os_strlen(conf->group_id);
@@ -4026,7 +4026,7 @@ dpp_build_conf_obj_dpp(struct dpp_authentication *auth,
 	dppcon = wpabuf_alloc(extra_len + 2 * auth->curve->prime_len * 4 / 3);
 	if (!dppcon)
 		goto fail;
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (auth->groups_override) {
 		wpabuf_put_u8(dppcon, '{');
 		if (auth->groups_override) {
@@ -4039,7 +4039,7 @@ dpp_build_conf_obj_dpp(struct dpp_authentication *auth,
 		}
 		goto skip_groups;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 	json_start_object(dppcon, NULL);
 	json_start_array(dppcon, "groups");
 	json_start_object(dppcon, NULL);
@@ -4050,9 +4050,9 @@ dpp_build_conf_obj_dpp(struct dpp_authentication *auth,
 	json_end_object(dppcon);
 	json_end_array(dppcon);
 	json_value_sep(dppcon);
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 skip_groups:
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 	if (dpp_build_jwk(dppcon, "netAccessKey", auth->peer_protocol_key, NULL,
 			  auth->curve) < 0) {
 		wpa_printf(MSG_DEBUG, "DPP: Failed to build netAccessKey JWK");
@@ -4221,7 +4221,7 @@ dpp_build_conf_obj(struct dpp_authentication *auth, enum dpp_netrole netrole,
 {
 	struct dpp_configuration *conf = NULL;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (auth->config_obj_override) {
 		if (idx != 0)
 			return NULL;
@@ -4229,7 +4229,7 @@ dpp_build_conf_obj(struct dpp_authentication *auth, enum dpp_netrole netrole,
 		return wpabuf_alloc_copy(auth->config_obj_override,
 					 os_strlen(auth->config_obj_override));
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	if (idx == 0) {
 		if (netrole == DPP_NETROLE_STA)
@@ -4288,15 +4288,15 @@ dpp_build_conf_resp(struct dpp_authentication *auth, const u8 *e_nonce,
 		clear_len += 4;
 	clear = wpabuf_alloc(clear_len);
 	attr_len = 4 + 1 + 4 + clear_len + AES_BLOCK_SIZE;
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_AFTER_WRAPPED_DATA_CONF_RESP)
 		attr_len += 5;
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 	msg = wpabuf_alloc(attr_len);
 	if (!clear || !msg)
 		goto fail;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_NO_E_NONCE_CONF_RESP) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - no E-nonce");
 		goto skip_e_nonce;
@@ -4313,20 +4313,20 @@ dpp_build_conf_resp(struct dpp_authentication *auth, const u8 *e_nonce,
 		wpa_printf(MSG_INFO, "DPP: TESTING - no Wrapped Data");
 		goto skip_wrapped_data;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	/* E-nonce */
 	wpabuf_put_le16(clear, DPP_ATTR_ENROLLEE_NONCE);
 	wpabuf_put_le16(clear, e_nonce_len);
 	wpabuf_put_data(clear, e_nonce, e_nonce_len);
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 skip_e_nonce:
 	if (dpp_test == DPP_TEST_NO_CONFIG_OBJ_CONF_RESP) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - Config Object");
 		goto skip_config_obj;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	if (conf) {
 		wpabuf_put_le16(clear, DPP_ATTR_CONFIG_OBJ);
@@ -4349,7 +4349,7 @@ skip_e_nonce:
 		wpabuf_put_le16(clear, 0);
 	}
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 skip_config_obj:
 	if (dpp_test == DPP_TEST_NO_STATUS_CONF_RESP) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - Status");
@@ -4359,14 +4359,14 @@ skip_config_obj:
 		wpa_printf(MSG_INFO, "DPP: TESTING - invalid Status");
 		status = 255;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	/* DPP Status */
 	dpp_build_attr_status(msg, status);
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 skip_status:
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	addr[0] = wpabuf_head(msg);
 	len[0] = wpabuf_len(msg);
@@ -4384,13 +4384,13 @@ skip_status:
 	wpa_hexdump(MSG_DEBUG, "DPP: AES-SIV ciphertext",
 		    wrapped, wpabuf_len(clear) + AES_BLOCK_SIZE);
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_AFTER_WRAPPED_DATA_CONF_RESP) {
 		wpa_printf(MSG_INFO, "DPP: TESTING - attr after Wrapped Data");
 		dpp_build_attr_status(msg, DPP_STATUS_OK);
 	}
 skip_wrapped_data:
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	wpa_hexdump_buf(MSG_DEBUG,
 			"DPP: Configuration Response attributes", msg);
@@ -4419,13 +4419,13 @@ dpp_conf_req_rx(struct dpp_authentication *auth, const u8 *attr_start,
 	struct json_token *root = NULL, *token;
 	enum dpp_netrole netrole;
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	if (dpp_test == DPP_TEST_STOP_AT_CONF_REQ) {
 		wpa_printf(MSG_INFO,
 			   "DPP: TESTING - stop at Config Request");
 		return NULL;
 	}
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 	if (dpp_check_attrs(attr_start, attr_len) < 0) {
 		dpp_auth_fail(auth, "Invalid attribute in config request");
@@ -4903,16 +4903,16 @@ skip_groups:
 	if (crypto_key_compare(key, auth->own_protocol_key) != 1) {
 		wpa_printf(MSG_DEBUG,
 			   "DPP: netAccessKey in connector does not match own protocol key");
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 		if (auth->ignore_netaccesskey_mismatch) {
 			wpa_printf(MSG_DEBUG,
 				   "DPP: TESTING - skip netAccessKey mismatch");
 		} else {
 			goto fail;
 		}
-#else /* CONFIG_WPA_TESTING_OPTIONS */
+#else /* CONFIG_TESTING_OPTIONS */
 		goto fail;
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 	}
 
 	ret = 0;
@@ -5948,7 +5948,7 @@ fail:
 	return ret;
 }
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 static int dpp_test_gen_invalid_key(struct wpabuf *msg,
 				    const struct dpp_curve_params *curve)
 {
@@ -6002,7 +6002,7 @@ fail:
 	tmp = NULL;
 	goto out;
 }
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 static unsigned int dpp_next_id(struct dpp_global *dpp)
 {

components/wpa_supplicant/src/common/dpp.h

@@ -304,12 +304,12 @@ struct dpp_authentication {
 	int send_conn_status;
 	int conn_status_requested;
 	int akm_use_selector;
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 	char *config_obj_override;
 	char *discovery_override;
 	char *groups_override;
 	unsigned int ignore_netaccesskey_mismatch:1;
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 };
 
 struct dpp_configurator {
@@ -327,7 +327,7 @@ struct dpp_introduction {
 	size_t pmk_len;
 };
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_TESTING_OPTIONS
 enum dpp_test_behavior {
 	DPP_TEST_DISABLED = 0,
 	DPP_TEST_AFTER_WRAPPED_DATA_AUTH_REQ = 1,
@@ -432,7 +432,7 @@ extern u8 dpp_protocol_key_override[600];
 extern size_t dpp_protocol_key_override_len;
 extern u8 dpp_nonce_override[DPP_MAX_NONCE_LEN];
 extern size_t dpp_nonce_override_len;
-#endif /* CONFIG_WPA_TESTING_OPTIONS */
+#endif /* CONFIG_TESTING_OPTIONS */
 
 void dpp_bootstrap_info_free(struct dpp_bootstrap_info *info);
 const char * dpp_bootstrap_type_txt(enum dpp_bootstrap_type type);

components/wpa_supplicant/src/wps/wps_common.c

@@ -94,10 +94,10 @@ int wps_derive_keys(struct wps_data *wps)
 	 * due to the public key calculated when wps start, it will not calculate anymore even when we build M1 message, also calculate the key need take a long time
 	 * which would cause WPS fail, so we clean the key after WPS finished .
 	 */
-#ifndef ESP32_WORKAROUND
+#ifndef ESP_SUPPLICANT
 	wpabuf_clear_free(wps->dh_privkey);
 	wps->dh_privkey = NULL;
-#endif //ESP32_WORKAROUND
+#endif /* ESP_SUPPLICANT */
 
 	wpa_hexdump_buf_key(MSG_DEBUG, "WPS: DH shared key", dh_shared);
 

components/wpa_supplicant/test/test_dpp.c

@@ -1,16 +1,7 @@
-/* Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD
-
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
-
- *    http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <stdio.h>
@@ -26,7 +17,7 @@
 #include "../src/common/defs.h"
 #include "../src/common/dpp.h"
 
-#ifdef CONFIG_WPA_TESTING_OPTIONS
+#ifdef CONFIG_ESP_WIFI_TESTING_OPTIONS
 struct dpp_global {
 	void *msg_ctx;
 	struct dl_list bootstrap; /* struct dpp_bootstrap_info */

docs/en/api-guides/coexist.rst

@@ -194,11 +194,11 @@ Setting Coexistence Compile-time Options
 
 .. list::
 
-    - After writing the coexistence program, you must check  :ref:`CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE` option through menuconfig to open coexistence configuration on software, otherwise the coexistence function mentioned above cannot be used.
+    - After writing the coexistence program, you must check  :ref:`CONFIG_ESP_WIFI_SW_COEXIST_ENABLE` option through menuconfig to open coexistence configuration on software, otherwise the coexistence function mentioned above cannot be used.
 
-    :esp32: - To ensure better communication performance of Wi-Fi and Bluetooth in the case of coexistence, run the task of the Wi-Fi protocol stack, the task of the Bluetooth Controller and Host protocol stack on different CPUs. You can use :ref:`CONFIG_BTDM_CTRL_PINNED_TO_CORE_CHOICE` and :ref:`CONFIG_BT_BLUEDROID_PINNED_TO_CORE_CHOICE` (or :ref:`CONFIG_BT_NIMBLE_PINNED_TO_CORE_CHOICE`) to put the tasks of the Bluetooth controller and the host protocol stack on the same CPU, and then use :ref:`CONFIG_ESP32_WIFI_TASK_CORE_ID` to place the task of the Wi-Fi protocol stack on another CPU.
+    :esp32: - To ensure better communication performance of Wi-Fi and Bluetooth in the case of coexistence, run the task of the Wi-Fi protocol stack, the task of the Bluetooth Controller and Host protocol stack on different CPUs. You can use :ref:`CONFIG_BTDM_CTRL_PINNED_TO_CORE_CHOICE` and :ref:`CONFIG_BT_BLUEDROID_PINNED_TO_CORE_CHOICE` (or :ref:`CONFIG_BT_NIMBLE_PINNED_TO_CORE_CHOICE`) to put the tasks of the Bluetooth controller and the host protocol stack on the same CPU, and then use :ref:`CONFIG_ESP_WIFI_TASK_CORE_ID` to place the task of the Wi-Fi protocol stack on another CPU.
 
-    :esp32s3: - To ensure better communication performance of Wi-Fi and Bluetooth in the case of coexistence, run the task of the Wi-Fi protocol stack, the task of the Bluetooth Controller and Host protocol stack on different CPUs. You can use :ref:`CONFIG_BT_CTRL_PINNED_TO_CORE_CHOICE` and :ref:`CONFIG_BT_BLUEDROID_PINNED_TO_CORE_CHOICE` (or :ref:`CONFIG_BT_NIMBLE_PINNED_TO_CORE_CHOICE` ）to put the tasks of the Bluetooth controller and the host protocol stack on the same CPU, and then use :ref:`CONFIG_ESP32_WIFI_TASK_CORE_ID` to place the task of the Wi-Fi protocol stack on another CPU.
+    :esp32s3: - To ensure better communication performance of Wi-Fi and Bluetooth in the case of coexistence, run the task of the Wi-Fi protocol stack, the task of the Bluetooth Controller and Host protocol stack on different CPUs. You can use :ref:`CONFIG_BT_CTRL_PINNED_TO_CORE_CHOICE` and :ref:`CONFIG_BT_BLUEDROID_PINNED_TO_CORE_CHOICE` (or :ref:`CONFIG_BT_NIMBLE_PINNED_TO_CORE_CHOICE` ）to put the tasks of the Bluetooth controller and the host protocol stack on the same CPU, and then use :ref:`CONFIG_ESP_WIFI_TASK_CORE_ID` to place the task of the Wi-Fi protocol stack on another CPU.
 
     :esp32: - In the case of coexistence, BLE SCAN may be interrupted by Wi-Fi and Wi-Fi releases RF resources before the end of the current BLE scan window. In order to make BLE acquire RF resources again within the current scan window, you can check the FULL SCAN configuration option through :ref:`CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED`.
 
@@ -207,14 +207,14 @@ Setting Coexistence Compile-time Options
     - You can reduce the memory consumption by configuring the following options on menuconfig.
 
       1) :ref:`CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY`: enable the configuration of dynamic memory for Bluetooth protocol stack.
-      #) :ref:`CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM`: reduce the number of Wi-Fi static RX buffers.
-      #) :ref:`CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM`: reduce the number of Wi-Fi dynamic RX buffers.
-      #) :ref:`CONFIG_ESP32_WIFI_TX_BUFFER`: enable the configuration of dynamic allocation TX buffers.
-      #) :ref:`CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM`: reduce the number of Wi-Fi dynamic TX buffers.
-      #) :ref:`CONFIG_ESP32_WIFI_TX_BA_WIN`: reduce the number of Wi-Fi Block Ack TX windows.
-      #) :ref:`CONFIG_ESP32_WIFI_RX_BA_WIN`: reduce the number of Wi-Fi Block Ack RX windows.
-      #) :ref:`CONFIG_ESP32_WIFI_MGMT_SBUF_NUM`: reduce the number of Wi-Fi Management Short Buffer.
-      #) :ref:`CONFIG_ESP32_WIFI_RX_IRAM_OPT`: turning off this configuration option will reduce the IRAM memory by approximately 17 KB.
+      #) :ref:`CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM`: reduce the number of Wi-Fi static RX buffers.
+      #) :ref:`CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM`: reduce the number of Wi-Fi dynamic RX buffers.
+      #) :ref:`CONFIG_ESP_WIFI_TX_BUFFER`: enable the configuration of dynamic allocation TX buffers.
+      #) :ref:`CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM`: reduce the number of Wi-Fi dynamic TX buffers.
+      #) :ref:`CONFIG_ESP_WIFI_TX_BA_WIN`: reduce the number of Wi-Fi Block Ack TX windows.
+      #) :ref:`CONFIG_ESP_WIFI_RX_BA_WIN`: reduce the number of Wi-Fi Block Ack RX windows.
+      #) :ref:`CONFIG_ESP_WIFI_MGMT_SBUF_NUM`: reduce the number of Wi-Fi Management Short Buffer.
+      #) :ref:`CONFIG_ESP_WIFI_RX_IRAM_OPT`: turning off this configuration option will reduce the IRAM memory by approximately 17 KB.
       #) :ref:`CONFIG_LWIP_TCP_SND_BUF_DEFAULT`: reduce the default TX buffer size for TCP sockets.
       #) :ref:`CONFIG_LWIP_TCP_WND_DEFAULT`:  reduce the default size of the RX window for TCP sockets.
       #) :ref:`CONFIG_LWIP_TCP_RECVMBOX_SIZE`: reduce the size of the TCP receive mailbox.

docs/en/api-guides/lwip.rst

@@ -406,11 +406,11 @@ Calling ``send()`` or ``sendto()`` repeatedly on a UDP socket may eventually fai
 
 .. only:: esp32
 
-    Increasing the number of TX buffers in the :ref:`Wi-Fi <CONFIG_ESP32_WIFI_TX_BUFFER>` or :ref:`Ethernet <CONFIG_ETH_DMA_TX_BUFFER_NUM>` project configuration (as applicable) may also help.
+    Increasing the number of TX buffers in the :ref:`Wi-Fi <CONFIG_ESP_WIFI_TX_BUFFER>` or :ref:`Ethernet <CONFIG_ETH_DMA_TX_BUFFER_NUM>` project configuration (as applicable) may also help.
 
 .. only:: not esp32 and SOC_WIFI_SUPPORTED
 
-    Increasing the number of TX buffers in the :ref:`Wi-Fi <CONFIG_ESP32_WIFI_TX_BUFFER>` project configuration may also help.
+    Increasing the number of TX buffers in the :ref:`Wi-Fi <CONFIG_ESP_WIFI_TX_BUFFER>` project configuration may also help.
 
 .. _lwip-performance:
 

docs/en/api-guides/performance/ram-usage.rst

@@ -133,7 +133,7 @@ The following options will reduce IRAM usage of some ESP-IDF features:
     - Enable :ref:`CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH`. Enabling this option will place snapshot-related functions, such as ``vTaskGetSnapshot`` or ``uxTaskGetSnapshotAll``, in flash.
     - Enable :ref:`CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH`. Provided these functions are not (incorrectly) used from ISRs, this option is safe to enable in all configurations.
     - Enable :ref:`CONFIG_RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH`. This option is not safe to use if the ISR ringbuf functions are used from an IRAM interrupt context, e.g. if :ref:`CONFIG_UART_ISR_IN_IRAM` is enabled. For the IDF drivers where this is the case you will get an error at run-time when installing the driver in question.
-    :SOC_WIFI_SUPPORTED: - Disable Wi-Fi options :ref:`CONFIG_ESP32_WIFI_IRAM_OPT` and/or :ref:`CONFIG_ESP32_WIFI_RX_IRAM_OPT`. Disabling these options will free available IRAM at the cost of Wi-Fi performance.
+    :SOC_WIFI_SUPPORTED: - Disable Wi-Fi options :ref:`CONFIG_ESP_WIFI_IRAM_OPT` and/or :ref:`CONFIG_ESP_WIFI_RX_IRAM_OPT`. Disabling these options will free available IRAM at the cost of Wi-Fi performance.
     :esp32c3 or esp32s3: - :ref:`CONFIG_SPI_FLASH_ROM_IMPL` enabling this option will free some IRAM but will mean that esp_flash bugfixes and new flash chip support is not available.
     :esp32: - :ref:`CONFIG_SPI_FLASH_ROM_DRIVER_PATCH` disabling this option will free some IRAM but is only available in some flash configurations (see the configuration item help text).
     :esp32: - If the application uses PSRAM and is based on ESP32 rev. 3 (ECO3), setting :ref:`CONFIG_ESP32_REV_MIN` to ``3`` will disable PSRAM bug workarounds, saving ~10kB or more of IRAM.

docs/en/api-guides/performance/size.rst

@@ -319,7 +319,7 @@ The following binary size optimizations apply to a particular component or a fun
 Wi-Fi
 @@@@@
 
-- Disabling :ref:`CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE` will save some Wi-Fi binary size if WPA3 support is not needed. (Note that WPA3 is mandatory for new Wi-Fi device certifications.)
+- Disabling :ref:`CONFIG_ESP_WIFI_ENABLE_WPA3_SAE` will save some Wi-Fi binary size if WPA3 support is not needed. (Note that WPA3 is mandatory for new Wi-Fi device certifications.)
 - Disabling :ref:`CONFIG_ESP_WIFI_SOFTAP_SUPPORT` will save some Wi-Fi binary size if soft-AP support is not needed.
 
 .. only:: esp32

docs/en/api-guides/performance/speed.rst

@@ -181,7 +181,7 @@ Common priorities are:
         - FreeRTOS Timer Task to handle FreeRTOS timer callbacks is created when the scheduler initializes and has minimum task priority (1, :ref:`configurable <CONFIG_FREERTOS_TIMER_TASK_PRIORITY>`). This task is pinned to Core 0.
         - :doc:`/api-guides/event-handling` system task to manage the default system event loop and execute callbacks has high priority (20, ``ESP_TASK_EVENT_PRIO``) and pinned to Core 0. This configuration is only used if the application calls :cpp:func:`esp_event_loop_create_default`, it's possible to call :cpp:func:`esp_event_loop_create` with a custom task configuration instead.
         - :doc:`/api-guides/lwip` TCP/IP task has high priority (18, ``ESP_TASK_TCPIP_PRIO``) and is not pinned to any core (:ref:`configurable<CONFIG_LWIP_TCPIP_TASK_AFFINITY>`).
-        :SOC_WIFI_SUPPORTED: - :doc:`Wi-Fi Driver </api-guides/wifi>` task has high priority (23) and is pinned to Core 0 by default (:ref:`configurable<CONFIG_ESP32_WIFI_TASK_CORE_ID>`).
+        :SOC_WIFI_SUPPORTED: - :doc:`Wi-Fi Driver </api-guides/wifi>` task has high priority (23) and is pinned to Core 0 by default (:ref:`configurable<CONFIG_ESP_WIFI_TASK_CORE_ID>`).
         :SOC_WIFI_SUPPORTED: - Wi-Fi wpa_supplicant component may create dedicated tasks while the Wi-Fi Protected Setup (WPS), WPA2 EAP-TLS, Device Provisioning Protocol (DPP) or BSS Transition Management (BTM) features are in use. These tasks all have low priority (2) and are not pinned to any core.
         :SOC_BT_SUPPORTED: - :doc:`Bluetooth Controller </api-reference/bluetooth/index>` task has high priority (23, ``ESP_TASK_BT_CONTROLLER_PRIO``) and is pinned to Core 0 by default (:ref:`configurable <{IDF_TARGET_CONTROLLER_CORE_CONFIG}>`). The Bluetooth Controller needs to respond to requests with low latency, so it should always be close to the highest priority task assigned to a single CPU.
         :SOC_BT_SUPPORTED: - :doc:`NimBLE Bluetooth Host </api-reference/bluetooth/nimble/index>` host task has high priority (21) and is pinned to Core 0 by default (:ref:`configurable <CONFIG_BT_NIMBLE_PINNED_TO_CORE_CHOICE>`).

docs/en/api-guides/wifi.rst

@@ -2199,7 +2199,7 @@ Wi-Fi AMSDU
 
 .. only:: SOC_SPIRAM_SUPPORTED
 
-    {IDF_TARGET_NAME} supports receiving and transmitting AMSDU. AMSDU TX is disabled by default, since enable AMSDU TX need more memory. Select :ref:`CONFIG_ESP32_WIFI_AMSDU_TX_ENABLED` to enable AMSDU Tx feature, it depends on :ref:`CONFIG_SPIRAM`.
+    {IDF_TARGET_NAME} supports receiving and transmitting AMSDU. AMSDU TX is disabled by default, since enable AMSDU TX need more memory. Select :ref:`CONFIG_ESP_WIFI_AMSDU_TX_ENABLED` to enable AMSDU Tx feature, it depends on :ref:`CONFIG_SPIRAM`.
 
 Wi-Fi Fragment
 -------------------------
@@ -2292,24 +2292,24 @@ Increasing the size or number of the buffers mentioned above properly can improv
 
 **RX direction:**
 
- - :ref:`CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM`
+ - :ref:`CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM`
     This parameter indicates the number of DMA buffer at the hardware layer. Increasing this parameter will increase the sender's one-time receiving throughput, thereby improving the Wi-Fi protocol stack ability to handle burst traffic.
 
- - :ref:`CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM`
+ - :ref:`CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM`
     This parameter indicates the number of RX buffer in the Wi-Fi layer. Increasing this parameter will improve the performance of packet reception. This parameter needs to match the RX buffer size of the LwIP layer.
 
- - :ref:`CONFIG_ESP32_WIFI_RX_BA_WIN`
-    This parameter indicates the size of the AMPDU BA Window at the receiving end. This parameter should be configured to the smaller value between twice of :ref:`CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM` and :ref:`CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM`.
+ - :ref:`CONFIG_ESP_WIFI_RX_BA_WIN`
+    This parameter indicates the size of the AMPDU BA Window at the receiving end. This parameter should be configured to the smaller value between twice of :ref:`CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM` and :ref:`CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM`.
 
  - :ref:`CONFIG_LWIP_TCP_WND_DEFAULT`
     This parameter represents the RX buffer size of the LwIP layer for each TCP stream. Its value should be configured to the value of WIFI_DYNAMIC_RX_BUFFER_NUM (KB) to reach a high and stable performance. Meanwhile, in case of multiple streams, this value needs to be reduced proportionally.
 
 **TX direction:**
 
- - :ref:`CONFIG_ESP32_WIFI_TX_BUFFER`
+ - :ref:`CONFIG_ESP_WIFI_TX_BUFFER`
     This parameter indicates the type of TX buffer, it is recommended to configure it as a dynamic buffer, which can make full use of memory.
 
- - :ref:`CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM`
+ - :ref:`CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM`
     This parameter indicates the number of TX buffer on the Wi-Fi layer. Increasing this parameter will improve the performance of packet sending. The parameter value needs to match the TX buffer size of the LwIP layer.
 
  - :ref:`CONFIG_LWIP_TCP_SND_BUF_DEFAULT`
@@ -2319,10 +2319,10 @@ Increasing the size or number of the buffers mentioned above properly can improv
 
 .. only:: esp32 or esp32s2
 
-    - :ref:`CONFIG_ESP32_WIFI_IRAM_OPT`
+    - :ref:`CONFIG_ESP_WIFI_IRAM_OPT`
         If this option is enabled, some Wi-Fi functions are moved to IRAM, improving throughput. This increases IRAM usage by 15 kB.
 
-    - :ref:`CONFIG_ESP32_WIFI_RX_IRAM_OPT`
+    - :ref:`CONFIG_ESP_WIFI_RX_IRAM_OPT`
         If this option is enabled, some Wi-Fi RX functions are moved to IRAM, improving throughput. This increases IRAM usage by 16 kB.
 
  - :ref:`CONFIG_LWIP_IRAM_OPTIMIZATION`
@@ -2886,7 +2886,7 @@ The parameters not mentioned in the following table should be set to the default
     Using PSRAM
     ++++++++++++++++++++++++++++
 
-    PSRAM is generally used when the application takes up a lot of memory. In this mode, the :ref:`CONFIG_ESP32_WIFI_TX_BUFFER` is forced to be static. :ref:`CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM` indicates the number of DMA buffers at the hardware layer, and increasing this parameter can improve performance.
+    PSRAM is generally used when the application takes up a lot of memory. In this mode, the :ref:`CONFIG_ESP_WIFI_TX_BUFFER` is forced to be static. :ref:`CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM` indicates the number of DMA buffers at the hardware layer, and increasing this parameter can improve performance.
     The following are the recommended ranks for using PSRAM:
 
     .. only:: esp32

docs/zh_CN/api-guides/coexist.rst

@@ -194,11 +194,11 @@ BLE MESH 共存状态描述
 
 .. list::
 
-    - 在完成共存程序编写的时候，您必须通过 menuconfig 选择 :ref:`CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE` 打开软件共存配置选项，否则就无法使用上文中提到的共存功能。
+    - 在完成共存程序编写的时候，您必须通过 menuconfig 选择 :ref:`CONFIG_ESP_WIFI_SW_COEXIST_ENABLE` 打开软件共存配置选项，否则就无法使用上文中提到的共存功能。
 
-    :esp32: - 为了在共存情况下获得更好的 Wi-Fi 和蓝牙的通信性能，建议将 Wi-Fi 协议栈的 task 和蓝牙 Controller 以及 Host 协议栈的 task 运行在不同的 CPU 上。您可以通过 :ref:`CONFIG_BTDM_CTRL_PINNED_TO_CORE_CHOICE` 和 :ref:`CONFIG_BT_BLUEDROID_PINNED_TO_CORE_CHOICE` （或者 :ref:`CONFIG_BT_NIMBLE_PINNED_TO_CORE_CHOICE` ）选择将蓝牙 controller 以及 host 协议栈的 task 放在同一个 CPU 上，再通过 :ref:`CONFIG_ESP32_WIFI_TASK_CORE_ID`  选择将 Wi-Fi 协议栈 task 放在另一个 CPU 上。
+    :esp32: - 为了在共存情况下获得更好的 Wi-Fi 和蓝牙的通信性能，建议将 Wi-Fi 协议栈的 task 和蓝牙 Controller 以及 Host 协议栈的 task 运行在不同的 CPU 上。您可以通过 :ref:`CONFIG_BTDM_CTRL_PINNED_TO_CORE_CHOICE` 和 :ref:`CONFIG_BT_BLUEDROID_PINNED_TO_CORE_CHOICE` （或者 :ref:`CONFIG_BT_NIMBLE_PINNED_TO_CORE_CHOICE` ）选择将蓝牙 controller 以及 host 协议栈的 task 放在同一个 CPU 上，再通过 :ref:`CONFIG_ESP_WIFI_TASK_CORE_ID`  选择将 Wi-Fi 协议栈 task 放在另一个 CPU 上。
 
-    :esp32s3: - 为了在共存情况下获得更好的 Wi-Fi 和蓝牙的通信性能，建议将 Wi-Fi 协议栈的 task 和蓝牙 Controller 以及 Host 协议栈的 task 运行在不同的 CPU 上，您可以通过 :ref:`CONFIG_BT_CTRL_PINNED_TO_CORE_CHOICE` 和 :ref:`CONFIG_BT_BLUEDROID_PINNED_TO_CORE_CHOICE` （或者 :ref:`CONFIG_BT_NIMBLE_PINNED_TO_CORE_CHOICE` ）选择将蓝牙 controller 以及 host 协议栈的 task 放在同一个 CPU 上，再通过 :ref:`CONFIG_ESP32_WIFI_TASK_CORE_ID`  选择将 Wi-Fi 协议栈 task 放在另一个 CPU 上。
+    :esp32s3: - 为了在共存情况下获得更好的 Wi-Fi 和蓝牙的通信性能，建议将 Wi-Fi 协议栈的 task 和蓝牙 Controller 以及 Host 协议栈的 task 运行在不同的 CPU 上，您可以通过 :ref:`CONFIG_BT_CTRL_PINNED_TO_CORE_CHOICE` 和 :ref:`CONFIG_BT_BLUEDROID_PINNED_TO_CORE_CHOICE` （或者 :ref:`CONFIG_BT_NIMBLE_PINNED_TO_CORE_CHOICE` ）选择将蓝牙 controller 以及 host 协议栈的 task 放在同一个 CPU 上，再通过 :ref:`CONFIG_ESP_WIFI_TASK_CORE_ID`  选择将 Wi-Fi 协议栈 task 放在另一个 CPU 上。
 
     :esp32: - 在共存情况下 BLE SCAN 可能会被 Wi-Fi 打断且 Wi-Fi 在当前的 BLE scan window 结束前释放了 RF 资源。为了使 BLE 在当前的 scan window 内再次获取 RF 资源，您可以通过 :ref:`CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED` 选择打开 FULL SCAN 配置选项。
 
@@ -207,14 +207,14 @@ BLE MESH 共存状态描述
     - 您可以通过修改以下 menuconfig 选项，以减小内存开销：
 
       1) :ref:`CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY` 选择打开蓝牙协议栈动态内存配置选项。
-      #) :ref:`CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM`  选择减少 Wi-Fi 静态接收数据缓冲区的数量。
-      #) :ref:`CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM` 选择减少 Wi-Fi 动态接收数据缓冲区的数量。
-      #) :ref:`CONFIG_ESP32_WIFI_TX_BUFFER` 选择使用动态分配发送数据缓冲区配置选项。
-      #) :ref:`CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM` 选择减少 Wi-Fi 动态发送数据缓冲区的数量。
-      #) :ref:`CONFIG_ESP32_WIFI_TX_BA_WIN` 选择减少 Wi-Fi Block Ack TX 窗口的数量。
-      #) :ref:`CONFIG_ESP32_WIFI_RX_BA_WIN` 选择减少 Wi-Fi Block Ack RX 窗口的数量。
-      #) :ref:`CONFIG_ESP32_WIFI_MGMT_SBUF_NUM` 选择减少 Wi-Fi 管理短缓冲区的数量。
-      #) :ref:`CONFIG_ESP32_WIFI_RX_IRAM_OPT` 选择关闭此配置选项，关闭此配置选项将会减少大约 17 KB 的 IRAM 内存。
+      #) :ref:`CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM`  选择减少 Wi-Fi 静态接收数据缓冲区的数量。
+      #) :ref:`CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM` 选择减少 Wi-Fi 动态接收数据缓冲区的数量。
+      #) :ref:`CONFIG_ESP_WIFI_TX_BUFFER` 选择使用动态分配发送数据缓冲区配置选项。
+      #) :ref:`CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM` 选择减少 Wi-Fi 动态发送数据缓冲区的数量。
+      #) :ref:`CONFIG_ESP_WIFI_TX_BA_WIN` 选择减少 Wi-Fi Block Ack TX 窗口的数量。
+      #) :ref:`CONFIG_ESP_WIFI_RX_BA_WIN` 选择减少 Wi-Fi Block Ack RX 窗口的数量。
+      #) :ref:`CONFIG_ESP_WIFI_MGMT_SBUF_NUM` 选择减少 Wi-Fi 管理短缓冲区的数量。
+      #) :ref:`CONFIG_ESP_WIFI_RX_IRAM_OPT` 选择关闭此配置选项，关闭此配置选项将会减少大约 17 KB 的 IRAM 内存。
       #) :ref:`CONFIG_LWIP_TCP_SND_BUF_DEFAULT` 选择减小 TCP 套接字默认发送缓存区大小。
       #) :ref:`CONFIG_LWIP_TCP_WND_DEFAULT` 选择减小 TCP 套接字默认接收窗口的大小。
       #) :ref:`CONFIG_LWIP_TCP_RECVMBOX_SIZE` 选择减小 TCP 接收邮箱的大小。

docs/zh_CN/api-guides/wifi.rst

@@ -2199,7 +2199,7 @@ Wi-Fi AMSDU
 
 .. only:: SOC_SPIRAM_SUPPORTED
 
-    {IDF_TARGET_NAME} 支持接收和发送 AMSDU。开启 AMSDU 发送比较消耗内存，默认不开启 AMSDU 发送。可通过选项 :ref:`CONFIG_ESP32_WIFI_AMSDU_TX_ENABLED` 使能 AMSDU 发送功能， 但是使能 AMSDU 发送依赖于 :ref:`CONFIG_SPIRAM` 。
+    {IDF_TARGET_NAME} 支持接收和发送 AMSDU。开启 AMSDU 发送比较消耗内存，默认不开启 AMSDU 发送。可通过选项 :ref:`CONFIG_ESP_WIFI_AMSDU_TX_ENABLED` 使能 AMSDU 发送功能， 但是使能 AMSDU 发送依赖于 :ref:`CONFIG_SPIRAM` 。
 
 Wi-Fi 分片
 -------------------------
@@ -2292,24 +2292,24 @@ Wi-Fi 使用的堆内存峰值是 Wi-Fi 驱动程序 **理论上消耗的最大
 
 **接收数据方向：**
 
- - :ref:`CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM`
+ - :ref:`CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM`
     该参数表示硬件层的 DMA 缓冲区数量。提高该参数将增加发送方的一次性接收吞吐量，从而提高 Wi-Fi 协议栈处理突发流量的能力。
 
- - :ref:`CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM`
+ - :ref:`CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM`
     该参数表示 Wi-Fi 层中接收数据缓冲区的数量。提高该参数可以增强数据包的接收性能。该参数需要与 LWIP 层的接收数据缓冲区大小相匹配。
 
- - :ref:`CONFIG_ESP32_WIFI_RX_BA_WIN`
-    该参数表示接收端 AMPDU BA 窗口的大小，应配置为 :ref:`CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM` 和 :ref:`CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM` 的二倍数值中较小的数值。
+ - :ref:`CONFIG_ESP_WIFI_RX_BA_WIN`
+    该参数表示接收端 AMPDU BA 窗口的大小，应配置为 :ref:`CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM` 和 :ref:`CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM` 的二倍数值中较小的数值。
 
  - :ref:`CONFIG_LWIP_TCP_WND_DEFAULT`
     该参数表示 LWIP 层用于每个 TCP 流的的接收数据缓冲区大小，应配置为 WIFI_DYNAMIC_RX_BUFFER_NUM (KB) 的值，从而实现高稳定性能。同时，在有多个流的情况下，应相应降低该参数值。
 
 **发送数据方向：**
 
- - :ref:`CONFIG_ESP32_WIFI_TX_BUFFER`
+ - :ref:`CONFIG_ESP_WIFI_TX_BUFFER`
     该参数表示发送数据缓冲区的类型，建议配置为动态缓冲区，该配置可以充分利用内存。
 
- - :ref:`CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM`
+ - :ref:`CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM`
     该参数表示 Wi-Fi 层发送数据缓冲区数量。提高该参数可以增强数据包发送的性能。该参数值需要与 LWIP 层的发送数据缓冲区大小相匹配。
 
  - :ref:`CONFIG_LWIP_TCP_SND_BUF_DEFAULT`
@@ -2319,10 +2319,10 @@ Wi-Fi 使用的堆内存峰值是 Wi-Fi 驱动程序 **理论上消耗的最大
 
 .. only:: esp32 or esp32s2
 
-    - :ref:`CONFIG_ESP32_WIFI_IRAM_OPT`
+    - :ref:`CONFIG_ESP_WIFI_IRAM_OPT`
         如果使能该选项，一些 Wi-Fi 功能将被移至 IRAM，从而提高吞吐量，IRAM 使用量将增加 15 kB。
 
-    - :ref:`CONFIG_ESP32_WIFI_RX_IRAM_OPT`
+    - :ref:`CONFIG_ESP_WIFI_RX_IRAM_OPT`
         如果使能该选项，一些 Wi-Fi 接收数据功能将被移至 IRAM，从而提高吞吐量，IRAM 使用量将增加 16 kB。
 
  - :ref:`CONFIG_LWIP_IRAM_OPTIMIZATION`
@@ -2886,7 +2886,7 @@ Wi-Fi 使用的堆内存峰值是 Wi-Fi 驱动程序 **理论上消耗的最大
     使用 PSRAM
     ++++++++++++++++++++++++++++
 
-    PSRAM 一般在应用程序占用大量内存时使用。在该模式下，:ref:`CONFIG_ESP32_WIFI_TX_BUFFER` 被强制为静态。:ref:`CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM` 表示硬件层 DMA 缓冲区数量，提高这一参数可以增强性能。
+    PSRAM 一般在应用程序占用大量内存时使用。在该模式下，:ref:`CONFIG_ESP_WIFI_TX_BUFFER` 被强制为静态。:ref:`CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM` 表示硬件层 DMA 缓冲区数量，提高这一参数可以增强性能。
     以下是使用 PSRAM 时的推荐等级。
 
     .. only:: esp32

examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/sdkconfig.defaults

@@ -63,20 +63,20 @@ CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 #
 # Wi-Fi
 #
-CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y
-CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_BALANCE=y
-CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_VALUE=2
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
-CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
-CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=16
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=16
-CONFIG_ESP32_WIFI_NVS_ENABLED=y
-CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=6
+CONFIG_ESP_WIFI_SW_COEXIST_ENABLE=y
+CONFIG_ESP_WIFI_SW_COEXIST_PREFERENCE_BALANCE=y
+CONFIG_ESP_WIFI_SW_COEXIST_PREFERENCE_VALUE=2
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_STATIC_TX_BUFFER=y
+CONFIG_ESP_WIFI_TX_BUFFER_TYPE=0
+CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=16
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=16
+CONFIG_ESP_WIFI_NVS_ENABLED=y
+CONFIG_ESP_WIFI_MGMT_SBUF_NUM=6
 
 #
 # FreeRTOS

examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults

@@ -29,13 +29,13 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
 
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=32
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=32
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=32
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=32
 
 CONFIG_FREERTOS_UNICORE=n
 CONFIG_FREERTOS_HZ=1000
@@ -54,7 +54,7 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
 CONFIG_LWIP_IRAM_OPTIMIZATION=n
 
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+CONFIG_ESP_WIFI_RX_IRAM_OPT=n
 
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32c3

@@ -28,13 +28,13 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
 
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=32
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=32
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=32
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=32
 
 CONFIG_FREERTOS_UNICORE=n
 CONFIG_FREERTOS_HZ=1000
@@ -53,7 +53,7 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
 CONFIG_LWIP_IRAM_OPTIMIZATION=n
 
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+CONFIG_ESP_WIFI_RX_IRAM_OPT=n
 
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32c6

@@ -30,13 +30,13 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
 
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=32
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=32
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=32
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=32
 
 CONFIG_FREERTOS_UNICORE=n
 CONFIG_FREERTOS_HZ=1000
@@ -55,7 +55,7 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
 CONFIG_LWIP_IRAM_OPTIMIZATION=n
 
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+CONFIG_ESP_WIFI_RX_IRAM_OPT=n
 
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32s3

@@ -28,13 +28,13 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
 
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=32
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=32
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=32
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=32
 
 CONFIG_FREERTOS_UNICORE=n
 CONFIG_FREERTOS_HZ=1000
@@ -53,7 +53,7 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
 CONFIG_LWIP_IRAM_OPTIMIZATION=n
 
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+CONFIG_ESP_WIFI_RX_IRAM_OPT=n
 
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

examples/peripherals/usb/host/uvc/sdkconfig.defaults

@@ -14,11 +14,11 @@ CONFIG_USB_HOST_HW_BUFFER_BIAS_IN=y
 #
 # WIFI
 #
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=8
-CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=8
-CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_RX_BA_WIN=8
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=8
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=8
+CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM=8
+CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_RX_BA_WIN=8
 
 #
 # LWIP

examples/system/base_mac_address/main/base_mac_address_example_main.c

@@ -83,7 +83,7 @@ void app_main(void)
     //Get the derived MAC address for each network interface
     uint8_t derived_mac_addr[6] = {0};
 
-#ifdef CONFIG_ESP32_WIFI_ENABLED
+#ifdef CONFIG_ESP_WIFI_ENABLED
     //Get MAC address for WiFi Station interface
     ESP_ERROR_CHECK(esp_read_mac(derived_mac_addr, ESP_MAC_WIFI_STA));
     ESP_LOGI("WIFI_STA MAC", "0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x",
@@ -95,7 +95,7 @@ void app_main(void)
     ESP_LOGI("SoftAP MAC", "0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x",
              derived_mac_addr[0], derived_mac_addr[1], derived_mac_addr[2],
              derived_mac_addr[3], derived_mac_addr[4], derived_mac_addr[5]);
-#endif // CONFIG_ESP32_WIFI_ENABLED
+#endif // CONFIG_ESP_WIFI_ENABLED
 
 #ifdef CONFIG_ESP_MAC_ADDR_UNIVERSE_BT
     //Get MAC address for Bluetooth

examples/system/base_mac_address/pytest_base_mac_address.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 
 import pytest
@@ -35,7 +35,7 @@ def test_base_mac_address(dut: Dut) -> None:
 
     sdkconfig = dut.app.sdkconfig
 
-    if sdkconfig.get('ESP32_WIFI_ENABLED'):
+    if sdkconfig.get('ESP_WIFI_ENABLED'):
         dut.expect_exact('WIFI_STA MAC: ' + get_expected_mac_string(0, dut.target), timeout=2)
         dut.expect_exact('SoftAP MAC: ' + get_expected_mac_string(1, dut.target))
 

examples/wifi/iperf/sdkconfig.ci.01

@@ -6,13 +6,13 @@ CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
 CONFIG_FREERTOS_UNICORE=n
 CONFIG_FREERTOS_HZ=1000
 
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=12
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=48
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=48
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=12
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=12
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=12
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=48
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=48
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=12
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=12
 
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=11488
 CONFIG_LWIP_TCP_WND_DEFAULT=11488

examples/wifi/iperf/sdkconfig.ci.02

@@ -6,13 +6,13 @@ CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
 CONFIG_FREERTOS_UNICORE=n
 CONFIG_FREERTOS_HZ=1000
 
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=32
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=32
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=32
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=32
 
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=11488
 CONFIG_LWIP_TCP_WND_DEFAULT=11488

examples/wifi/iperf/sdkconfig.ci.03

@@ -6,13 +6,13 @@ CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
 CONFIG_FREERTOS_UNICORE=n
 CONFIG_FREERTOS_HZ=1000
 
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=32
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=32
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=32
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=32
 
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=32768
 CONFIG_LWIP_TCP_WND_DEFAULT=32768

examples/wifi/iperf/sdkconfig.ci.04

@@ -6,13 +6,13 @@ CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
 CONFIG_FREERTOS_UNICORE=n
 CONFIG_FREERTOS_HZ=1000
 
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=32
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=32
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=32
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=32
 
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65535
 CONFIG_LWIP_TCP_WND_DEFAULT=65535

examples/wifi/iperf/sdkconfig.ci.05

@@ -6,13 +6,13 @@ CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
 CONFIG_FREERTOS_UNICORE=n
 CONFIG_FREERTOS_HZ=1000
 
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=32
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=32
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=32
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=32
 
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534
 CONFIG_LWIP_TCP_WND_DEFAULT=65534

examples/wifi/iperf/sdkconfig.ci.06

@@ -1,12 +1,12 @@
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
 
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=32
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=32
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=32
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=32
 
 CONFIG_FREERTOS_UNICORE=y
 CONFIG_FREERTOS_HZ=1000

examples/wifi/iperf/sdkconfig.ci.07

@@ -3,13 +3,13 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=80
 
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
 
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=32
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=32
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=32
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=32
 
 CONFIG_FREERTOS_UNICORE=n
 CONFIG_FREERTOS_HZ=1000

examples/wifi/iperf/sdkconfig.defaults.esp32

@@ -1,13 +1,13 @@
 #
 # ESP32-specific
 #
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=32
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=32
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=32
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=32
 
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534
 CONFIG_LWIP_TCP_WND_DEFAULT=65534

examples/wifi/iperf/sdkconfig.defaults.esp32c2

@@ -1,13 +1,13 @@
 #
 # ESP32-C2
 #
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=14
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=18
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=18
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=16
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=16
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=14
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=18
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=18
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=16
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=16
 
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=18432
 CONFIG_LWIP_TCP_WND_DEFAULT=18432

examples/wifi/iperf/sdkconfig.defaults.esp32c3

@@ -1,13 +1,13 @@
 #
 # ESP32C3
 #
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=20
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=40
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=40
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=32
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=32
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=20
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=40
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=40
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=32
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=32
 
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=40960
 CONFIG_LWIP_TCP_WND_DEFAULT=40960

examples/wifi/iperf/sdkconfig.defaults.esp32c6

@@ -1,14 +1,14 @@
 #
 # ESP32C6-Specific
 #
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=20
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=38
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=35
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=20
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=20
-CONFIG_ESP32_WIFI_NVS_ENABLED=n
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=20
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=38
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=35
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=20
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=20
+CONFIG_ESP_WIFI_NVS_ENABLED=n
 
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=30000
 CONFIG_LWIP_TCP_WND_DEFAULT=34000

examples/wifi/iperf/sdkconfig.defaults.esp32s2

@@ -1,13 +1,13 @@
 #
 # ESP32S2-specific
 #
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=24
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=24
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=16
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=16
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=8
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=24
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=24
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=16
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=16
 
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=28000
 CONFIG_LWIP_TCP_WND_DEFAULT=28000

examples/wifi/iperf/sdkconfig.defaults.esp32s3

@@ -1,13 +1,13 @@
 #
 # ESP32S3-specific
 #
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=32
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=32
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=32
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=32
 
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65535
 CONFIG_LWIP_TCP_WND_DEFAULT=65535

examples/wifi/itwt/sdkconfig.defaults.esp32c6

@@ -1,14 +1,14 @@
 #
 # ESP32C6-Specific
 #
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=20
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=38
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=35
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=20
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=20
-CONFIG_ESP32_WIFI_NVS_ENABLED=n
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=20
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=38
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=35
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=20
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=20
+CONFIG_ESP_WIFI_NVS_ENABLED=n
 
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=30000
 CONFIG_LWIP_TCP_WND_DEFAULT=34000

examples/wifi/roaming/sdkconfig.ci

@@ -1,2 +1,2 @@
 # Add CI coverage for WPA supplicant debug feature
-CONFIG_WPA_DEBUG_PRINT=y
+CONFIG_ESP_WIFI_DEBUG_PRINT=y

examples/wifi/roaming/sdkconfig.defaults

@@ -1,4 +1,4 @@
-CONFIG_WPA_11KV_SUPPORT=y
-CONFIG_WPA_SCAN_CACHE=y
-CONFIG_WPA_MBO_SUPPORT=y
-CONFIG_WPA_11R_SUPPORT=y
+CONFIG_ESP_WIFI_11KV_SUPPORT=y
+CONFIG_ESP_WIFI_SCAN_CACHE=y
+CONFIG_ESP_WIFI_MBO_SUPPORT=y
+CONFIG_ESP_WIFI_11R_SUPPORT=y

examples/wifi/wifi_eap_fast/README.md

@@ -11,7 +11,7 @@ This example shows how ESP32 connects to AP with Wi-Fi enterprise encryption usi
 4. Enable wpa2 enterprise.
 5. Connect to AP.
 
-*Note:* 1. EAP-FAST is not supported with `CONFIG_WPA_MBEDTLS_CRYPTO` and so is disabled by default.
+*Note:* 1. EAP-FAST is not supported with `CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT` and so is disabled by default.
         2. Setting the config `fast_provisioning` to methods 0 and 1 do not support saving the PAC credentials in case of a restart or loss of power.
         3. The certificates present in the `examples/wifi/wifi_eap_fast/main` folder contain server certificates which have the corresponding CA as well. These can be used for server validation which is opptional.
         4. The expiration date of these certificates is 2027/06/05.

examples/wifi/wifi_eap_fast/main/Kconfig.projbuild

@@ -10,7 +10,7 @@ menu "Example Configuration"
             depends on IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3
             select ESP_WIFI_GCMP_SUPPORT
             select ESP_WIFI_GMAC_SUPPORT
-            select WPA_SUITE_B_192
+            select ESP_WIFI_SUITE_B_192
     endchoice
 
     config EXAMPLE_WIFI_SSID

examples/wifi/wifi_eap_fast/sdkconfig.defaults

@@ -1 +1 @@
-CONFIG_WPA_MBEDTLS_TLS_CLIENT=n
+CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=n

examples/wifi/wifi_easy_connect/dpp-enrollee/sdkconfig.defaults

@@ -1 +1 @@
-CONFIG_WPA_DPP_SUPPORT=y
+CONFIG_ESP_WIFI_DPP_SUPPORT=y

examples/wifi/wifi_enterprise/main/Kconfig.projbuild

@@ -18,7 +18,7 @@ menu "Example Configuration"
             depends on IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3
             select ESP_WIFI_GCMP_SUPPORT
             select ESP_WIFI_GMAC_SUPPORT
-            select WPA_SUITE_B_192
+            select ESP_WIFI_SUITE_B_192
     endchoice
 
     if EXAMPLE_WPA_WPA2_ENTERPRISE

examples/wifi/wps_softap_registrar/sdkconfig.defaults

@@ -1,2 +1,2 @@
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
-CONFIG_WPA_WPS_SOFTAP_REGISTRAR=y
+CONFIG_ESP_WIFI_WPS_SOFTAP_REGISTRAR=y

tools/ci/check_copyright_ignore.txt

@@ -585,7 +585,6 @@ components/esp_system/test_eh_frame_parser/linker.ld
 components/esp_system/ubsan.c
 components/esp_wifi/include/esp_private/esp_wifi_types_private.h
 components/esp_wifi/include/esp_private/wifi_types.h
-components/esp_wifi/include/esp_smartconfig.h
 components/esp_wifi/include/smartconfig_ack.h
 components/esp_wifi/src/lib_printf.c
 components/esp_wifi/src/mesh_event.c
@@ -1284,7 +1283,6 @@ components/wpa_supplicant/src/wps/wps_enrollee.c
 components/wpa_supplicant/src/wps/wps_i.h
 components/wpa_supplicant/src/wps/wps_registrar.c
 components/wpa_supplicant/src/wps/wps_validate.c
-components/wpa_supplicant/test/test_dpp.c
 components/xtensa/eri.c
 components/xtensa/esp32/include/xtensa/config/core-isa.h
 components/xtensa/esp32/include/xtensa/config/core-matmap.h

tools/ldgen/samples/sdkconfig

@@ -196,17 +196,17 @@ CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
 #
 # Wi-Fi
 #
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
-CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
-CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=6
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=6
-CONFIG_ESP32_WIFI_NVS_ENABLED=y
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=10
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32
+CONFIG_ESP_WIFI_STATIC_TX_BUFFER=
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER=y
+CONFIG_ESP_WIFI_TX_BUFFER_TYPE=1
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=32
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=6
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=6
+CONFIG_ESP_WIFI_NVS_ENABLED=y
 
 #
 # PHY

tools/unit-test-app/configs/psram

@@ -3,8 +3,8 @@ TEST_EXCLUDE_COMPONENTS=bt driver esp_system spi_flash test_utils soc esp-tls sd
 CONFIG_SPIRAM=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=800
 CONFIG_SPIRAM_OCCUPY_NO_HOST=y
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
-CONFIG_ESP32_WIFI_IRAM_OPT=n
+CONFIG_ESP_WIFI_RX_IRAM_OPT=n
+CONFIG_ESP_WIFI_IRAM_OPT=n
 # Disable encrypted flash reads/writes to save IRAM in this build configuration
 CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n
 CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY=y

tools/unit-test-app/configs/psram_2

@@ -3,5 +3,5 @@ TEST_COMPONENTS=esp_system spi_flash soc
 CONFIG_SPIRAM=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=800
 CONFIG_SPIRAM_OCCUPY_NO_HOST=y
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+CONFIG_ESP_WIFI_RX_IRAM_OPT=n
 CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y

tools/unit-test-app/configs/psram_3

@@ -3,4 +3,4 @@ TEST_COMPONENTS=driver sdmmc
 CONFIG_SPIRAM=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=800
 CONFIG_SPIRAM_OCCUPY_NO_HOST=y
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+CONFIG_ESP_WIFI_RX_IRAM_OPT=n

tools/unit-test-app/configs/psram_all_ext_1

@@ -3,6 +3,6 @@ TEST_COMPONENTS=driver esp_system
 CONFIG_SPIRAM=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=800
 CONFIG_SPIRAM_OCCUPY_NO_HOST=y
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+CONFIG_ESP_WIFI_RX_IRAM_OPT=n
 CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0

tools/unit-test-app/configs/psram_all_ext_2

@@ -3,6 +3,6 @@ TEST_COMPONENTS=soc spi_flash
 CONFIG_SPIRAM=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=800
 CONFIG_SPIRAM_OCCUPY_NO_HOST=y
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+CONFIG_ESP_WIFI_RX_IRAM_OPT=n
 CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0