From aececb20dca7a716c30d2021b7649ab8086dad31 Mon Sep 17 00:00:00 2001 From: Tushnim Bhattacharyya Date: Mon, 6 Aug 2018 14:27:46 -0700 Subject: [PATCH] qcacld-3.0: 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: 2288294 --- core/hdd/inc/wlan_hdd_cfg.h | 4 +++- core/hdd/src/wlan_hdd_main.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index a73d41906e8a..14b864fe5a18 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -8368,6 +8368,8 @@ enum dot11p_mode { * 4 - enable DBS for connection as well as for scan with async * scan policy disabled * 5 - enable DBS for connection but disable DBS for scan. + * 6 - enable DBS for connection but disable simultaneous scan + * from upper layer (DBS scan remains enabled in FW). * * Note: INI item value should match 'enum dbs_support' * @@ -8381,7 +8383,7 @@ enum dot11p_mode { */ #define CFG_DUAL_MAC_FEATURE_DISABLE "gDualMacFeatureDisable" #define CFG_DUAL_MAC_FEATURE_DISABLE_MIN (0) -#define CFG_DUAL_MAC_FEATURE_DISABLE_MAX (5) +#define CFG_DUAL_MAC_FEATURE_DISABLE_MAX (6) #define CFG_DUAL_MAC_FEATURE_DISABLE_DEFAULT (0) /* diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 5d24fe7722c3..f0b6b388bb24 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -1321,7 +1321,9 @@ static void hdd_update_hw_dbs_capable(struct hdd_context *hdd_ctx) ((cfg_ini->dual_mac_feature_disable == ENABLE_DBS_CXN_AND_SCAN) || (cfg_ini->dual_mac_feature_disable == - ENABLE_DBS_CXN_AND_ENABLE_SCAN_WITH_ASYNC_SCAN_OFF))) + ENABLE_DBS_CXN_AND_ENABLE_SCAN_WITH_ASYNC_SCAN_OFF) || + (cfg_ini->dual_mac_feature_disable == + ENABLE_DBS_CXN_AND_DISABLE_SIMULTANEOUS_SCAN))) hw_dbs_capable = 1; sme_update_hw_dbs_capable(hdd_ctx->mac_handle, hw_dbs_capable);