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/some_wifi_fixes_v5.2' into 'release/v5.2'

Browse Source 
fix(wifi): backport some wifi changes to v5.2

See merge request espressif/esp-idf!28367
This commit is contained in:
Jiang Jiang Jian 2024-01-16 18:43:38 +08:00
commit 676917955e
5 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/esp_wifi/include/esp_wifi_types.h
View File

@ -56,7 +56,7 @@ typedef struct {
} wifi_country_t; } wifi_country_t;
/* Strength of authmodes */ /* Strength of authmodes */
/* OPEN < WEP < WPA_PSK < OWE < WPA2_PSK = WPA_WPA2_PSK < WAPI_PSK < WPA3_PSK = WPA2_WPA3_PSK < WPA3_EXT_PSK */ /* OPEN < WEP < WPA_PSK < OWE < WPA2_PSK = WPA_WPA2_PSK < WAPI_PSK < WPA3_PSK = WPA2_WPA3_PSK < WPA3_EXT_PSK = WPA3_EXT_PSK_MIXED_MODE */
typedef enum { typedef enum {
WIFI_AUTH_OPEN = 0, /**< authenticate mode : open */ WIFI_AUTH_OPEN = 0, /**< authenticate mode : open */
WIFI_AUTH_WEP, /**< authenticate mode : WEP */ WIFI_AUTH_WEP, /**< authenticate mode : WEP */
@ -71,6 +71,7 @@ typedef enum {
WIFI_AUTH_OWE, /**< authenticate mode : OWE */ WIFI_AUTH_OWE, /**< authenticate mode : OWE */
WIFI_AUTH_WPA3_ENT_192, /**< authenticate mode : WPA3_ENT_SUITE_B_192_BIT */ WIFI_AUTH_WPA3_ENT_192, /**< authenticate mode : WPA3_ENT_SUITE_B_192_BIT */
WIFI_AUTH_WPA3_EXT_PSK, /**< authenticate mode : WPA3_PSK_EXT_KEY */ WIFI_AUTH_WPA3_EXT_PSK, /**< authenticate mode : WPA3_PSK_EXT_KEY */
WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE, /**< authenticate mode: WPA3_PSK + WPA3_PSK_EXT_KEY */
WIFI_AUTH_MAX WIFI_AUTH_MAX
} wifi_auth_mode_t; } wifi_auth_mode_t;

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit aa0de74487b6f753b433e1d6f107fc3b7e505f16 Subproject commit b4991a9d2216f2cab9d7dfa1ed666be478f1aee0

1
examples/mesh/internal_communication/sdkconfig.defaults Normal file
View File

@ -0,0 +1 @@
CONFIG_COMPILER_OPTIMIZATION_SIZE=y

1
examples/system/ota/advanced_https_ota/sdkconfig.ci.bluedroid
View File

@ -7,6 +7,7 @@ CONFIG_CTRL_BTDM_MODEM_SLEEP=y
CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
CONFIG_BT_STACK_NO_LOG=y
# Partition Table # Partition Table
CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_PARTITION_TABLE_CUSTOM=y

3
examples/wifi/scan/main/scan.c
View File

@ -58,6 +58,9 @@ static void print_auth_mode(int authmode)
case WIFI_AUTH_WPA3_EXT_PSK: case WIFI_AUTH_WPA3_EXT_PSK:
ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA3_EXT_PSK"); ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA3_EXT_PSK");
break; break;
case WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE:
ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE");
break;
default: default:
ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_UNKNOWN"); ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_UNKNOWN");
break; break;