commit d5c5c2bbad8bd01eb0c0aaa2d82c2b249911372f
author Deepthi Gowri <c_gowri@qti.qualcomm.com> Thu Jun 11 17:00:46 2015 +0530
committer Satyanarayana Dash <c_sadash@qti.qualcomm.com> Fri Jun 19 16:52:33 2015 +0530
tree 3b38da3585f8563b4c8fd005c7b83a4f2e1a75d8
parent 41d82f03757ed65abab62c5a074146693a1ff3db

wlan: Flush p2p scan results before single channel p2p scan.

Currently the p2p scan results are not flushed if the p2p
scan is issued for a single channel scan which would result
in a stale entry.

To address this, flush the p2p scan results before issuing
single channel p2p scan.

Change-Id: Iaaee1b4b4147e68e99927ea90082bc6f288a2e72
CRS-Fixed: 855782

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 e22ddc4..432cdb3 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -10499,6 +10499,7 @@
     v_U8_t* pP2pIe = NULL;
     int ret = 0;
     v_U8_t *pWpsIe=NULL;
+    bool is_p2p_scan = false;
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
     struct net_device *dev = NULL;
@@ -10760,8 +10761,13 @@
      * the AP doesnt respond to our probe req then association
      * fails which is not desired
      */
+    if ((request->n_ssids == 1)
+            && (request->ssids != NULL)
+            && vos_mem_compare(&request->ssids[0], "DIRECT-", 7))
+        is_p2p_scan = true;
 
-    if( request->n_channels != WLAN_HDD_P2P_SINGLE_CHANNEL_SCAN )
+    if( is_p2p_scan ||
+            (request->n_channels != WLAN_HDD_P2P_SINGLE_CHANNEL_SCAN) )
     {
         hddLog(VOS_TRACE_LEVEL_DEBUG, "Flushing P2P Results");
         sme_ScanFlushP2PResult( WLAN_HDD_GET_HAL_CTX(pAdapter),