From bd1641c16f4ea35f59dbb58fa2ccf37022afe6bc Mon Sep 17 00:00:00 2001 From: abhinav kumar Date: Fri, 18 Jun 2021 17:42:28 +0530 Subject: [PATCH] qcacld-3.0: SAP not following STA channel With below INI configuration, SAP is not following the STA channel. It's forming STA + SAP MCC instead of Forced SCC. 1. gWlanMccToSccSwitchMode = 4 (QDF_MCC_TO_SCC_SWITCH_WITH_FAVORITE_CHANNE) 2. gEnableSAPManadatoryChanList=1 When channel switch mode is QDF_MCC_TO_SCC_SWITCH_WITH_FAVORITE_CHANNE and if STA is on 5ghz and SAP also comes on 5ghz then driver considers the HW mode as DBS capable and it allows SAP to form MCC which is not favorable. For non_DBS target, the fix is to allow SAP to do force SCC if the channel switch mode is MCC_TO_SCC_SWITCH_WITH_FAVORITE_CHANNE. Change-Id: I4b945dc1831909caff72f8398c959f4450765f2b CRs-Fixed: 2972273 --- core/sme/src/csr/csr_util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 978e4661ea89..188717201d89 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -1106,8 +1106,9 @@ uint16_t csr_check_concurrent_channel_overlap(struct mac_context *mac_ctx, cc_switch_mode == QDF_MCC_TO_SCC_WITH_PREFERRED_BAND) intf_ch_freq = 0; - } else if (cc_switch_mode == - QDF_MCC_TO_SCC_SWITCH_WITH_FAVORITE_CHANNEL) { + } else if (policy_mgr_is_hw_dbs_capable(mac_ctx->psoc) && + cc_switch_mode == + QDF_MCC_TO_SCC_SWITCH_WITH_FAVORITE_CHANNEL) { status = policy_mgr_get_sap_mandatory_channel( mac_ctx->psoc, sap_ch_freq, &intf_ch_freq);