From: Jouni Malinen <j@w1.fi>
Date: Thu, 26 Aug 2010 10:39:58 +0000 (+0300)
Subject: Cancel authentication timeout on local deauth/disassoc request
X-Git-Tag: hostap-1-bp~1221
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb0a3c7f96a36ce9c7e4d9b8be049149e1f88423;p=thirdparty%2Fhostap.git

Cancel authentication timeout on local deauth/disassoc request

Without this, the timeout may be left behind even when we are not
connected and may result in unwanted operation when the timeout
triggers.
---

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 6c0144482..5d6769175 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1326,6 +1326,7 @@ void wpa_supplicant_disassociate(struct wpa_supplicant *wpa_s,
 	eapol_sm_notify_config(wpa_s->eapol, NULL, NULL);
 	if (old_ssid != wpa_s->current_ssid)
 		wpas_notify_network_changed(wpa_s);
+	eloop_cancel_timeout(wpa_supplicant_timeout, wpa_s, NULL);
 }
 
 
@@ -1360,6 +1361,7 @@ void wpa_supplicant_deauthenticate(struct wpa_supplicant *wpa_s,
 	eapol_sm_notify_config(wpa_s->eapol, NULL, NULL);
 	if (old_ssid != wpa_s->current_ssid)
 		wpas_notify_network_changed(wpa_s);
+	eloop_cancel_timeout(wpa_supplicant_timeout, wpa_s, NULL);
 }