From: Spencer Chang <jungwalk@gmail.com>
Date: Thu, 29 Dec 2011 19:32:06 +0000 (+0200)
Subject: WPS: Cancel previous registered wps_registrar_pbc_timeout
X-Git-Tag: aosp-jb-start~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62a8ea7d01428ed717eb36b32020ce9a89fb59ae;p=thirdparty%2Fhostap.git

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>
---

diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
index eda1c7076..e5e8d287f 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 */