From 8bcb061a89e9482b3daceaefa7e285c3dbaefa3c Mon Sep 17 00:00:00 2001 From: Liangwei Dong Date: Tue, 7 Jun 2022 10:02:10 +0800 Subject: [PATCH] qcacld-3.0: Fix 3 home channel issue for PCL PM_SBS_CH_2G New PCL PCL PM_SBS_CH_2G,PM_SCC_ON_5G_LOW_5G_LOW, PM_SCC_ON_5G_HIGH_5G_HIGH do not allow 3 home channel scenario. Remove it from API policy_mgr_is_3rd_conn_on_same_band_allowed. Add PCL string print support for new type: PM_SCC_ON_5G_LOW_5G_LOW, PM_SCC_ON_5G_HIGH_5G_HIGH. Change-Id: Ie6dbb042f5ecb04cb999a7949ced8e7c7ab4ad5a CRs-Fixed: 3215568 --- components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h | 2 ++ components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h b/components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h index 5b1572ee5b..0a66306034 100644 --- a/components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h +++ b/components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h @@ -126,6 +126,8 @@ static inline const char *pcl_type_to_string(uint32_t idx) CASE_RETURN_STRING(PM_SBS_CH_SCC_CH_5G_24G); CASE_RETURN_STRING(PM_SCC_CH_MCC_CH_SBS_CH_24G); CASE_RETURN_STRING(PM_SBS_CH_2G); + CASE_RETURN_STRING(PM_SCC_ON_5G_LOW_5G_LOW); + CASE_RETURN_STRING(PM_SCC_ON_5G_HIGH_5G_HIGH); default: return "Unknown"; } diff --git a/components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c index 7648068936..ae76a911ca 100644 --- a/components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c +++ b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c @@ -3497,9 +3497,6 @@ bool policy_mgr_is_3rd_conn_on_same_band_allowed(struct wlan_objmgr_psoc *psoc, case PM_24G_MCC_CH: case PM_5G_MCC_CH: case PM_24G_SBS_CH_MCC_CH: - case PM_SBS_CH_2G: - case PM_SCC_ON_5G_LOW_5G_LOW: - case PM_SCC_ON_5G_HIGH_5G_HIGH: ret = true; break; default: