DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Android: Fix max number of sched scan SSIDs based on driver capability

Browse source 
This adds use of the driver capability (instead of hardcoded
WPAS_MAX_SCAN_SSIDS) in wpas_start_pno() similarly to what was already
done in wpa_supplicant_req_sched_scan().

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
Dmitry Shmidt 2016-03-28 10:58:53 -07:00 committed by Jouni Malinen
parent f1a5a34d8e
commit f89c32e63f
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wpa_supplicant/scan.c
View file

@ -2334,10 +2334,18 @@ int wpas_start_pno(struct wpa_supplicant *wpa_s)
struct wpa_ssid *ssid; struct wpa_ssid *ssid;
struct wpa_driver_scan_params params; struct wpa_driver_scan_params params;
struct sched_scan_plan scan_plan; struct sched_scan_plan scan_plan;
unsigned int max_sched_scan_ssids;
if (!wpa_s->sched_scan_supported) if (!wpa_s->sched_scan_supported)
return -1; 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) if (wpa_s->pno || wpa_s->pno_sched_pending)
return 0; return 0;
@ -2381,10 +2389,10 @@ int wpas_start_pno(struct wpa_supplicant *wpa_s)
num_ssid++; 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 " wpa_printf(MSG_DEBUG, "PNO: Use only the first %u SSIDs from "
"%u", WPAS_MAX_SCAN_SSIDS, (unsigned int) num_ssid); "%u", max_sched_scan_ssids, (unsigned int) num_ssid);
num_ssid = WPAS_MAX_SCAN_SSIDS; num_ssid = max_sched_scan_ssids;
} }
if (num_match_ssid > wpa_s->max_match_sets) { if (num_match_ssid > wpa_s->max_match_sets) {