From 1ef396242dc36ab77b5d267faa30018bd43ff705 Mon Sep 17 00:00:00 2001 From: wadesong Date: Wed, 6 Dec 2017 14:29:39 +0800 Subject: [PATCH] qcacld-3.0: Fix ACS scan abnormal cancellation problem When a BSS is being started, the WLAN driver will abort all scan requests, including the ACS scan initiated by the secondary SAP, which will result in secondary SAP start failure. Use a different function to abort scans initiated by the current session which is doing BSS starting so ACS scan initiated by a second SAP will not be affected. Change-Id: I442431e92e31cc8d3eb302ccca4249d0b4bedf82 CRs-Fixed: 2154230 --- core/sme/src/csr/csr_api_roam.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 39bdbdae7e02..c828f52cdb3b 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -8360,7 +8360,9 @@ QDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, pProfile->EncryptionType.encryptionType[0]); csr_roam_cancel_roaming(pMac, sessionId); csr_scan_remove_fresh_scan_command(pMac, sessionId); - csr_scan_abort_all_scans(pMac, eCSR_SCAN_ABORT_DEFAULT); + csr_scan_abort_mac_scan(pMac, sessionId, + INVALID_SCAN_ID, + eCSR_SCAN_ABORT_DEFAULT); csr_roam_remove_duplicate_command(pMac, sessionId, NULL, eCsrHddIssued); /* Check whether ssid changes */ if (csr_is_conn_state_connected(pMac, sessionId) &&