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 6c0144482d5ceb5584fb7b445d4785b25d1f1772..5d6769175a54b437df809985792850e1519fab0a 100644 (file)
--- 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);
 }