Merge branch 'bug/fix_wapi_nvs' into 'master'

Fix wapi authmode in NVS and S3/C3 compability.

See merge request espressif/esp-idf!12203
This commit is contained in:
Jiang Jiang Jian 2021-01-31 18:24:44 +08:00
commit fb18b0ad18
2 changed files with 2 additions and 2 deletions

View File

@ -61,10 +61,10 @@ typedef enum {
WIFI_AUTH_WPA_PSK, /**< authenticate mode : WPA_PSK */
WIFI_AUTH_WPA2_PSK, /**< authenticate mode : WPA2_PSK */
WIFI_AUTH_WPA_WPA2_PSK, /**< authenticate mode : WPA_WPA2_PSK */
WIFI_AUTH_WAPI_PSK, /**< authenticate mode : WAPI_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_WAPI_PSK, /**< authenticate mode : WAPI_PSK */
WIFI_AUTH_MAX
} wifi_auth_mode_t;

@ -1 +1 @@
Subproject commit a7462e95da20b75ad2594e195d12447de79075ad
Subproject commit 5c455dbf8d5469102090f02deb949ac09a1acf11