From ab69c2507a4cb355e145b2de5bf8df9684fb28a2 Mon Sep 17 00:00:00 2001 From: Liangwei Dong Date: Tue, 16 Mar 2021 11:20:02 +0800 Subject: [PATCH] qcacld-3.0: Disable force SCC to DFS channel if DFS master disabled If DFS master capability disabled, STA+SAP SCC on DFS is not allowed, so reset g_sta_sap_scc_on_dfs_chan to 0. Change-Id: I90b0ec6947f5bc24c9854062f443de0d1f6dc452 CRs-Fixed: 2897719 --- components/cmn_services/policy_mgr/inc/wlan_policy_mgr_cfg.h | 3 +++ components/cmn_services/policy_mgr/src/wlan_policy_mgr_ucfg.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/components/cmn_services/policy_mgr/inc/wlan_policy_mgr_cfg.h b/components/cmn_services/policy_mgr/inc/wlan_policy_mgr_cfg.h index 776d3b179109..cf260ed21536 100644 --- a/components/cmn_services/policy_mgr/inc/wlan_policy_mgr_cfg.h +++ b/components/cmn_services/policy_mgr/inc/wlan_policy_mgr_cfg.h @@ -395,6 +395,9 @@ CFG_INI_UINT("gDualMacFeatureDisable", 0, 6, 6, CFG_VALUE_OR_DEFAULT, \ * support disabled, the value is defined by enum PM_AP_DFS_MASTER_MODE. * 0 - Disallow STA+SAP SCC on DFS channel * 1 - Allow STA+SAP SCC on DFS channel with master mode disabled + * This needs gEnableDFSMasterCap enabled to allow SAP SCC with + * STA on DFS but dfs master mode disabled. Single SAP is not allowed + * on DFS. * 2 - enhance "1" with below requirement * a. Allow single SAP (GO) start on DFS channel. * b. Allow CAC process on DFS channel in single SAP (GO) mode diff --git a/components/cmn_services/policy_mgr/src/wlan_policy_mgr_ucfg.c b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_ucfg.c index 860774d7f643..a4f8880eb454 100644 --- a/components/cmn_services/policy_mgr/src/wlan_policy_mgr_ucfg.c +++ b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_ucfg.c @@ -63,7 +63,7 @@ static QDF_STATUS policy_mgr_init_cfg(struct wlan_objmgr_psoc *psoc) */ if (cfg->sta_sap_scc_on_dfs_chnl == 2 && !cfg_get(psoc, CFG_ENABLE_DFS_MASTER_CAPABILITY)) - cfg->sta_sap_scc_on_dfs_chnl = 1; + cfg->sta_sap_scc_on_dfs_chnl = 0; cfg->nan_sap_scc_on_lte_coex_chnl = cfg_get(psoc, CFG_NAN_SAP_SCC_ON_LTE_COEX_CHAN); cfg->sta_sap_scc_on_lte_coex_chnl =