From 0855e2e188f377121d16078d2b68f332d8424119 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 15 Dec 2014 00:55:56 +0200 Subject: [PATCH] Do not allow network block scan_freq override SCAN command frequencies The manual scan operations with the SCAN command are supposed to have independent set of scan frequencies, so do not allow scan_freq parameters to override scanned frequencies for scans that were triggered with a SCAN command. Signed-off-by: Jouni Malinen --- wpa_supplicant/scan.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 9db85b9fc..6f4ea085d 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -816,7 +816,9 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx) wpa_s->last_scan_req == MANUAL_SCAN_REQ) wpa_set_scan_ssids(wpa_s, ¶ms, max_ssids); - for (tssid = wpa_s->conf->ssid; tssid; tssid = tssid->next) { + for (tssid = wpa_s->conf->ssid; + wpa_s->last_scan_req != MANUAL_SCAN_REQ && tssid; + tssid = tssid->next) { if (wpas_network_disabled(wpa_s, tssid)) continue; if ((params.freqs || !freqs_set) && tssid->scan_freq) {