aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2011-12-31 11:25:37 (GMT)
committerJouni Malinen <j@w1.fi>2011-12-31 11:25:37 (GMT)
commit5fd9fb2772dd0292c4dcaa5bca0e5aecedfcff7d (patch)
treedf7a4bbb590c13a7344c4c3830b52b9a2949063d
parent1e7fb4f1b7cdf16705cfcc1fd171807a9f8e3a56 (diff)
downloadhostap-5fd9fb2772dd0292c4dcaa5bca0e5aecedfcff7d.zip
hostap-5fd9fb2772dd0292c4dcaa5bca0e5aecedfcff7d.tar.gz
hostap-5fd9fb2772dd0292c4dcaa5bca0e5aecedfcff7d.tar.bz2
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 <j@w1.fi>
-rw-r--r--wpa_supplicant/wpa_supplicant.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 675b592..7f5c7d4 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -2849,6 +2849,11 @@ void wpas_connection_failed(struct wpa_supplicant *wpa_s, const u8 *bssid)
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.
* The current blacklist count indicates how many times we have tried