From 54eeef292693af8ec8864f0503805e5cbb200783 Mon Sep 17 00:00:00 2001 From: Jinwei Chen Date: Tue, 8 Mar 2022 18:52:01 -0800 Subject: [PATCH] qcacld-3.0: Use policy_mgr_find_if_hwlist_has_dbs as DP DBS check Current policy_mgr_is_hw_dbs_capable() will check both DBS HW mode and WMI_SERVICE_DUAL_BAND_SIMULTANEOUS_SUPPORT service bit, while DP expect to check HW mode only. Use policy_mgr_find_if_hwlist_has_dbs() for DP DBS check. Change-Id: I9e69e5754ef4ea522f50e2e27380e5b5d08532b3 CRs-Fixed: 3140385 --- .../cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h | 10 +++++----- .../policy_mgr/src/wlan_policy_mgr_get_set_utils.c | 6 ++---- core/cds/src/cds_api.c | 2 +- 3 files changed, 8 insertions(+), 10 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 b675fffd3a..0065fbd723 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 @@ -2886,14 +2886,14 @@ bool policy_mgr_is_current_hwmode_dbs(struct wlan_objmgr_psoc *psoc); bool policy_mgr_is_current_hwmode_sbs(struct wlan_objmgr_psoc *psoc); /** - * policy_mgr_is_dp_hw_dbs_2x2_capable() - if hardware is capable of dbs 2x2 - * for Data Path. + * policy_mgr_is_dp_hw_dbs_capable() - if hardware is capable of dbs 2x2 + * or 1X1 for Data Path (HW mode) * @psoc: PSOC object information - * This API is for Data Path to get HW dbs 2x2 capable. + * This API is for Data Path to get HW mode support dbs. * - * Return: true - DBS2x2, false - DBS1x1 + * Return: true - DBS capable, false - not */ -bool policy_mgr_is_dp_hw_dbs_2x2_capable(struct wlan_objmgr_psoc *psoc); +bool policy_mgr_is_dp_hw_dbs_capable(struct wlan_objmgr_psoc *psoc); /** * policy_mgr_is_hw_dbs_2x2_capable() - if hardware is capable of dbs 2x2 diff --git a/components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c index a745ba7742..d9bf724f73 100644 --- a/components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c +++ b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c @@ -2213,11 +2213,9 @@ bool policy_mgr_is_hw_dbs_required_for_band(struct wlan_objmgr_psoc *psoc, return false; } -bool policy_mgr_is_dp_hw_dbs_2x2_capable(struct wlan_objmgr_psoc *psoc) +bool policy_mgr_is_dp_hw_dbs_capable(struct wlan_objmgr_psoc *psoc) { - return policy_mgr_is_hw_dbs_2x2_capable(psoc) || - policy_mgr_is_hw_dbs_required_for_band(psoc, - HW_MODE_MAC_BAND_2G); + return policy_mgr_find_if_hwlist_has_dbs(psoc); } /* diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 448463b487..5756ec160a 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -122,7 +122,7 @@ static struct ol_if_ops dp_ol_if_ops = { .peer_set_default_routing = target_if_peer_set_default_routing, .peer_rx_reorder_queue_setup = target_if_peer_rx_reorder_queue_setup, .peer_rx_reorder_queue_remove = target_if_peer_rx_reorder_queue_remove, - .is_hw_dbs_capable = policy_mgr_is_hw_dbs_capable, + .is_hw_dbs_capable = policy_mgr_is_dp_hw_dbs_capable, .lro_hash_config = target_if_lro_hash_config, .rx_invalid_peer = wma_rx_invalid_peer_ind, .is_roam_inprogress = wma_is_roam_in_progress,