From 6610ff711f96745fa6ffcfdabc3184b9c93e4d1c Mon Sep 17 00:00:00 2001 From: Tushnim Bhattacharyya Date: Fri, 18 May 2018 14:25:35 -0700 Subject: [PATCH] qcacld-3.0: Restrict the force SCC logic for STA+SAP only Restrict the force SCC logic for STA+SAP only, driver shouldn't use the force scc logic for STA+P2P GO. Change-Id: I3e62256bc1d8fd35667e6413219077ddc30f0732 CRs-Fixed: 2243537 --- core/sap/src/sap_fsm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index d5667239fc6a..e787425fa222 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -923,8 +923,10 @@ QDF_STATUS sap_goto_channel_sel(struct sap_context *sap_context, if ((policy_mgr_get_concurrency_mode(mac_ctx->psoc) == (QDF_STA_MASK | QDF_SAP_MASK)) || - (policy_mgr_get_concurrency_mode(mac_ctx->psoc) == - (QDF_STA_MASK | QDF_P2P_GO_MASK))) { + ((sap_context->cc_switch_mode == + QDF_MCC_TO_SCC_SWITCH_FORCE_PREFERRED_WITHOUT_DISCONNECTION) && + (policy_mgr_get_concurrency_mode(mac_ctx->psoc) == + (QDF_STA_MASK | QDF_P2P_GO_MASK)))) { #ifdef FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE if (sap_context->channel == AUTO_CHANNEL_SELECT) sap_context->dfs_ch_disable = true;