Merge branch 'bugfix/some_wifi_fixes_v5.2' into 'release/v5.2'

fix(wifi): backport some wifi changes to v5.2 See merge request espressif/esp-idf!28367
espressif · Jan 16, 2024 · 6769179 · 6769179
2 parents 977a90b + d1a363a
commit 6769179
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h
@@ -56,7 +56,7 @@ typedef struct {
 } wifi_country_t;
 
 /* 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 {
     WIFI_AUTH_OPEN = 0,         /**< authenticate mode : open */
     WIFI_AUTH_WEP,              /**< authenticate mode : WEP */
@@ -71,6 +71,7 @@ typedef enum {
     WIFI_AUTH_OWE,              /**< authenticate mode : OWE */
     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_MIXED_MODE, /**< authenticate mode: WPA3_PSK + WPA3_PSK_EXT_KEY */
     WIFI_AUTH_MAX
 } wifi_auth_mode_t;
 

diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
diff --git a/examples/mesh/internal_communication/sdkconfig.defaults b/examples/mesh/internal_communication/sdkconfig.defaults
@@ -0,0 +1 @@
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
diff --git a/examples/system/ota/advanced_https_ota/sdkconfig.ci.bluedroid b/examples/system/ota/advanced_https_ota/sdkconfig.ci.bluedroid
@@ -7,6 +7,7 @@ CONFIG_CTRL_BTDM_MODEM_SLEEP=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_BT_STACK_NO_LOG=y
 
 # Partition Table
 CONFIG_PARTITION_TABLE_CUSTOM=y

diff --git a/examples/wifi/scan/main/scan.c b/examples/wifi/scan/main/scan.c
@@ -58,6 +58,9 @@ static void print_auth_mode(int authmode)
     case WIFI_AUTH_WPA3_EXT_PSK:
         ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA3_EXT_PSK");
         break;
+    case WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE:
+        ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE");
+        break;
     default:
         ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_UNKNOWN");
         break;
+ −		esp32/libcore.a
+ −		esp32/libespnow.a
+ −		esp32/libmesh.a
+ −		esp32/libnet80211.a
+ −		esp32/libpp.a
+ −		esp32/libsmartconfig.a
+ −		esp32/libwapi.a
+ −		esp32c2/libcore.a
+ −		esp32c2/libespnow.a
+ −		esp32c2/libnet80211.a
+ −		esp32c2/libpp.a
+ −		esp32c2/libsmartconfig.a
+ −		esp32c3/libcore.a
+ −		esp32c3/libespnow.a
+ −		esp32c3/libmesh.a
+ −		esp32c3/libnet80211.a
+ −		esp32c3/libpp.a
+ −		esp32c3/libsmartconfig.a
+ −		esp32c3/libwapi.a
+ −		esp32c6/libcore.a
+ −		esp32c6/libespnow.a
+ −		esp32c6/libmesh.a
+ −		esp32c6/libnet80211.a
+ −		esp32c6/libpp.a
+ −		esp32c6/libsmartconfig.a
+ −		esp32c6/libwapi.a
+ −		esp32s2/libcore.a
+ −		esp32s2/libespnow.a
+ −		esp32s2/libmesh.a
+ −		esp32s2/libnet80211.a
+ −		esp32s2/libpp.a
+ −		esp32s2/libsmartconfig.a
+ −		esp32s2/libwapi.a
+ −		esp32s3/libcore.a
+ −		esp32s3/libespnow.a
+ −		esp32s3/libmesh.a
+ −		esp32s3/libnet80211.a
+ −		esp32s3/libpp.a
+ −		esp32s3/libsmartconfig.a
+ −		esp32s3/libwapi.a