diff --git a/components/esp32/include/esp_wifi.h b/components/esp32/include/esp_wifi.h
index 572a7dc744..00e9ec1d6e 100644
--- a/components/esp32/include/esp_wifi.h
+++ b/components/esp32/include/esp_wifi.h
@@ -87,6 +87,7 @@ extern "C" {
 #define ESP_ERR_WIFI_SSID        (ESP_ERR_WIFI_BASE + 9)   /*!< SSID is invalid */
 #define ESP_ERR_WIFI_PASSWORD    (ESP_ERR_WIFI_BASE + 10)  /*!< Passord is invalid */
 #define ESP_ERR_WIFI_TIMEOUT     (ESP_ERR_WIFI_BASE + 11)  /*!< Timeout error */
+#define ESP_ERR_WIFI_WAKE_FAIL   (ESP_ERR_WIFI_BASE + 12)  /*!< WiFi is in sleep state(RF closed) and wakeup fail */
 
 /**
  * @brief WiFi stack configuration parameters passed to esp_wifi_init call.
@@ -327,6 +328,8 @@ esp_err_t esp_wifi_sta_get_ap_info(wifi_ap_record_t *ap_info);
 /**
   * @brief     Set current power save type
   *
+  * @attention Default power save type is WIFI_PS_NONE.
+  *
   * @param     type  power save type
   *
   * @return    ESP_ERR_WIFI_NOT_SUPPORT: not supported yet
@@ -336,6 +339,8 @@ esp_err_t esp_wifi_set_ps(wifi_ps_type_t type);
 /**
   * @brief     Get current power save type
   *
+  * @attention Default power save type is WIFI_PS_NONE.
+  *
   * @param[out]  type: store current power save type
   *
   * @return    ESP_ERR_WIFI_NOT_SUPPORT: not supported yet
diff --git a/components/esp32/include/esp_wpa2.h b/components/esp32/include/esp_wpa2.h
index 6d88c9a127..1857d19a16 100644
--- a/components/esp32/include/esp_wpa2.h
+++ b/components/esp32/include/esp_wpa2.h
@@ -128,7 +128,7 @@ void esp_wifi_sta_wpa2_ent_clear_ca_cert(void);
   * @param  client_cert: point to address where stores the client certificate;
   *         client_cert_len: length of client certificate;
   *         private_key: point to address where stores the private key;
-  *         private_key_len: length of private key;
+  *         private_key_len: length of private key, limited to 1~2048;
   *         private_key_password: point to address where stores the private key password;
   *         private_key_password_len: length of private key password;
   *
diff --git a/components/esp32/lib b/components/esp32/lib
index 2559c73c2c..3a412c08af 160000
--- a/components/esp32/lib
+++ b/components/esp32/lib
@@ -1 +1 @@
-Subproject commit 2559c73c2c9c5794b08499f3a559b65b54707d7d
+Subproject commit 3a412c08af1ace47a58d1f8722a8fed5b8d3b944
diff --git a/components/lwip/include/lwip/port/lwipopts.h b/components/lwip/include/lwip/port/lwipopts.h
index 4475cd4e99..8612eb11b0 100755
--- a/components/lwip/include/lwip/port/lwipopts.h
+++ b/components/lwip/include/lwip/port/lwipopts.h
@@ -595,7 +595,6 @@ extern unsigned char misc_prof_get_tcp_snd_buf(void);
 #define DHCP_DEBUG                      LWIP_DBG_OFF
 #define LWIP_DEBUG                      LWIP_DBG_OFF
 #define TCP_DEBUG                       LWIP_DBG_OFF
-#define ESP_THREAD_SAFE_DEBUG           LWIP_DBG_OFF
 
 #define CHECKSUM_CHECK_UDP              0
 #define CHECKSUM_CHECK_IP               0