Просмотр исходного кода

Merge branch 'bugfix/wpa3_ble_coex_issue_v4.1' into 'release/v4.1'

Fix WPA3 Auth timeout during BLE coex (Backport 4.1)

See merge request espressif/esp-idf!9208
Jiang Jiang Jian 5 лет назад
Родитель
Сommit
97f10f6509

+ 1 - 0
components/esp_wifi/include/esp_wifi_types.h

@@ -57,6 +57,7 @@ typedef enum {
     WIFI_AUTH_WPA_WPA2_PSK,     /**< authenticate mode : WPA_WPA2_PSK */
     WIFI_AUTH_WPA2_ENTERPRISE,  /**< authenticate mode : WPA2_ENTERPRISE */
     WIFI_AUTH_WPA3_PSK,         /**< authenticate mode : WPA3_PSK */
+    WIFI_AUTH_WPA2_WPA3_PSK,    /**< authenticate mode : WPA2_WPA3_PSK */
     WIFI_AUTH_MAX
 } wifi_auth_mode_t;
 

+ 1 - 1
components/esp_wifi/lib

@@ -1 +1 @@
-Subproject commit 9d92c8ebc2a7ba94fcb55b2721279ba4ea19bb6f
+Subproject commit 3f4b0c46a6c921682c437cd71ae7a25c7a4b8642

+ 6 - 0
examples/wifi/scan/main/scan.c

@@ -43,6 +43,12 @@ static void print_auth_mode(int authmode)
     case WIFI_AUTH_WPA2_ENTERPRISE:
         ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA2_ENTERPRISE");
         break;
+    case WIFI_AUTH_WPA3_PSK:
+        ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA3_PSK");
+        break;
+    case WIFI_AUTH_WPA2_WPA3_PSK:
+        ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA2_WPA3_PSK");
+        break;
     default:
         ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_UNKNOWN");
         break;