From dca006cecc5f6ab91697c68c0169db975f2378f5 Mon Sep 17 00:00:00 2001 From: Yeshwanth Sriram Guntuka Date: Fri, 16 Nov 2018 17:58:08 +0530 Subject: [PATCH] qcacmn: Remove ssid check for finding scan dup entry Probe responses received from hidden AP after beacons with non-zero ssid length will use a new entry in scan db resulting in multiple scan entries for same AP. Fix is to remove ssid check in util_is_scan_entry_match api. Change-Id: I1c094d483a40d40f7ca9d40b26d04a7f80099dd1 CRs-Fixed: 2353339 --- umac/scan/dispatcher/src/wlan_scan_utils_api.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/umac/scan/dispatcher/src/wlan_scan_utils_api.c b/umac/scan/dispatcher/src/wlan_scan_utils_api.c index ac6e2bc4b46c..456a6b42beb7 100644 --- a/umac/scan/dispatcher/src/wlan_scan_utils_api.c +++ b/umac/scan/dispatcher/src/wlan_scan_utils_api.c @@ -131,13 +131,11 @@ bool util_is_scan_entry_match( if (entry1->cap_info.wlan_caps.ess && !qdf_mem_cmp(entry1->bssid.bytes, - entry2->bssid.bytes, QDF_MAC_ADDR_SIZE) && - util_scan_scm_chan_to_band( - entry1->channel.chan_idx) == - util_scan_scm_chan_to_band(entry2->channel.chan_idx)) { + entry2->bssid.bytes, QDF_MAC_ADDR_SIZE)) { /* Check for BSS */ if (util_is_ssid_match(&entry1->ssid, &entry2->ssid) || - util_scan_is_null_ssid(&entry1->ssid)) + util_scan_is_null_ssid(&entry1->ssid) || + util_scan_is_null_ssid(&entry2->ssid)) return true; } else if (entry1->cap_info.wlan_caps.ibss && (entry1->channel.chan_idx ==