From b54c72bedc78292c13fdd5b1f2194894489f85ff Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Mon, 5 Feb 2018 10:39:06 -0800 Subject: [PATCH] qcacld-3.0: Add DBS check for all chain mask programming Add DBS check for all chain mask programming. Currently the check is present only for band specific chain mask parameters. Change-Id: I415a8e8f666961b90d1cd9130b3c33eecb62c1df CRs-Fixed: 2184255 --- core/hdd/src/wlan_hdd_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index e358d6556a3d..bbf6ad8bee7b 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -4130,6 +4130,13 @@ static int hdd_configure_chain_mask(struct hdd_adapter *adapter) return 0; } + if (hdd_ctx->config->dual_mac_feature_disable != + DISABLE_DBS_CXN_AND_SCAN) { + hdd_info("DBS enabled(%d). skip chain mask programming", + hdd_ctx->config->dual_mac_feature_disable); + return 0; + } + if (hdd_ctx->config->txchainmask1x1) { ret_val = sme_cli_set_command(adapter->session_id, WMI_PDEV_PARAM_TX_CHAIN_MASK, @@ -4159,11 +4166,6 @@ static int hdd_configure_chain_mask(struct hdd_adapter *adapter) return 0; } - if (!hdd_ctx->config->dual_mac_feature_disable) { - hdd_info("DBS enabled. skip per band chain mask"); - return 0; - } - if (hdd_ctx->config->tx_chain_mask_2g) { ret_val = sme_cli_set_command(adapter->session_id, WMI_PDEV_PARAM_TX_CHAIN_MASK_2G,