diff options
| author | Service qcabuildsw <qcabuildsw@localhost> | 2016-10-28 10:23:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-28 10:23:53 -0700 |
| commit | 48698afb3fddb6db9f871f2aa2591ed850c62ec0 (patch) | |
| tree | 5043592579180dd05d30198d72797e23ccbac605 | |
| parent | 8d26c5d07af78357d37af9173107fd02487446f8 (diff) | |
| parent | 9370edb9995ddb403e6856919050435e9d99520a (diff) | |
| download | android_external_wpa_supplicant_8-48698afb3fddb6db9f871f2aa2591ed850c62ec0.tar.gz android_external_wpa_supplicant_8-48698afb3fddb6db9f871f2aa2591ed850c62ec0.tar.bz2 android_external_wpa_supplicant_8-48698afb3fddb6db9f871f2aa2591ed850c62ec0.zip | |
Merge "Do not exceed scan ssid max size advertised by driver" into wlan-aosp-service.lnx.2.0-dev
| -rw-r--r-- | wpa_supplicant/scan.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 09c7bd89..4b450d7b 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -616,6 +616,12 @@ static void wpa_set_scan_ssids(struct wpa_supplicant *wpa_s, unsigned int i; struct wpa_ssid *ssid; + /* + * For devices with max_ssids greater than 1, leave the last slot empty + * for adding the wildcard scan entry. + */ + max_ssids = max_ssids > 1 ? max_ssids - 1 : max_ssids; + for (i = 0; i < wpa_s->scan_id_count; i++) { unsigned int j; |