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/fix_disable_gcmp_choose_pairwise_cipher_wrong_issue' into 'master'

Browse Source 
fix(wifi): fixed disable gcmp choose pairwise cipher wrong issue

Closes WIFIBUG-603 and WIFIBUG-403

See merge request espressif/esp-idf!31229
This commit is contained in:
Jiang Jiang Jian 2024-06-03 15:41:03 +08:00
commit 0e39655d70
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,6 +242,12 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
#define WIFI_FTM_RESPONDER 0 #define WIFI_FTM_RESPONDER 0
#endif #endif
#if CONFIG_GCMP
#define WIFI_ENABLE_GCMP (1<<4)
#else
#define WIFI_ENABLE_GCMP 0
#endif
#if CONFIG_ESP_WIFI_ENABLE_DUMP_HESIGB && !WIFI_CSI_ENABLED #if CONFIG_ESP_WIFI_ENABLE_DUMP_HESIGB && !WIFI_CSI_ENABLED
#define WIFI_DUMP_HESIGB_ENABLED true #define WIFI_DUMP_HESIGB_ENABLED true
#else #else
@ -258,12 +264,14 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
#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)
/* 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 | \
WIFI_ENABLE_SPIRAM | \ WIFI_ENABLE_SPIRAM | \
WIFI_FTM_INITIATOR | \ WIFI_FTM_INITIATOR | \
WIFI_FTM_RESPONDER) WIFI_FTM_RESPONDER | \
WIFI_ENABLE_GCMP)
#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 cb49ddb64b9fd10f0b0bb62445611e903e275eef Subproject commit e16a9ee1b2c72c423e497ea62b34ae87761f7fd6