From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Thu, 9 Feb 2017 11:25:29 +0000 (+0200)
Subject: RRM: Fix range request overriding
X-Git-Tag: hostap_2_7~1634
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=401243b73e67d5ecd362bf98df297c208ef677a6;p=thirdparty%2Fhostap.git

RRM: Fix range request overriding

This was supposed to cancel the existing eloop timeout instead of
registering another one.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
---

diff --git a/src/ap/rrm.c b/src/ap/rrm.c
index a49fd24d8..56ed29c1c 100644
--- a/src/ap/rrm.c
+++ b/src/ap/rrm.c
@@ -473,9 +473,8 @@ int hostapd_send_range_req(struct hostapd_data *hapd, const u8 *addr,
 		wpa_printf(MSG_DEBUG,
 			   "Request range: Range request is already in process; overriding");
 		hapd->range_req_active = 0;
-		eloop_register_timeout(HOSTAPD_RRM_REQUEST_TIMEOUT, 0,
-				       hostapd_range_rep_timeout_handler, hapd,
-				       NULL);
+		eloop_cancel_timeout(hostapd_range_rep_timeout_handler, hapd,
+				     NULL);
 	}
 
 	/* Action + measurement type + token + reps + EID + len = 7 */