commit 998efeb6e1a5dbc9af8e37f6ccbe5ef97c7c54fe
author Hanumanth Reddy Pothula <c_hpothu@codeaurora.org> Tue Oct 31 15:43:19 2017 +0530
committer Hanumanth Reddy Pothula <c_hpothu@codeaurora.org> Thu Nov 23 15:44:50 2017 +0530
tree ff76f2ab6ccd58bcd3f3fb4dce2432a060733918
parent df8b23ceb47b9dd02ed3e13175958d171e4533c0

wlan: Can't scan the hidden externel SSID when the 1st SSID is empty

Propagation from qcacld-2.0 to prima

Because of previous issue with supplicant setting n_ssids to 1 when
there is no SSID provided, wlan_hdd_cfg80211.c simply ignores the
case when the first SSID is empty. However, this fails when the
1st SSID is empty but the one after is not.

Change-Id: I8b25cab6335b59db587fb90d04a31682afa48d06
CRs-Fixed: 2148403

CORE/HDD/src/wlan_hdd_cfg80211.c

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index de5f757..d4c33a8 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -14058,8 +14058,8 @@
      * Becasue of this, driver is assuming that this is not wildcard scan and so
      * is not aging out the scan results.
      */
-    if (request->ssids && '\0' == request->ssids->ssid[0])
-    {
+    if ((request->ssids) && (request->n_ssids == 1) &&
+        ('\0' == request->ssids->ssid[0])) {
         request->n_ssids = 0;
     }