aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2010-08-26 10:39:58 (GMT)
committerJouni Malinen <j@w1.fi>2010-09-05 14:32:59 (GMT)
commitd0e8c4a0f5ebba2d694e761b580f3c3d2111cf5b (patch)
treeefba9ffbc712ca24a3525715cbf08c71df76f5ac
parent6dadf0b81921c313a805b022f1080038be0170a5 (diff)
downloadhostap-07-d0e8c4a0f5ebba2d694e761b580f3c3d2111cf5b.zip
hostap-07-d0e8c4a0f5ebba2d694e761b580f3c3d2111cf5b.tar.gz
hostap-07-d0e8c4a0f5ebba2d694e761b580f3c3d2111cf5b.tar.bz2
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. (cherry picked from commit eb0a3c7f96a36ce9c7e4d9b8be049149e1f88423)
-rw-r--r--wpa_supplicant/wpa_supplicant.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 5563f0b..37a539d 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1323,6 +1323,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);
}
@@ -1357,6 +1358,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);
}