wlan: Filter P2P scan results before sending to kernel.
For each scan request, p2p scan results are flushed but not the
station scan results, so it is possible that, the cached station
scan entries to be included in the p2p scan results. To avoid this
filter the p2p scan results before sending them to kernel.
CRs-Fixed: 843139
Change-Id: I7cbd25562a0fc552c70c484be211bc27e5f3c108
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index f8ff768..7243ae1 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -9948,7 +9948,7 @@
tScanResultHandle pResult;
struct cfg80211_bss *bss_status = NULL;
hdd_context_t *pHddCtx;
-
+ bool is_p2p_scan = false;
ENTER();
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
@@ -9973,7 +9973,13 @@
return VOS_STATUS_E_PERM;
}
-
+ if (pAdapter->request != NULL)
+ {
+ if ((pAdapter->request->n_ssids == 1)
+ && (pAdapter->request->ssids != NULL)
+ && vos_mem_compare(&pAdapter->request->ssids[0], "DIRECT-", 7))
+ is_p2p_scan = true;
+ }
/*
* start getting scan results and populate cgf80211 BSS database
*/
@@ -10001,7 +10007,14 @@
* ieee80211_mgmt(probe response) and passing to c
* fg80211_inform_bss_frame.
* */
-
+ if(is_p2p_scan && (pScanResult->ssId.ssId != NULL) &&
+ !vos_mem_compare( pScanResult->ssId.ssId, "DIRECT-", 7) )
+ {
+ hddLog(VOS_TRACE_LEVEL_INFO, FL(" Non P2P BSS skipped: =%s:"),
+ pScanResult->ssId.ssId);
+ pScanResult = sme_ScanResultGetNext(hHal, pResult);
+ continue; //Skip the non p2p bss entries
+ }
bss_status = wlan_hdd_cfg80211_inform_bss_frame(pAdapter,
&pScanResult->BssDescriptor);
@@ -10024,7 +10037,7 @@
}
sme_ScanResultPurge(hHal, pResult);
-
+ is_p2p_scan = false;
return 0;
}