aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2013-12-28 17:18:47 (GMT)
committerJouni Malinen <j@w1.fi>2013-12-29 08:00:32 (GMT)
commit0e22b8dd4cb0876e6db013cd26779492783e5332 (patch)
treeb5661c4f02dd5ff8c7ad7929b20fc8ecacfd0f21 /src
parent38ae43de6bdb9824cbd6080250e35c26f8c0e2f5 (diff)
downloadhostap-0e22b8dd4cb0876e6db013cd26779492783e5332.zip
hostap-0e22b8dd4cb0876e6db013cd26779492783e5332.tar.gz
hostap-0e22b8dd4cb0876e6db013cd26779492783e5332.tar.bz2
WPS: Make sure reconfiguration timeout is not left behind on deinit
Even though this is a short timeout, it is at least theoretically possible for the interface to be removed while waiting for reconfiguration to start. Avoid issues with this by cancelling the timeout on any WPS interface deinit. In theory, this should be postponed until interface removal, but that does not fit very nicely to the current wps_hostapd.c style. Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'src')
-rw-r--r--src/ap/wps_hostapd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ap/wps_hostapd.c b/src/ap/wps_hostapd.c
index dd97b12..9edf0f5 100644
--- a/src/ap/wps_hostapd.c
+++ b/src/ap/wps_hostapd.c
@@ -1240,6 +1240,7 @@ void hostapd_deinit_wps(struct hostapd_data *hapd)
{
eloop_cancel_timeout(hostapd_wps_reenable_ap_pin, hapd, NULL);
eloop_cancel_timeout(hostapd_wps_ap_pin_timeout, hapd, NULL);
+ eloop_cancel_timeout(wps_reload_config, hapd->iface, NULL);
if (hapd->wps == NULL)
return;
#ifdef CONFIG_WPS_UPNP