From 2913bd11f5a8c9e5e1104e2bde92c827472d38d9 Mon Sep 17 00:00:00 2001
From: Abhishek Singh <absingh@codeaurora.org>
Date: Mon, 1 Apr 2019 14:17:19 +0530
Subject: [PATCH] qcacld-3.0: Select def chan if no chan is safe in ACS chan
 list

If no channel is safe in ACS channel list, select default channel
instead of returning start failure for SAP.

Change-Id: I974a573f5000720a62e58aaff5a71412c2fae7bf
CRs-Fixed: 2424847
---
 core/sap/src/sap_api_link_cntl.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c
index a0a4b161f49d..f261f289c688 100644
--- a/core/sap/src/sap_api_link_cntl.c
+++ b/core/sap/src/sap_api_link_cntl.c
@@ -242,19 +242,11 @@ QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(mac_handle_t mac_handle,
 	}
 
 	if (oper_channel == SAP_CHANNEL_NOT_SELECTED) {
-#ifdef SOFTAP_CHANNEL_RANGE
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
-			  FL("No suitable channel selected"));
-
-		sap_ctx->sap_state = eSAP_ACS_CHANNEL_SELECTED;
-		sap_ctx->sap_status = eSAP_STATUS_FAILURE;
-		goto close_session;
-	} else {
-#else
+			  FL("No suitable channel, so select default channel"));
 		sap_ctx->channel =
 			sap_select_default_oper_chan(sap_ctx->acs_cfg);
 	} else {
-#endif
 		/* Valid Channel Found from scan results. */
 		sap_ctx->acs_cfg->pri_ch = oper_channel;
 		sap_ctx->channel = oper_channel;