diff --git a/wpa_supplicant-2.9/src/drivers/wpa_hal.c b/wpa_supplicant-2.9/src/drivers/wpa_hal.c
index 6ccf0afe531c681c2c7c69d30dbc312b56d83594..1d4caad3dd96a4d290654164b59ef80adfe01536 100755
--- a/wpa_supplicant-2.9/src/drivers/wpa_hal.c
+++ b/wpa_supplicant-2.9/src/drivers/wpa_hal.c
@@ -472,6 +472,7 @@ static void WifiWpaDeinit(void *priv)
     }
     FreeWifiDev(wifiDev);
 #endif // CONFIG_OHOS_P2P
+    eloop_cancel_timeout(WifiWpaScanTimeout, drv, drv->ctx);
     WifiCmdSetNetdev(drv->iface, &info);
 
     if (drv->eapolSock != NULL) {
@@ -479,6 +480,7 @@ static void WifiWpaDeinit(void *priv)
     }
 
 #ifdef CONFIG_OHOS_P2P
+    WifiUnregisterEventCallback(OnWpaWiFiEvents, WIFI_KERNEL_TO_WPA_CLIENT, drv->iface);
     if (CountWifiDevInUse() == 0) {
         g_msgInit = TRUE;
         os_free(g_wifiDriverData);
@@ -587,6 +589,7 @@ failed:
     WifiWpaDeinit(drv);
     return NULL;
 }
+
 static int32_t WifiWpaDeauthenticate(void *priv, const uint8_t *addr, uint16_t reasonCode)
 {
     int32_t ret;
@@ -1969,8 +1972,8 @@ static int32_t WifiRemoveIf(void *priv, enum wpa_driver_if_type type, const char
     ret = WifiCmdRemoveIf(drv->iface, &ifRemove);
     wifiDev = GetWifiDevByName(ifName);
     if (wifiDev == NULL) {
-        wpa_printf(MSG_ERROR, "%s: GetWifiDevByName failed.", __FUNCTION__);
-        return -EFAIL;
+        wpa_printf(MSG_INFO, "%s: GetWifiDevByName is null, already free.", __FUNCTION__);
+        return SUCC;
     }
     FreeWifiDev(wifiDev);
     return SUCC;
diff --git a/wpa_supplicant-2.9/wpa_supplicant/Makefile b/wpa_supplicant-2.9/wpa_supplicant/Makefile
index 84c836a7fd600c00bc7c24546c34de48e77b1124..d2d5daba6117633dab424440c2666b451e463742 100755
--- a/wpa_supplicant-2.9/wpa_supplicant/Makefile
+++ b/wpa_supplicant-2.9/wpa_supplicant/Makefile
@@ -5,8 +5,6 @@ else
 CC=../../../../prebuilts/gcc/linux-x86/arm/arm-linux-ohoseabi-gcc/bin/arm-linux-ohoseabi-gcc
 endif
 
-$(warning MYF CC ${CC})
-
 ifndef CFLAGS
 ifeq ($(LIB_TYPE),$(KERNEL_TYPE), 1,linux)
 CFLAGS = -fvisibility=hidden -MMD -O2 -g -w -fsigned-char
diff --git a/wpa_supplicant-2.9/wpa_supplicant/events.c b/wpa_supplicant-2.9/wpa_supplicant/events.c
index 193e56211c7beb36ed2ec4a64809559fcdc4e367..82671d86a3af4c747f04686ab840feb79694bbff 100755
--- a/wpa_supplicant-2.9/wpa_supplicant/events.c
+++ b/wpa_supplicant-2.9/wpa_supplicant/events.c
@@ -4207,7 +4207,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
 	struct wpa_supplicant *wpa_s = ctx;
 	int resched;
 #ifndef CONFIG_NO_STDOUT_DEBUG
-	int level = MSG_DEBUG;
+	int level = MSG_INFO;
 #endif /* CONFIG_NO_STDOUT_DEBUG */
 
 	if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED &&
diff --git a/wpa_supplicant-2.9/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant-2.9/wpa_supplicant/wpa_supplicant.c
index 001a03f30149b8794905b56c857a5ccbac91cdbf..242506fb8fae947430524a086288f1fcb975570a 100755
--- a/wpa_supplicant-2.9/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant-2.9/wpa_supplicant/wpa_supplicant.c
@@ -851,7 +851,7 @@ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s,
 {
 	enum wpa_states old_state = wpa_s->wpa_state;
 
-	wpa_dbg(wpa_s, MSG_DEBUG, "State: %s -> %s",
+	wpa_dbg(wpa_s, MSG_INFO, "State: %s -> %s",
 		wpa_supplicant_state_txt(wpa_s->wpa_state),
 		wpa_supplicant_state_txt(state));
 
diff --git a/wpa_supplicant-2.9_standard/src/drivers/wpa_hal.c b/wpa_supplicant-2.9_standard/src/drivers/wpa_hal.c
index 6ccf0afe531c681c2c7c69d30dbc312b56d83594..1d4caad3dd96a4d290654164b59ef80adfe01536 100644
--- a/wpa_supplicant-2.9_standard/src/drivers/wpa_hal.c
+++ b/wpa_supplicant-2.9_standard/src/drivers/wpa_hal.c
@@ -472,6 +472,7 @@ static void WifiWpaDeinit(void *priv)
     }
     FreeWifiDev(wifiDev);
 #endif // CONFIG_OHOS_P2P
+    eloop_cancel_timeout(WifiWpaScanTimeout, drv, drv->ctx);
     WifiCmdSetNetdev(drv->iface, &info);
 
     if (drv->eapolSock != NULL) {
@@ -479,6 +480,7 @@ static void WifiWpaDeinit(void *priv)
     }
 
 #ifdef CONFIG_OHOS_P2P
+    WifiUnregisterEventCallback(OnWpaWiFiEvents, WIFI_KERNEL_TO_WPA_CLIENT, drv->iface);
     if (CountWifiDevInUse() == 0) {
         g_msgInit = TRUE;
         os_free(g_wifiDriverData);
@@ -587,6 +589,7 @@ failed:
     WifiWpaDeinit(drv);
     return NULL;
 }
+
 static int32_t WifiWpaDeauthenticate(void *priv, const uint8_t *addr, uint16_t reasonCode)
 {
     int32_t ret;
@@ -1969,8 +1972,8 @@ static int32_t WifiRemoveIf(void *priv, enum wpa_driver_if_type type, const char
     ret = WifiCmdRemoveIf(drv->iface, &ifRemove);
     wifiDev = GetWifiDevByName(ifName);
     if (wifiDev == NULL) {
-        wpa_printf(MSG_ERROR, "%s: GetWifiDevByName failed.", __FUNCTION__);
-        return -EFAIL;
+        wpa_printf(MSG_INFO, "%s: GetWifiDevByName is null, already free.", __FUNCTION__);
+        return SUCC;
     }
     FreeWifiDev(wifiDev);
     return SUCC;
diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/events.c b/wpa_supplicant-2.9_standard/wpa_supplicant/events.c
index 193e56211c7beb36ed2ec4a64809559fcdc4e367..82671d86a3af4c747f04686ab840feb79694bbff 100755
--- a/wpa_supplicant-2.9_standard/wpa_supplicant/events.c
+++ b/wpa_supplicant-2.9_standard/wpa_supplicant/events.c
@@ -4207,7 +4207,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
 	struct wpa_supplicant *wpa_s = ctx;
 	int resched;
 #ifndef CONFIG_NO_STDOUT_DEBUG
-	int level = MSG_DEBUG;
+	int level = MSG_INFO;
 #endif /* CONFIG_NO_STDOUT_DEBUG */
 
 	if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED &&
diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c
index 001a03f30149b8794905b56c857a5ccbac91cdbf..242506fb8fae947430524a086288f1fcb975570a 100755
--- a/wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c
@@ -851,7 +851,7 @@ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s,
 {
 	enum wpa_states old_state = wpa_s->wpa_state;
 
-	wpa_dbg(wpa_s, MSG_DEBUG, "State: %s -> %s",
+	wpa_dbg(wpa_s, MSG_INFO, "State: %s -> %s",
 		wpa_supplicant_state_txt(wpa_s->wpa_state),
 		wpa_supplicant_state_txt(state));