From dc5bc15a6ce3b50cf1e13f9df4a69d60f64e8039 Mon Sep 17 00:00:00 2001 From: Harprit Chhabada Date: Fri, 21 Dec 2018 15:37:46 -0800 Subject: [PATCH] qcacld-3.0: Remove unused WNI CFG item of scan component Remove unused wni CFG item, WNI_CFG_SCAN_IN_POWERSAVE Change-Id: I13e01172c3a18072c31e9b13a6e2396cfea0f5c6 CRs-Fixed: 2371763 --- core/mac/inc/wni_cfg.h | 7 +------ core/mac/src/cfg/cfg_proc_msg.c | 8 +------- core/mac/src/pe/lim/lim_process_cfg_updates.c | 10 ++-------- core/sme/src/common/sme_api.c | 13 +------------ 4 files changed, 5 insertions(+), 33 deletions(-) diff --git a/core/mac/inc/wni_cfg.h b/core/mac/inc/wni_cfg.h index b263a896c708a..80e26c66ca428 100644 --- a/core/mac/inc/wni_cfg.h +++ b/core/mac/inc/wni_cfg.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -32,7 +32,6 @@ enum { WNI_CFG_COUNTRY_CODE, WNI_CFG_LOCAL_POWER_CONSTRAINT, WNI_CFG_SCAN_CONTROL_LIST, - WNI_CFG_SCAN_IN_POWERSAVE, WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED, WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT, WNI_CFG_OBSS_DETECTION_OFFLOAD, @@ -140,10 +139,6 @@ enum { */ #define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_FW_DEF 3 -#define WNI_CFG_SCAN_IN_POWERSAVE_STAMIN 0 -#define WNI_CFG_SCAN_IN_POWERSAVE_STAMAX 1 -#define WNI_CFG_SCAN_IN_POWERSAVE_STADEF 1 - #define WNI_CFG_WPS_ENABLE_AP 1 #define WNI_CFG_ASSOC_STA_LIMIT_STAMIN 1 diff --git a/core/mac/src/cfg/cfg_proc_msg.c b/core/mac/src/cfg/cfg_proc_msg.c index 8cf18519415ec..83eb959d2f56c 100644 --- a/core/mac/src/cfg/cfg_proc_msg.c +++ b/core/mac/src/cfg/cfg_proc_msg.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -62,12 +62,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = { CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_RESTART | CFG_CTL_NTF_LIM, 0, 0, 0}, - {WNI_CFG_SCAN_IN_POWERSAVE, - CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT | - CFG_CTL_NTF_LIM, - WNI_CFG_SCAN_IN_POWERSAVE_STAMIN, - WNI_CFG_SCAN_IN_POWERSAVE_STAMAX, - WNI_CFG_SCAN_IN_POWERSAVE_STADEF}, {WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED, CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT, WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STAMIN, diff --git a/core/mac/src/pe/lim/lim_process_cfg_updates.c b/core/mac/src/pe/lim/lim_process_cfg_updates.c index 655a909ad6057..ea28893a1e98c 100644 --- a/core/mac/src/pe/lim/lim_process_cfg_updates.c +++ b/core/mac/src/pe/lim/lim_process_cfg_updates.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -159,7 +159,7 @@ void lim_handle_param_update(struct mac_context *mac, eUpdateIEsType cfgId) void lim_apply_configuration(struct mac_context *mac, struct pe_session *pe_session) { - uint32_t val = 0, phyMode; + uint32_t phyMode; pe_debug("Applying config"); @@ -186,12 +186,6 @@ void lim_apply_configuration(struct mac_context *mac, struct pe_session *pe_sess sch_set_fixed_beacon_fields(mac, pe_session); } } - - if (wlan_cfg_get_int(mac, WNI_CFG_SCAN_IN_POWERSAVE, &val) != - QDF_STATUS_SUCCESS) { - pe_err("could not retrieve WNI_CFG_SCAN_IN_POWERSAVE"); - return; - } } /*** end lim_apply_configuration() ***/ /** diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 1975b987ed474..312271053f5d8 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -934,17 +934,6 @@ QDF_STATUS sme_update_config(mac_handle_t mac_handle, tpSmeConfigParams if (csr_is_all_session_disconnected(mac)) csr_set_global_cfgs(mac); - /* - * If scan offload is enabled then lim has allow the sending of - * scan request to firmware even in powersave mode. The firmware has - * to take care of exiting from power save mode - */ - status = sme_cfg_set_int(mac_handle, WNI_CFG_SCAN_IN_POWERSAVE, true); - - if (QDF_STATUS_SUCCESS != status) - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, - "Could not pass on WNI_CFG_SCAN_IN_POWERSAVE to CFG"); - mac->snr_monitor_enabled = pSmeConfigParams->snr_monitor_enabled; return status;