summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Seto <wseto@qti.qualcomm.com>2014-07-11 10:50:52 -0700
committerPitani Venkata Rajesh Kumar <c_vpitan@qti.qualcomm.com>2014-07-16 12:36:06 +0530
commit9c94bb45c5da87bc6ee4deefd1e3d108a8fb713a (patch)
tree3fdf5e57b36c9cc5230b1fa95018695f37e056e4
parentaa6073e2b9b2569e7387652a36e55d501423170c (diff)
wlan: Can't scan the hidden externel SSID when the 1st SSID is empty
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: 691894
-rw-r--r--CORE/HDD/src/wlan_hdd_cfg80211.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index ef26ef934bea..5eb30147bc7b 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -8326,7 +8326,8 @@ int __wlan_hdd_cfg80211_scan( struct wiphy *wiphy,
* set to 1. Because 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;
}