aboutsummaryrefslogtreecommitdiffstats
path: root/src/wps
diff options
context:
space:
mode:
authorSpencer Chang <jungwalk@gmail.com>2011-12-29 21:32:06 +0200
committerJouni Malinen <j@w1.fi>2011-12-29 21:32:06 +0200
commit62a8ea7d01428ed717eb36b32020ce9a89fb59ae (patch)
tree711f182f26bb3ff493867c7e0c97b03ef2e3222d /src/wps
parentb9fd8ce8040cdbefca9db4e3db62ab51b6c2b192 (diff)
downloadexternal_wpa_supplicant_8_ti-62a8ea7d01428ed717eb36b32020ce9a89fb59ae.zip
external_wpa_supplicant_8_ti-62a8ea7d01428ed717eb36b32020ce9a89fb59ae.tar.gz
external_wpa_supplicant_8_ti-62a8ea7d01428ed717eb36b32020ce9a89fb59ae.tar.bz2
WPS: Cancel previous registered wps_registrar_pbc_timeout
Since wps_registrar_pbc_timeout is called to stop PBC, previously registered wps_registrar_pbc_timeout must be canceled when canceling the WPS operation. Signed-off-by: Spencer Chang <jungwalk@gmail.com>
Diffstat (limited to 'src/wps')
-rw-r--r--src/wps/wps_registrar.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
index eda1c70..e5e8d28 100644
--- a/src/wps/wps_registrar.c
+++ b/src/wps/wps_registrar.c
@@ -962,6 +962,7 @@ int wps_registrar_wps_cancel(struct wps_registrar *reg)
if (reg->pbc) {
wpa_printf(MSG_DEBUG, "WPS: PBC is set - cancelling it");
wps_registrar_pbc_timeout(reg, NULL);
+ eloop_cancel_timeout(wps_registrar_pbc_timeout, reg, NULL);
return 1;
} else if (reg->selected_registrar) {
/* PIN Method */