Merge branch 'bugfix/beacon_security_downgrade' into 'master'

jack0c · jack0c · commit 0dba93293313 · 2020-07-02T16:45:27.000+08:00
Avoid parsing RSN/WPA IE's after connection

See merge request espressif/esp-idf!9181
diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h
@@ -94,8 +94,7 @@ typedef enum {
     WIFI_REASON_ASSOC_FAIL               = 203,
     WIFI_REASON_HANDSHAKE_TIMEOUT        = 204,
     WIFI_REASON_CONNECTION_FAIL          = 205,
-    WIFI_REASON_AUTH_CHANGED             = 206,
-    WIFI_REASON_AP_TSF_RESET             = 207,
+    WIFI_REASON_AP_TSF_RESET             = 206,
 } wifi_err_reason_t;
 
 typedef enum {
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 511dd9e12efc66a881657a7a5cddcb154bc378fd
+Subproject commit 766d68b3e3a7b5b07c533252f605fba15d659080
diff --git a/docs/en/api-guides/wifi.rst b/docs/en/api-guides/wifi.rst
@@ -1012,13 +1012,6 @@ The table below shows the reason-code defined in {IDF_TARGET_NAME}. The first co
 |                           |       |         | connection to the AP has failed.                            |
 |                           |       |         |                                                             |
 +---------------------------+-------+---------+-------------------------------------------------------------+
-| AUTH_CHANGED              |  206  |reserved | Espressif-specific Wi-Fi reason-code: the                   |
-|                           |       |         | disconnection has happened since AP has changed the         |
-|                           |       |         | authmode.                                                   |
-|                           |       |         |                                                             |
-+---------------------------+-------+---------+-------------------------------------------------------------+
-
-
 
 {IDF_TARGET_NAME} Wi-Fi Station Connecting When Multiple APs Are Found
 ----------------------------------------------------------------------
