From b39e413ac0a5651a15cf7cdf69cc3a5133b93d4f Mon Sep 17 00:00:00 2001 From: Tushnim Bhattacharyya Date: Mon, 6 Aug 2018 13:39:23 -0700 Subject: [PATCH] qcacmn: Add ENABLE_DBS_CXN_AND_DISABLE_SIMULTANEOUS_SCAN Add ENABLE_DBS_CXN_AND_DISABLE_SIMULTANEOUS_SCAN option for the ini gDualMacFeatureDisable. This is to enable DBS support for the connection and disable simultaneous scan from upper layer. But DBS scan remains enabled in FW. Change-Id: Ic280de2cc63a3775c0d9dd61985ff89df58a4a89 CRs-Fixed: 2291935 --- .../policy_mgr/inc/wlan_policy_mgr_public_struct.h | 6 +++++- .../policy_mgr/src/wlan_policy_mgr_get_set_utils.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/umac/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h b/umac/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h index 5cce4910d47f..ea748b230b35 100644 --- a/umac/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h +++ b/umac/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h @@ -835,6 +835,9 @@ enum policy_mgr_hw_mode_change { * connection and scan but switch off the async scan * @ENABLE_DBS_CXN_AND_DISABLE_DBS_SCAN: Enable DBS support for connection and * disable DBS support for scan + * @ENABLE_DBS_CXN_AND_DISABLE_SIMULTANEOUS_SCAN: Enable DBS + * support for connection and disable simultaneous scan from + * upper layer (DBS scan remains enabled in FW) */ enum dbs_support { ENABLE_DBS_CXN_AND_SCAN, @@ -842,7 +845,8 @@ enum dbs_support { DISABLE_DBS_CXN_AND_ENABLE_DBS_SCAN, DISABLE_DBS_CXN_AND_ENABLE_DBS_SCAN_WITH_ASYNC_SCAN_OFF, ENABLE_DBS_CXN_AND_ENABLE_SCAN_WITH_ASYNC_SCAN_OFF, - ENABLE_DBS_CXN_AND_DISABLE_DBS_SCAN + ENABLE_DBS_CXN_AND_DISABLE_DBS_SCAN, + ENABLE_DBS_CXN_AND_DISABLE_SIMULTANEOUS_SCAN, }; /** diff --git a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c index 816f3c6a38b9..41d961f120ab 100644 --- a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c +++ b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c @@ -2740,6 +2740,8 @@ bool policy_mgr_is_scan_simultaneous_capable(struct wlan_objmgr_psoc *psoc) if ((DISABLE_DBS_CXN_AND_SCAN == wlan_objmgr_psoc_get_dual_mac_disable(psoc)) || (ENABLE_DBS_CXN_AND_DISABLE_DBS_SCAN == + wlan_objmgr_psoc_get_dual_mac_disable(psoc)) || + (ENABLE_DBS_CXN_AND_DISABLE_SIMULTANEOUS_SCAN == wlan_objmgr_psoc_get_dual_mac_disable(psoc))) return false;