From c0fb61a3f5b58d94b50e733d7d8688d1c5eb3a2c Mon Sep 17 00:00:00 2001
From: lifeng <lifeng@codeaurora.org>
Date: Tue, 20 Jun 2017 19:34:39 +0800
Subject: [PATCH] qcacld-3.0: Fix the issue of launching guest ap in SCC

Try to set ap-ap mode on single wifi with acs enabled,
primary ap can start up successfully, but fail to bring up
the guest ap.

The fix is to call appropriate procedure once the guest ap
skip acs scan before starting bss.

Change-Id: I106269308932dafff27f9dc0665ade06b88e99a6
CRs-Fixed: 2063960
---
 core/sap/src/sap_fsm.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index 5ac94dc977..3ba60905c0 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -1871,8 +1871,14 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 	if (sap_context->acs_cfg->skip_scan_status == eSAP_SKIP_ACS_SCAN) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("## %s SKIPPED ACS SCAN"), __func__);
-		wlansap_scan_callback(h_hal, sap_context,
-			sap_context->sessionId, 0, eCSR_SCAN_SUCCESS);
+
+		if (true == sap_do_acs_pre_start_bss)
+			wlansap_pre_start_bss_acs_scan_callback(h_hal,
+				sap_context, sap_context->sessionId, 0,
+				eCSR_SCAN_SUCCESS);
+		else
+			wlansap_scan_callback(h_hal, sap_context,
+				sap_context->sessionId, 0, eCSR_SCAN_SUCCESS);
 	}
 #endif
 	} else {