wlan: If BSS is unreachable remove it from scan cache
qcacld-2.0 to pronto propagation
If BSS is present in kernel and driver scan cache, supplicant
tries to connect to the BSS multiple time even if the BSS is
unreachable. Due to multiple failures to connect supplicant
disable the network.
To avoid this, remove the BSS from scan cache:
- If connect fails due to BSS unreachable i.e. probe
resp/auth/assoc timeout and scan for ssid failure.
- If disconnect is due to Link lost.
Change-Id: I3263dd02691000d83d4aef61c75b72d78c28f582
CRS-Fixed: 1039104
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 7917f8d..623ff6d 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -1746,8 +1746,10 @@
csrScanResultPurge(pMac, hBSSList);
}
//We haven't done anything to this profile
- csrRoamCallCallback(pMac, sessionId, NULL, pCommand->u.scanCmd.roamId,
- eCSR_ROAM_ASSOCIATION_FAILURE, eCSR_ROAM_RESULT_FAILURE);
+ csrRoamCallCallback(pMac, sessionId, NULL,
+ pCommand->u.scanCmd.roamId,
+ eCSR_ROAM_ASSOCIATION_FAILURE,
+ eCSR_ROAM_RESULT_SCAN_FOR_SSID_FAILURE);
//In case we have nothing else to do, restart idle scan
if(csrIsConnStateDisconnected(pMac, sessionId) && !csrIsRoamCommandWaiting(pMac))
{
@@ -1855,14 +1857,14 @@
csrRoamCallCallback(pMac, sessionId, pRoamInfo,
pCommand->u.scanCmd.roamId,
eCSR_ROAM_ASSOCIATION_COMPLETION,
- eCSR_ROAM_RESULT_FAILURE);
+ eCSR_ROAM_RESULT_SCAN_FOR_SSID_FAILURE);
}
else
{
csrRoamCallCallback(pMac, sessionId, NULL,
pCommand->u.scanCmd.roamId,
eCSR_ROAM_ASSOCIATION_FAILURE,
- eCSR_ROAM_RESULT_FAILURE);
+ eCSR_ROAM_RESULT_SCAN_FOR_SSID_FAILURE);
}
#ifdef FEATURE_WLAN_BTAMP_UT_RF
//In case of WDS station, let it retry.
@@ -5973,6 +5975,42 @@
return (status);
}
+/**
+ * csr_remove_bssid_from_scan_list() - remove the bssid from
+ * scan list
+ * @pMac: mac context.
+ * @bssid: bssid to be removed
+ *
+ * This function remove the given bssid from scan list.
+ *
+ * Return: void.
+ */
+void csr_remove_bssid_from_scan_list(tpAniSirGlobal pMac,
+ tSirMacAddr bssid)
+{
+ tListElem *entry,*free_elem;
+ tCsrScanResult *bss_desc;
+ tDblLinkList *list = &pMac->scan.scanResultList;
+
+ csrLLLock(list);
+ entry = csrLLPeekHead(list, LL_ACCESS_NOLOCK);
+ while (entry != NULL) {
+ bss_desc = GET_BASE_ADDR( entry, tCsrScanResult, Link);
+ if (vos_mem_compare(bss_desc->Result.BssDescriptor.bssId,
+ bssid, sizeof(tSirMacAddr))) {
+ free_elem = entry;
+ entry = csrLLNext(list, entry, LL_ACCESS_NOLOCK);
+ csrLLRemoveEntry(list, free_elem, LL_ACCESS_NOLOCK);
+ csrFreeScanResultEntry(pMac, bss_desc);
+ smsLog(pMac, LOGW, FL("Removed BSS entry:%pM"),
+ bssid);
+ continue;
+ }
+ entry = csrLLNext(list, entry, LL_ACCESS_NOLOCK);
+ }
+ csrLLUnlock(list);
+}
+
eHalStatus csrSendMBScanReq( tpAniSirGlobal pMac, tANI_U16 sessionId,
tCsrScanRequest *pScanReq, tScanReqParam *pScanReqParam )
{