From 0a34b62be9dee23e0adefed002a420edb0953961 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Tue, 11 Aug 2015 21:46:38 +0300 Subject: [PATCH] Do not allow ap_scan=2 scan processing to stop AP mode operation wpa_supplicant_assoc_try() would result in the currently operating AP to get stopped if wpa_supplicant_scan() ends up getting triggered without MANUAL_SCAN_REQ while operating an AP. With ap_scan=2, this could resulted in unintentional stopping of AP mode operations, so check explicitly for that case and skip the wpa_supplicant_assoc_try() call if needed to avoid this. Signed-off-by: Jouni Malinen --- wpa_supplicant/scan.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 8d0d1a56f..d7049a1a8 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -808,6 +808,9 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx) } if (wpa_s->last_scan_req != MANUAL_SCAN_REQ && +#ifdef CONFIG_AP + !wpa_s->ap_iface && +#endif /* CONFIG_AP */ wpa_s->conf->ap_scan == 2) { wpa_s->connect_without_scan = NULL; wpa_s->prev_scan_wildcard = 0;