From 5fd9fb2772dd0292c4dcaa5bca0e5aecedfcff7d Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 31 Dec 2011 13:25:37 +0200 Subject: [PATCH] Remove possible authentication timeout on connection failure The authentication timeout could be triggered after the connection has already been known to have failed. The event at that point can be confusing, so better cancel the timeout when processing connection failure. Signed-hostap: Jouni Malinen --- wpa_supplicant/wpa_supplicant.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 675b59268..7f5c7d424 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2848,6 +2848,11 @@ void wpas_connection_failed(struct wpa_supplicant *wpa_s, const u8 *bssid) int count; int *freqs = NULL; + /* + * Remove possible authentication timeout since the connection failed. + */ + eloop_cancel_timeout(wpa_supplicant_timeout, wpa_s, NULL); + /* * Add the failed BSSID into the blacklist and speed up next scan * attempt if there could be other APs that could accept association.