alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/11r_disable_sdkconfig_v5.0' into 'release/v5.0'

Browse Source 
fix(wifi): Ignore 11R, ENT AP when disabled in sdkconfig

See merge request espressif/esp-idf!32149
This commit is contained in:
Jiang Jiang Jian 2024-07-17 10:43:41 +08:00
commit 01ac18f468
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/esp_wifi/include/esp_wifi.h
View File

@ -245,12 +245,26 @@ extern const wpa_crypto_funcs_t g_wifi_default_wpa_crypto_funcs;
#define WIFI_ENABLE_GMAC 0 #define WIFI_ENABLE_GMAC 0
#endif #endif
#if CONFIG_ESP_WIFI_11R_SUPPORT
#define WIFI_ENABLE_11R (1<<6)
#else
#define WIFI_ENABLE_11R 0
#endif
#if CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT
#define WIFI_ENABLE_ENTERPRISE (1<<7)
#else
#define WIFI_ENABLE_ENTERPRISE 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)
#define CONFIG_FEATURE_FTM_RESPONDER_BIT (1<<3) #define CONFIG_FEATURE_FTM_RESPONDER_BIT (1<<3)
#define CONFIG_FEATURE_GCMP_BIT (1<<4) #define CONFIG_FEATURE_GCMP_BIT (1<<4)
#define CONFIG_FEATURE_GMAC_BIT (1<<5) #define CONFIG_FEATURE_GMAC_BIT (1<<5)
#define CONFIG_FEATURE_11R_BIT (1<<6)
#define CONFIG_FEATURE_WIFI_ENT_BIT (1<<7)
/* 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 | \
@ -258,7 +272,9 @@ extern const wpa_crypto_funcs_t g_wifi_default_wpa_crypto_funcs;
WIFI_FTM_INITIATOR | \ WIFI_FTM_INITIATOR | \
WIFI_FTM_RESPONDER | \ WIFI_FTM_RESPONDER | \
WIFI_ENABLE_GCMP | \ WIFI_ENABLE_GCMP | \
WIFI_ENABLE_GMAC) WIFI_ENABLE_GMAC | \
WIFI_ENABLE_11R | \
WIFI_ENABLE_ENTERPRISE)
#define WIFI_INIT_CONFIG_DEFAULT() { \ #define WIFI_INIT_CONFIG_DEFAULT() { \
.osi_funcs = &g_wifi_osi_funcs, \ .osi_funcs = &g_wifi_osi_funcs, \

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit 8210349d418d982170823901b80a55a36b2c2362 Subproject commit 1cd42d0f9f517c69a7e06502220ee2cfd46d64b5