From 576283f2456148cc9ba68424cef3bfcc6169123f Mon Sep 17 00:00:00 2001 From: Liangwei Dong Date: Tue, 23 Mar 2021 15:31:21 +0800 Subject: [PATCH] qcacld-3.0: Allow hw mode change for dbs 2x2 target Previously, the hw mode changing is not allowed when SAP is CAC state in old target which supports 1x1 dbs. The reason is some action frame would be sent out when chainmask changes in those target. But for 2x2 dbs target, chainmask is not changed and hence not action frame will be sent out. Allow the hw mode change for 2x2 dbs target when SAP is CAC. Change-Id: I2d123a7f0065a562048584f56d5dd7640aaaf975 CRs-Fixed: 2892813 --- .../cmn_services/policy_mgr/src/wlan_policy_mgr_action.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c index a666ca7a63..726b736375 100644 --- a/components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c +++ b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c @@ -173,7 +173,8 @@ QDF_STATUS policy_mgr_pdev_set_hw_mode(struct wlan_objmgr_psoc *psoc, * is in progress state. */ if (pm_ctx->hdd_cbacks.hdd_is_cac_in_progress && - pm_ctx->hdd_cbacks.hdd_is_cac_in_progress()) { + pm_ctx->hdd_cbacks.hdd_is_cac_in_progress() && + !policy_mgr_is_hw_dbs_2x2_capable(psoc)) { policy_mgr_err("SAP CAC_IN_PROGRESS state, drop WMI_PDEV_SET_HW_MODE_CMDID"); return QDF_STATUS_E_FAILURE; }