From: Andrei Otcheretianski Date: Wed, 3 Apr 2019 15:17:14 +0000 (+0300) Subject: Stop SA Query on disconnection X-Git-Tag: hostap_2_8~53 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01ac337b32b634653e675e7af095bfa5ef9fe509;p=thirdparty%2Fhostap.git Stop SA Query on disconnection SA Query wasn't stopped after disconnection, which could potentially result in an unexpected SA timeout firing later when already connected to another AP. Fix that by stopping SA Query when an association is terminated. Signed-off-by: Andrei Otcheretianski --- diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c index 9258a3baa..383f858a0 100644 --- a/wpa_supplicant/sme.c +++ b/wpa_supplicant/sme.c @@ -1985,6 +1985,9 @@ void sme_clear_on_disassoc(struct wpa_supplicant *wpa_s) if (wpa_s->sme.ft_ies || wpa_s->sme.ft_used) sme_update_ft_ies(wpa_s, NULL, NULL, 0); #endif /* CONFIG_IEEE80211R */ +#ifdef CONFIG_IEEE80211W + sme_stop_sa_query(wpa_s); +#endif /* CONFIG_IEEE80211W */ } @@ -1993,9 +1996,6 @@ void sme_deinit(struct wpa_supplicant *wpa_s) os_free(wpa_s->sme.ft_ies); wpa_s->sme.ft_ies = NULL; wpa_s->sme.ft_ies_len = 0; -#ifdef CONFIG_IEEE80211W - sme_stop_sa_query(wpa_s); -#endif /* CONFIG_IEEE80211W */ sme_clear_on_disassoc(wpa_s); eloop_cancel_timeout(sme_assoc_timer, wpa_s, NULL);