Merge branch 'bugfix/support_auto_mode_connect_passive_channel_hhidden_ap_v5.4' into 'release/v5.4'

feat(wifi): support auto mode connect passive channel hidden ap(Backport v5.4)

See merge request espressif/esp-idf!49055
This commit is contained in:
Jiang Jiang Jian
2026-06-01 11:11:37 +08:00
3 changed files with 18 additions and 3 deletions
+7
View File
@@ -789,6 +789,13 @@ menu "Wi-Fi"
This option enables assert checks to verify that modem RF power state This option enables assert checks to verify that modem RF power state
is correctly cleared before pmu sleep. is correctly cleared before pmu sleep.
config ESP_WIFI_PASSIVE_HIDDEN_AP_SUPPORT
bool "Support station connection to hidden APs using passive scan when country policy is auto"
default n
help
Select this option to enable/disable support for station connections
to hidden APs using passive scan when the country policy is set to auto.
endif # wifi enabled endif # wifi enabled
endmenu # Wi-Fi endmenu # Wi-Fi
+10 -2
View File
@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -278,6 +278,12 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
#define WIFI_TX_HETB_QUEUE_NUM 1 #define WIFI_TX_HETB_QUEUE_NUM 1
#endif #endif
#if CONFIG_ESP_WIFI_PASSIVE_HIDDEN_AP_SUPPORT
#define WIFI_ENABLE_PASSIVE_HIDDEN_AP (1<<8)
#else
#define WIFI_ENABLE_PASSIVE_HIDDEN_AP 0
#endif
#define CONFIG_FEATURE_WPA3_SAE_BIT (1<<0) #define CONFIG_FEATURE_WPA3_SAE_BIT (1<<0)
#define CONFIG_FEATURE_CACHE_TX_BUF_BIT (1<<1) #define CONFIG_FEATURE_CACHE_TX_BUF_BIT (1<<1)
#define CONFIG_FEATURE_FTM_INITIATOR_BIT (1<<2) #define CONFIG_FEATURE_FTM_INITIATOR_BIT (1<<2)
@@ -286,6 +292,7 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
#define CONFIG_FEATURE_GMAC_BIT (1<<5) #define CONFIG_FEATURE_GMAC_BIT (1<<5)
#define CONFIG_FEATURE_11R_BIT (1<<6) #define CONFIG_FEATURE_11R_BIT (1<<6)
#define CONFIG_FEATURE_WIFI_ENT_BIT (1<<7) #define CONFIG_FEATURE_WIFI_ENT_BIT (1<<7)
#define CONFIG_FEATURE_WIFI_PASSIVE_HIDDEN_AP_BIT (1<<8)
/* Set additional WiFi features and capabilities */ /* Set additional WiFi features and capabilities */
#define WIFI_FEATURE_CAPS (WIFI_ENABLE_WPA3_SAE | \ #define WIFI_FEATURE_CAPS (WIFI_ENABLE_WPA3_SAE | \
@@ -295,7 +302,8 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
WIFI_ENABLE_GCMP | \ WIFI_ENABLE_GCMP | \
WIFI_ENABLE_GMAC | \ WIFI_ENABLE_GMAC | \
WIFI_ENABLE_11R | \ WIFI_ENABLE_11R | \
WIFI_ENABLE_ENTERPRISE) WIFI_ENABLE_ENTERPRISE | \
WIFI_ENABLE_PASSIVE_HIDDEN_AP)
#define WIFI_INIT_CONFIG_DEFAULT() { \ #define WIFI_INIT_CONFIG_DEFAULT() { \
.osi_funcs = &g_wifi_osi_funcs, \ .osi_funcs = &g_wifi_osi_funcs, \