aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/scan.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2014-12-14 22:55:56 (GMT)
committerJouni Malinen <j@w1.fi>2014-12-14 22:55:56 (GMT)
commit0855e2e188f377121d16078d2b68f332d8424119 (patch)
tree857fb07f58d2dbe78e39a859cd77f4bdc7c76f8a /wpa_supplicant/scan.c
parentafa2ffb41344db90d41958ce5d2aeae1d741892c (diff)
downloadhostap-0855e2e188f377121d16078d2b68f332d8424119.zip
hostap-0855e2e188f377121d16078d2b68f332d8424119.tar.gz
hostap-0855e2e188f377121d16078d2b68f332d8424119.tar.bz2
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 <j@w1.fi>
Diffstat (limited to 'wpa_supplicant/scan.c')
-rw-r--r--wpa_supplicant/scan.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index 9db85b9..6f4ea08 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, &params, 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) {