wlan: Re-integrate CL651597 and apply a patch fix to CL651738.
1. Re-integrate CL651597.
2. Use sme_ScanFlushP2PResult in hdd_cfg80211_scan_done_callback.
Change-Id: Id922b5e53f24a1f747d04e37ca37c3401a901ae1
CR-Fixed: 408912
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index dde55ae..34db33e 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -3653,7 +3653,7 @@
if(pScanInfo->flushP2pScanResults)
{
tANI_U8 sessionId = pAdapter->sessionId;
- sme_ScanFlushResult(WLAN_HDD_GET_HAL_CTX(pAdapter), sessionId);
+ sme_ScanFlushP2PResult(WLAN_HDD_GET_HAL_CTX(pAdapter), sessionId);
pScanInfo->flushP2pScanResults = 0;
}
#endif