commit 0fbcc4cde5f93d092d62366ef9615b3edb8fa5f6
author Ben Fennema <fennema@google.com> Fri Apr 08 16:00:34 2016 -0700
committer Ben Fennema <fennema@google.com> Fri Apr 08 16:11:51 2016 -0700
tree 4e52b2aca5e6dde0a073c4ffcefdd7132ff990ba
parent 67b37eec48080ac558cd58b49152180a33c99c13

DO NOT MERGE ANYWHERE Fix max number of sched scan SSIDs based on driver capability

Bug: 26700796

Change-Id: I00a780ff01cc2c1f05da5bce1893ea6ea397c086
Signed-off-by: Ben Fennema <fennema@google.com>

wpa_supplicant/scan.c

diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index e81465c..1fc4b27 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -2259,10 +2259,18 @@
 	size_t i, num_ssid, num_match_ssid;
 	struct wpa_ssid *ssid;
 	struct wpa_driver_scan_params params;
+	unsigned int max_sched_scan_ssids;
 
 	if (!wpa_s->sched_scan_supported)
 		return -1;
 
+	if (wpa_s->max_sched_scan_ssids > WPAS_MAX_SCAN_SSIDS)
+		max_sched_scan_ssids = WPAS_MAX_SCAN_SSIDS;
+	else
+		max_sched_scan_ssids = wpa_s->max_sched_scan_ssids;
+	if (max_sched_scan_ssids < 1)
+		return -1;
+
 	if (wpa_s->pno || wpa_s->pno_sched_pending)
 		return 0;
 
@@ -2306,10 +2314,10 @@
 		num_ssid++;
 	}
 
-	if (num_ssid > WPAS_MAX_SCAN_SSIDS) {
+	if (num_ssid > max_sched_scan_ssids) {
 		wpa_printf(MSG_DEBUG, "PNO: Use only the first %u SSIDs from "
-			   "%u", WPAS_MAX_SCAN_SSIDS, (unsigned int) num_ssid);
-		num_ssid = WPAS_MAX_SCAN_SSIDS;
+			   "%u", max_sched_scan_ssids, (unsigned int) num_ssid);
+		num_ssid = max_sched_scan_ssids;
 	}
 
 	if (num_match_ssid > wpa_s->max_match_sets) {