From efae55b005db6fc232ea8a0c313ab22ecaee27bd Mon Sep 17 00:00:00 2001 From: Ashish Kumar Dhanotiya Date: Mon, 24 Dec 2018 15:20:42 +0530 Subject: [PATCH] qcacld-3.0: 11d and 11h inis are not getting updated As part of ini convergence, enabled_11d and enabled_11h inis are moved to converged framework but these inis are not removed from legacy initialization path which is overwritting these values to constant values and thus these inis are not taking effect. Morever in the converged code also these inis are getting initialized with default values instead of the values given from ini file. To address this issue, remove the legacy initialization of these inis and in the converged ini path initialize these values with the values configured in the ini files. Change-id: I3d02c0d543fd561f1fd948b5c2850a509b1104e7 CRs-fixed: 2371528 --- components/mlme/core/src/wlan_mlme_main.c | 4 ++-- core/sme/src/csr/csr_api_roam.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/components/mlme/core/src/wlan_mlme_main.c b/components/mlme/core/src/wlan_mlme_main.c index 504b18977245..2073bb1569da 100644 --- a/components/mlme/core/src/wlan_mlme_main.c +++ b/components/mlme/core/src/wlan_mlme_main.c @@ -353,8 +353,8 @@ static void mlme_init_generic_cfg(struct wlan_objmgr_psoc *psoc, mlme_init_pmf_cfg(psoc, gen); mlme_init_lpass_support_cfg(psoc, gen); - gen->enabled_11h = cfg_default(CFG_11H_SUPPORT_ENABLED); - gen->enabled_11d = cfg_default(CFG_11D_SUPPORT_ENABLED); + gen->enabled_11h = cfg_get(psoc, CFG_11H_SUPPORT_ENABLED); + gen->enabled_11d = cfg_get(psoc, CFG_11D_SUPPORT_ENABLED); gen->enable_beacon_reception_stats = cfg_get(psoc, CFG_ENABLE_BEACON_RECEPTION_STATS); } diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 93afda7351dd..ff4a7687f591 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -1656,9 +1656,7 @@ static void init_config_param(struct mac_context *mac) mac->roam.configParam.uCfgDot11Mode = eCSR_CFG_DOT11_MODE_AUTO; mac->roam.configParam.HeartbeatThresh24 = 40; mac->roam.configParam.HeartbeatThresh50 = 40; - mac->mlme_cfg->gen.enabled_11d = false; mac->roam.configParam.Is11eSupportEnabled = true; - mac->mlme_cfg->gen.enabled_11h = true; mac->roam.configParam.WMMSupportMode = eCsrRoamWmmAuto; mac->roam.configParam.ProprietaryRatesEnabled = true; for (i = 0; i < CSR_NUM_RSSI_CAT; i++)