Merge branch 'bugfix/fix_the_PMK_bug_and_wifi_reason_code_v3.1' into 'release/v3.1'

fix the PMK bug and wifi reason code (backport v3.1) See merge request idf/esp-idf!4895
2019-04-29 10:52:18 +08:00
parent 56766719df 10a7eacc98
commit 84c96bf5bf
2 changed files with 2 additions and 1 deletions
--- a/components/esp32/include/esp_wifi_types.h
+++ b/components/esp32/include/esp_wifi_types.h
@ -93,6 +93,7 @@ typedef enum {
    WIFI_REASON_AUTH_FAIL                = 202,
    WIFI_REASON_ASSOC_FAIL               = 203,
    WIFI_REASON_HANDSHAKE_TIMEOUT        = 204,
+    WIFI_REASON_CONNECTION_FAIL          = 205,
 } wifi_err_reason_t;

 typedef enum {
--- a/components/esp32/lib
+++ b/components/esp32/lib