Cumulative patch from commit 37fd0be2d3ca50c9035e67041328099356a46860 am: 4ae50e65ef
am: a09d6b3e21
Change-Id: Ib49ea6402924d0e1104f3c501562f6c64a4e0866
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index 6ade9af..4ae559e 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -587,6 +587,11 @@
{
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 : max_ssids - 1;
for (i = 0; i < wpa_s->scan_id_count; i++) {
unsigned int j;