diff --git a/components/esp_wifi/lib_esp32 b/components/esp_wifi/lib_esp32
index 78c0f85ad..2d738fb92 160000
--- a/components/esp_wifi/lib_esp32
+++ b/components/esp_wifi/lib_esp32
@@ -1 +1 @@
-Subproject commit 78c0f85ad4d9bcd62dbfc787694bac8d4e0c0a19
+Subproject commit 2d738fb92a94ac26e6dd38592c7454733fa8a4a9
diff --git a/components/wpa_supplicant/src/esp_supplicant/esp_wpa2.c b/components/wpa_supplicant/src/esp_supplicant/esp_wpa2.c
index fafba677c..85d8ccd24 100644
--- a/components/wpa_supplicant/src/esp_supplicant/esp_wpa2.c
+++ b/components/wpa_supplicant/src/esp_supplicant/esp_wpa2.c
@@ -511,7 +511,7 @@ out:
     return ret;
 }
 
-static int wpa2_sm_rx_eapol(u8 *src_addr, u8 *buf, u32 len, uint8_t *bssid)
+static int eap_sm_rx_eapol(u8 *src_addr, u8 *buf, u32 len, uint8_t *bssid)
 {
     struct eap_sm *sm = gEapSm;
 
@@ -545,6 +545,30 @@ static int wpa2_sm_rx_eapol(u8 *src_addr, u8 *buf, u32 len, uint8_t *bssid)
 #endif
 }
 
+static int wpa2_ent_rx_eapol(u8 *src_addr, u8 *buf, u32 len, uint8_t *bssid)
+{
+    struct ieee802_1x_hdr *hdr;
+    int ret = ESP_OK;
+
+    hdr = (struct ieee802_1x_hdr *) buf;
+
+    switch (hdr->type) {
+	    case IEEE802_1X_TYPE_EAPOL_START:
+	    case IEEE802_1X_TYPE_EAP_PACKET:
+	    case IEEE802_1X_TYPE_EAPOL_LOGOFF:
+		    ret = eap_sm_rx_eapol(src_addr, buf, len, bssid);
+		    break;
+	    case IEEE802_1X_TYPE_EAPOL_KEY:
+		    ret = wpa_sm_rx_eapol(src_addr, buf, len);
+		    break;
+	    default:
+		wpa_printf(MSG_ERROR, "Unknown EAPOL packet type - %d\n", hdr->type);
+		    break;
+    }
+
+	return ret;
+}
+
 static int eap_sm_rx_eapol_internal(u8 *src_addr, u8 *buf, u32 len, uint8_t *bssid)
 {
     struct eap_sm *sm = gEapSm;
@@ -613,6 +637,11 @@ static int eap_sm_rx_eapol_internal(u8 *src_addr, u8 *buf, u32 len, uint8_t *bss
 #ifdef EAP_PEER_METHOD
     switch (ehdr->code) {
     case EAP_CODE_REQUEST:
+        /* Handle EAP-reauthentication case */
+        if (sm->finish_state == WPA2_ENT_EAP_STATE_SUCCESS) {
+            wpa_printf(MSG_INFO, ">>>>>wpa2 EAP Re-authentication in progress\n");
+            wpa2_set_eap_state(WPA2_ENT_EAP_STATE_IN_PROGRESS);
+        }
         req = wpabuf_alloc_copy((u8 *)ehdr, len - sizeof(*hdr));
         ret = eap_sm_process_request(sm, req);
         break;
@@ -627,6 +656,7 @@ static int eap_sm_rx_eapol_internal(u8 *src_addr, u8 *buf, u32 len, uint8_t *bss
             wpa_printf(MSG_INFO, ">>>>>wpa2 FINISH\n");
             ret = WPA2_ENT_EAP_STATE_SUCCESS;
             wpa2_set_eap_state(WPA2_ENT_EAP_STATE_SUCCESS);
+            eap_deinit_prev_method(sm, "EAP Success");
         } else {
             wpa_printf(MSG_INFO, ">>>>>wpa2 FAILED, receive EAP_SUCCESS but pmk is empty, potential attack!\n");
             ret = WPA2_ENT_EAP_STATE_FAIL;
@@ -825,7 +855,7 @@ esp_err_t esp_wifi_sta_wpa2_ent_enable_fn(void *arg)
         return ESP_ERR_NO_MEM;
     }
 
-    wpa2_cb->wpa2_sm_rx_eapol = wpa2_sm_rx_eapol;
+    wpa2_cb->wpa2_sm_rx_eapol = wpa2_ent_rx_eapol;
     wpa2_cb->wpa2_start = wpa2_start_eapol;
     wpa2_cb->wpa2_init = eap_peer_sm_init;
     wpa2_cb->wpa2_deinit = eap_peer_sm_deinit;