From ed78190321f97cf07bb9d368192ac583b8feb6c1 Mon Sep 17 00:00:00 2001 From: Pragaspathi Thilagaraj Date: Thu, 30 May 2019 12:17:49 +0530 Subject: [PATCH] qcacld-3.0: Populate correct default values for BTM ini items In function mlme_init_btm_cfg(), initializing the btm_solicited_timeout, btm_max_attempt_cnt and btm_sticky_time is done using the cfg_default() api, which always returns the default value irrespective of the ini configured. This results in failure of ini configuration from the WCNSS_qcom_cfg.ini file. Use cfg_get() api to get the default value of ini items. Change-Id: I773676cc67878f233cb6d14e0ad3ec1d79a5518f CRs-Fixed: 2461612 --- components/mlme/core/src/wlan_mlme_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/mlme/core/src/wlan_mlme_main.c b/components/mlme/core/src/wlan_mlme_main.c index 4cbe3f60b9..5618fc199f 100644 --- a/components/mlme/core/src/wlan_mlme_main.c +++ b/components/mlme/core/src/wlan_mlme_main.c @@ -2123,9 +2123,9 @@ static void mlme_init_btm_cfg(struct wlan_objmgr_psoc *psoc, if (btm->abridge_flag) MLME_SET_BIT(btm->btm_offload_config, BTM_OFFLOAD_CONFIG_BIT_7); - btm->btm_solicited_timeout = cfg_default(CFG_BTM_SOLICITED_TIMEOUT); - btm->btm_max_attempt_cnt = cfg_default(CFG_BTM_MAX_ATTEMPT_CNT); - btm->btm_sticky_time = cfg_default(CFG_BTM_STICKY_TIME); + btm->btm_solicited_timeout = cfg_get(psoc, CFG_BTM_SOLICITED_TIMEOUT); + btm->btm_max_attempt_cnt = cfg_get(psoc, CFG_BTM_MAX_ATTEMPT_CNT); + btm->btm_sticky_time = cfg_get(psoc, CFG_BTM_STICKY_TIME); btm->rct_validity_timer = cfg_get(psoc, CFG_BTM_VALIDITY_TIMER); btm->disassoc_timer_threshold = cfg_get(psoc, CFG_BTM_DISASSOC_TIMER_THRESHOLD);