From e7cd81aaff6471d64148d860ef2c00f84b0ad821 Mon Sep 17 00:00:00 2001 From: Hanumanth Reddy Pothula Date: Tue, 31 Oct 2017 15:43:19 +0530 Subject: [PATCH] wlan: Can't scan the hidden external 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 --- drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c b/drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c index 6fb9842e0804..dc38e7c77ee4 100755 --- a/drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -4588,8 +4588,8 @@ int wlan_hdd_cfg80211_scan( struct wiphy *wiphy, * 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; }