qcacld-3.0: Remove legacy cfg items

Remove legacy cfg items definitions and related macros for the
converged CFG items.

Change-Id: I12944f50d68dafe989417dda777f29a6233c97a4
CRs-Fixed: 2340856

components/fw_offload/core/inc/wlan_fw_offload_main.h

@@ -27,7 +27,7 @@
 #include <wlan_objmgr_global_obj.h>
 #include <wlan_cmn.h>
 
-#include "cfg_ie_whitelist.h"
+#include "cfg_ucfg_api.h"
 
 #define fwol_alert(params...) QDF_TRACE_FATAL(QDF_MODULE_ID_FWOL, params)
 #define fwol_err(params...) QDF_TRACE_ERROR(QDF_MODULE_ID_FWOL, params)

components/fw_offload/core/src/wlan_fw_offload_main.c

@@ -20,7 +20,6 @@
  */
 
 #include "wlan_fw_offload_main.h"
-#include "cfg_ucfg_api.h"
 
 struct wlan_fwol_psoc_obj *fwol_get_psoc_obj(struct wlan_objmgr_psoc *psoc)
 {

components/fw_offload/dispatcher/src/wlan_fwol_ucfg_api.c

@@ -19,7 +19,6 @@
  * DOC: define internal APIs related to the fwol component
  */
 
-#include "cfg_ucfg_api.h"
 #include "wlan_fw_offload_main.h"
 #include "wlan_fwol_ucfg_api.h"
 

components/mlme/core/src/wlan_mlme_main.c

@@ -23,7 +23,6 @@
 #include "cfg_ucfg_api.h"
 #include "wmi_unified.h"
 #include "wlan_scan_public_structs.h"
-#include "cfg_mlme_threshold.h"
 
 #define NUM_OF_SOUNDING_DIMENSIONS     1 /*Nss - 1, (Nss = 2 for 2x2)*/
 
@@ -1201,21 +1200,21 @@ static void mlme_init_oce_cfg(struct wlan_objmgr_psoc *psoc,
 static void mlme_init_wep_keys(struct wlan_mlme_wep_cfg *wep_params)
 {
 	/* initialize the default key values to zero */
-	wep_params->wep_default_key_1.len = MLME_WEP_MAX_KEY_LEN;
-	wep_params->wep_default_key_1.max_len = MLME_WEP_MAX_KEY_LEN;
-	qdf_mem_zero(wep_params->wep_default_key_1.data, MLME_WEP_MAX_KEY_LEN);
+	wep_params->wep_default_key_1.len = MLME_WEP_KEY_LEN_13;
+	wep_params->wep_default_key_1.max_len = MLME_WEP_KEY_LEN_13;
+	qdf_mem_zero(wep_params->wep_default_key_1.data, MLME_WEP_KEY_LEN_13);
 
-	wep_params->wep_default_key_2.len = MLME_WEP_MAX_KEY_LEN;
-	wep_params->wep_default_key_2.max_len = MLME_WEP_MAX_KEY_LEN;
-	qdf_mem_zero(wep_params->wep_default_key_2.data, MLME_WEP_MAX_KEY_LEN);
+	wep_params->wep_default_key_2.len = MLME_WEP_KEY_LEN_13;
+	wep_params->wep_default_key_2.max_len = MLME_WEP_KEY_LEN_13;
+	qdf_mem_zero(wep_params->wep_default_key_2.data, MLME_WEP_KEY_LEN_13);
 
-	wep_params->wep_default_key_3.len = MLME_WEP_MAX_KEY_LEN;
-	wep_params->wep_default_key_3.max_len = MLME_WEP_MAX_KEY_LEN;
-	qdf_mem_zero(wep_params->wep_default_key_3.data, MLME_WEP_MAX_KEY_LEN);
+	wep_params->wep_default_key_3.len = MLME_WEP_KEY_LEN_13;
+	wep_params->wep_default_key_3.max_len = MLME_WEP_KEY_LEN_13;
+	qdf_mem_zero(wep_params->wep_default_key_3.data, MLME_WEP_KEY_LEN_13);
 
-	wep_params->wep_default_key_4.len = MLME_WEP_MAX_KEY_LEN;
-	wep_params->wep_default_key_4.max_len = MLME_WEP_MAX_KEY_LEN;
-	qdf_mem_zero(wep_params->wep_default_key_4.data, MLME_WEP_MAX_KEY_LEN);
+	wep_params->wep_default_key_4.len = MLME_WEP_KEY_LEN_13;
+	wep_params->wep_default_key_4.max_len = MLME_WEP_KEY_LEN_13;
+	qdf_mem_zero(wep_params->wep_default_key_4.data, MLME_WEP_KEY_LEN_13);
 }
 
 static void mlme_init_wep_cfg(struct wlan_mlme_wep_cfg *wep_params)

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -332,9 +332,36 @@ struct wlan_mlme_wps_params {
 	uint32_t wps_device_password_id;
 };
 
+#define MLME_CFG_LISTEN_INTERVAL        1
+#define MLME_CFG_BEACON_INTERVAL_DEF    100
+#define MLME_CFG_TX_MGMT_RATE_DEF       0xFF
+#define MLME_CFG_TX_MGMT_2G_RATE_DEF    0xFF
+#define MLME_CFG_TX_MGMT_5G_RATE_DEF    0xFF
 /**
- * struct wlan_mlme_ - HT Capabilities related config items
- * @ht_cap_info: HT capabilities Info Structure
+ * struct wlan_mlme_cfg_sap - SAP related config items
+ * @cfg_ssid: SSID to be configured
+ * @beacon_interval: beacon interval
+ * @dtim_interval:   dtim interval
+ * @listen_interval: listen interval
+ * @sap_11g_policy:  Check if 11g support is enabled
+ * @assoc_sta_limit: Limit on number of STA associated to SAP
+ * @enable_lte_coex: Flag for LTE coexistence
+ * @rmc_action_period_freq: rmc action period frequency
+ * @rate_tx_mgmt: mgmt frame tx rate
+ * @rate_tx_mgmt_2g: mgmt frame tx rate for 2G band
+ * @rate_tx_mgmt_5g: mgmt frame tx rate for 5G band
+ * @tele_bcn_wakeup_en: beacon wakeup enable/disable
+ * @tele_bcn_max_li: max listen interval
+ * @sap_get_peer_info: get peer info
+ * @sap_allow_all_chan_param_name: allow all channels
+ * @sap_max_no_peers: Maximum number of peers
+ * @sap_max_offload_peers: Maximum number of peer offloads
+ * @sap_max_offload_reorder_buffs: Maximum offload reorder buffs
+ * @sap_ch_switch_beacon_cnt: Number of beacons to be sent out during CSA
+ * @sap_internal_restart: flag to check if sap restart is in progress
+ * @sap_ch_switch_mode: Channel switch test mode enable/disable
+ * @chan_switch_hostapd_rate_enabled_name: enable/disable skip hostapd rate
+ * @reduced_beacon_interval: reduced beacon interval value
  */
 struct wlan_mlme_cfg_sap {
 	uint8_t cfg_ssid[32];
@@ -1178,7 +1205,8 @@ struct wlan_mlme_oce {
 	uint8_t feature_bitmap;
 };
 
-#define MLME_WEP_MAX_KEY_LEN (13)
+#define MLME_WEP_KEY_LEN_13 (13)
+#define MLME_WEP_KEY_LENGTH_5 (5)
 
 /**
  * enum wep_key_id  - values passed to get/set wep default keys

core/hdd/src/wlan_hdd_cfg80211.c

@@ -65,7 +65,6 @@
 #include "csr_api.h"
 #include "pld_common.h"
 #include "wmi_unified_param.h"
-#include "cfg_ucfg_api.h"
 
 #ifdef WLAN_UMAC_CONVERGENCE
 #include "wlan_cfg80211.h"
@@ -119,7 +118,6 @@
 #include <wlan_hdd_sar_limits.h>
 #include <wlan_hdd_ota_test.h>
 #include "wlan_policy_mgr_ucfg.h"
-#include "wlan_mlme_public_struct.h"
 #include "wlan_extscan_ucfg_api.h"
 #include "wlan_mlme_ucfg_api.h"
 #include "wlan_pmo_cfg.h"
@@ -128,7 +126,6 @@
 #include "wlan_crypto_global_api.h"
 #include "wlan_nl_to_crypto_params.h"
 #include "wlan_crypto_global_def.h"
-#include "cfg_ucfg_api.h"
 
 #define g_mode_rates_size (12)
 #define a_mode_rates_size (8)

core/hdd/src/wlan_hdd_ioctl.c

@@ -21,6 +21,7 @@
 #include <wlan_hdd_includes.h>
 #include <wlan_hdd_wowl.h>
 #include <wlan_hdd_stats.h>
+#include "cfg_ucfg_api.h"
 #include "wlan_hdd_trace.h"
 #include "wlan_hdd_ioctl.h"
 #include "wlan_hdd_power.h"
@@ -4974,8 +4975,8 @@ static int hdd_parse_setrmcactionperiod_command(uint8_t *pValue,
 	if (v < 0)
 		return -EINVAL;
 
-	if ((tempInt < WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STAMIN) ||
-	    (tempInt > WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STAMAX))
+	if ((tempInt < cfg_min(CFG_RMC_ACTION_PERIOD_FREQUENCY)) ||
+	    (tempInt > cfg_max(CFG_RMC_ACTION_PERIOD_FREQUENCY)))
 		return -EINVAL;
 
 	*pActionPeriod = tempInt;

core/mac/inc/wni_cfg.h

@@ -26,12 +26,9 @@
 enum {
 	WNI_CFG_STA_ID,
 	WNI_CFG_SSID,
-	WNI_CFG_BEACON_INTERVAL,
-	WNI_CFG_DTIM_PERIOD,
 	WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME,
 	WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME,
 	WNI_CFG_DOT11_MODE,
-	WNI_CFG_LISTEN_INTERVAL,
 	WNI_CFG_VALID_CHANNEL_LIST,
 	WNI_CFG_APSD_ENABLED,
 	WNI_CFG_SHORT_PREAMBLE,
@@ -41,12 +38,7 @@ enum {
 	WNI_CFG_CURRENT_TX_POWER_LEVEL,
 	WNI_CFG_COUNTRY_CODE,
 	WNI_CFG_11H_ENABLED,
-	WNI_CFG_11G_SHORT_PREAMBLE_ENABLED,
-	WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED,
-	WNI_CFG_11G_ONLY_POLICY,
 	WNI_CFG_LOCAL_POWER_CONSTRAINT,
-	WNI_CFG_ADMIT_POLICY,
-	WNI_CFG_ADMIT_BWFACTOR,
 	WNI_CFG_SCAN_CONTROL_LIST,
 	WNI_CFG_HT_CAP_INFO,
 	WNI_CFG_HT_AMPDU_PARAMS,
@@ -59,19 +51,13 @@ enum {
 	WNI_CFG_MPDU_DENSITY,
 	WNI_CFG_MAX_RX_AMPDU_FACTOR,
 	WNI_CFG_SCAN_IN_POWERSAVE,
-	WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE,
-	WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE,
 	WNI_CFG_IBSS_AUTO_BSSID,
 	WNI_CFG_WPS_UUID,
 	WNI_CFG_TELE_BCN_WAKEUP_EN,
 	WNI_CFG_TELE_BCN_MAX_LI,
-	WNI_CFG_ASSOC_STA_LIMIT,
-	WNI_CFG_ENABLE_LTE_COEX,
 	WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED,
 	WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP,
-	WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY,
 	WNI_CFG_IBSS_ATIM_WIN_SIZE,
-	WNI_CFG_RATE_FOR_TX_MGMT,
 	WNI_CFG_HE_CONTROL,
 	WNI_CFG_HE_TWT_REQUESTOR,
 	WNI_CFG_HE_TWT_RESPONDER,
@@ -174,8 +160,6 @@ enum {
 	WNI_CFG_HE_OPS_BASIC_MCS_NSS,
 	WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT,
 	WNI_CFG_HE_STA_OBSSPD,
-	WNI_CFG_RATE_FOR_TX_MGMT_2G,
-	WNI_CFG_RATE_FOR_TX_MGMT_5G,
 	WNI_CFG_OBSS_DETECTION_OFFLOAD,
 	WNI_CFG_OBSS_COLOR_COLLISION_OFFLOAD,
 	WNI_CFG_TWT_REQUESTOR,
@@ -205,27 +189,6 @@ enum {
 /*
  * Integer parameter min/max/default values
  */
-
-#define WNI_CFG_BEACON_INTERVAL_STAMIN    0
-#define WNI_CFG_BEACON_INTERVAL_STAMAX    65535
-#define WNI_CFG_BEACON_INTERVAL_STADEF    100
-
-#define WNI_CFG_DTIM_PERIOD_STAMIN    0
-#define WNI_CFG_DTIM_PERIOD_STAMAX    65535
-#define WNI_CFG_DTIM_PERIOD_STADEF    1
-
-#define WNI_CFG_WEP_KEY_LENGTH_5    5
-#define WNI_CFG_WEP_KEY_LENGTH_13    13
-
-#define WNI_CFG_WEP_DEFAULT_KEYID_STAMIN    0
-#define WNI_CFG_WEP_DEFAULT_KEYID_STAMAX    3
-#define WNI_CFG_WEP_DEFAULT_KEYID_STADEF    0
-
-#define WNI_CFG_WEP_DEFAULT_KEYID_0    0
-#define WNI_CFG_WEP_DEFAULT_KEYID_1    1
-#define WNI_CFG_WEP_DEFAULT_KEYID_2    2
-#define WNI_CFG_WEP_DEFAULT_KEYID_3    3
-
 #define WNI_CFG_EXCLUDE_UNENCRYPTED_STAMIN    0
 #define WNI_CFG_EXCLUDE_UNENCRYPTED_STAMAX    1
 #define WNI_CFG_EXCLUDE_UNENCRYPTED_STADEF    0
@@ -283,10 +246,6 @@ enum {
 #define WNI_CFG_DOT11_MODE_11AX    9
 #define WNI_CFG_DOT11_MODE_11AX_ONLY    10
 
-#define WNI_CFG_LISTEN_INTERVAL_STAMIN    0
-#define WNI_CFG_LISTEN_INTERVAL_STAMAX    65535
-#define WNI_CFG_LISTEN_INTERVAL_STADEF    1
-
 #define WNI_CFG_CURRENT_CHANNEL_STAMIN    0
 #define WNI_CFG_CURRENT_CHANNEL_STAMAX    173
 #define WNI_CFG_CURRENT_CHANNEL_STADEF    1
@@ -420,18 +379,6 @@ enum {
 #define WNI_CFG_11H_ENABLED_STAMAX    1
 #define WNI_CFG_11H_ENABLED_STADEF    1
 
-#define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED_STAMIN    0
-#define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED_STAMAX    1
-#define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED_STADEF    0
-
-#define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED_STAMIN    0
-#define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED_STAMAX    1
-#define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED_STADEF    1
-
-#define WNI_CFG_11G_ONLY_POLICY_STAMIN    0
-#define WNI_CFG_11G_ONLY_POLICY_STAMAX    1
-#define WNI_CFG_11G_ONLY_POLICY_STADEF    0
-
 #define WNI_CFG_WME_ENABLED_STAMIN    0
 #define WNI_CFG_WME_ENABLED_STAMAX    1
 #define WNI_CFG_WME_ENABLED_STADEF    1
@@ -458,18 +405,10 @@ enum {
 #define WNI_CFG_LOCAL_POWER_CONSTRAINT_STAMAX    255
 #define WNI_CFG_LOCAL_POWER_CONSTRAINT_STADEF    0
 
-#define WNI_CFG_ADMIT_POLICY_STAMIN    0
-#define WNI_CFG_ADMIT_POLICY_STAMAX    2
-#define WNI_CFG_ADMIT_POLICY_STADEF    0
-
 #define WNI_CFG_ADMIT_POLICY_ADMIT_ALL    0
 #define WNI_CFG_ADMIT_POLICY_REJECT_ALL    1
 #define WNI_CFG_ADMIT_POLICY_BW_FACTOR    2
 
-#define WNI_CFG_ADMIT_BWFACTOR_STAMIN    0
-#define WNI_CFG_ADMIT_BWFACTOR_STAMAX    100
-#define WNI_CFG_ADMIT_BWFACTOR_STADEF    20
-
 #define WNI_CFG_CHANNEL_BONDING_MODE_STAMIN    0
 #define WNI_CFG_CHANNEL_BONDING_MODE_STAMAX    10
 #define WNI_CFG_CHANNEL_BONDING_MODE_STADEF    0
@@ -628,14 +567,6 @@ enum {
 #define WNI_CFG_SCAN_IN_POWERSAVE_STAMAX    1
 #define WNI_CFG_SCAN_IN_POWERSAVE_STADEF    1
 
-#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE_STAMIN    0
-#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE_STAMAX    1
-#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE_STADEF    1
-
-#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE_STAMIN    0
-#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE_STAMAX    1
-#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE_STADEF    1
-
 #define WNI_CFG_WOWLAN_DEAUTH_ENABLE_STAMIN    0
 #define WNI_CFG_WOWLAN_DEAUTH_ENABLE_STAMAX    1
 #define WNI_CFG_WOWLAN_DEAUTH_ENABLE_STADEF    1
@@ -662,10 +593,6 @@ enum {
 #define WNI_CFG_ASSOC_STA_LIMIT_STAMAX    32
 #define WNI_CFG_ASSOC_STA_LIMIT_STADEF    10
 
-#define WNI_CFG_ENABLE_LTE_COEX_STAMIN    0
-#define WNI_CFG_ENABLE_LTE_COEX_STAMAX    1
-#define WNI_CFG_ENABLE_LTE_COEX_STADEF    0
-
 #define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STAMIN    0
 #define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STAMAX    1
 #define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STADEF    0
@@ -674,18 +601,10 @@ enum {
 #define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP_STAMAX    1
 #define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP_STADEF    0
 
-#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STAMIN    100
-#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STAMAX    1000
-#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STADEF    300
-
 #define WNI_CFG_IBSS_ATIM_WIN_SIZE_STAMIN    0
 #define WNI_CFG_IBSS_ATIM_WIN_SIZE_STAMAX    100
 #define WNI_CFG_IBSS_ATIM_WIN_SIZE_STADEF    0
 
-#define WNI_CFG_RATE_FOR_TX_MGMT_STAMIN   0x0
-#define WNI_CFG_RATE_FOR_TX_MGMT_STAMAX   0xFF
-#define WNI_CFG_RATE_FOR_TX_MGMT_STADEF   0xFF
-
 #define WNI_CFG_HE_CONTROL_STAMIN 0
 #define WNI_CFG_HE_CONTROL_STAMAX 1
 #define WNI_CFG_HE_CONTROL_STADEF 0
@@ -1086,14 +1005,6 @@ enum {
 #define WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT_STAMAX    255
 #define WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT_STADEF    50
 
-#define WNI_CFG_RATE_FOR_TX_MGMT_2G_STAMIN   0x0
-#define WNI_CFG_RATE_FOR_TX_MGMT_2G_STAMAX   0xFF
-#define WNI_CFG_RATE_FOR_TX_MGMT_2G_STADEF   0xFF
-
-#define WNI_CFG_RATE_FOR_TX_MGMT_5G_STAMIN   0x0
-#define WNI_CFG_RATE_FOR_TX_MGMT_5G_STAMAX   0xFF
-#define WNI_CFG_RATE_FOR_TX_MGMT_5G_STADEF   0xFF
-
 #define WNI_CFG_TWT_REQUESTOR_STAMIN 0
 #define WNI_CFG_TWT_REQUESTOR_STAMAX 1
 #define WNI_CFG_TWT_REQUESTOR_STADEF 0

core/mac/src/cfg/cfg_param_name.c

@@ -41,12 +41,9 @@ const char *cfg_get_string(uint16_t cfg_id)
 		break;
 	CASE_RETURN_STRING(WNI_CFG_STA_ID);
 	CASE_RETURN_STRING(WNI_CFG_SSID);
-	CASE_RETURN_STRING(WNI_CFG_BEACON_INTERVAL);
-	CASE_RETURN_STRING(WNI_CFG_DTIM_PERIOD);
 	CASE_RETURN_STRING(WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME);
 	CASE_RETURN_STRING(WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME);
 	CASE_RETURN_STRING(WNI_CFG_DOT11_MODE);
-	CASE_RETURN_STRING(WNI_CFG_LISTEN_INTERVAL);
 	CASE_RETURN_STRING(WNI_CFG_VALID_CHANNEL_LIST);
 	CASE_RETURN_STRING(WNI_CFG_APSD_ENABLED);
 	CASE_RETURN_STRING(WNI_CFG_SHORT_PREAMBLE);
@@ -56,12 +53,7 @@ const char *cfg_get_string(uint16_t cfg_id)
 	CASE_RETURN_STRING(WNI_CFG_CURRENT_TX_POWER_LEVEL);
 	CASE_RETURN_STRING(WNI_CFG_COUNTRY_CODE);
 	CASE_RETURN_STRING(WNI_CFG_11H_ENABLED);
-	CASE_RETURN_STRING(WNI_CFG_11G_SHORT_PREAMBLE_ENABLED);
-	CASE_RETURN_STRING(WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED);
-	CASE_RETURN_STRING(WNI_CFG_11G_ONLY_POLICY);
 	CASE_RETURN_STRING(WNI_CFG_LOCAL_POWER_CONSTRAINT);
-	CASE_RETURN_STRING(WNI_CFG_ADMIT_POLICY);
-	CASE_RETURN_STRING(WNI_CFG_ADMIT_BWFACTOR);
 	CASE_RETURN_STRING(WNI_CFG_SCAN_CONTROL_LIST);
 	CASE_RETURN_STRING(WNI_CFG_HT_CAP_INFO);
 	CASE_RETURN_STRING(WNI_CFG_HT_AMPDU_PARAMS);
@@ -73,19 +65,13 @@ const char *cfg_get_string(uint16_t cfg_id)
 	CASE_RETURN_STRING(WNI_CFG_HT_INFO_FIELD3);
 	CASE_RETURN_STRING(WNI_CFG_MPDU_DENSITY);
 	CASE_RETURN_STRING(WNI_CFG_MAX_RX_AMPDU_FACTOR);
-	CASE_RETURN_STRING(WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE);
-	CASE_RETURN_STRING(WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE);
 	CASE_RETURN_STRING(WNI_CFG_IBSS_AUTO_BSSID);
 	CASE_RETURN_STRING(WNI_CFG_WPS_UUID);
 	CASE_RETURN_STRING(WNI_CFG_TELE_BCN_WAKEUP_EN);
 	CASE_RETURN_STRING(WNI_CFG_TELE_BCN_MAX_LI);
-	CASE_RETURN_STRING(WNI_CFG_ASSOC_STA_LIMIT);
-	CASE_RETURN_STRING(WNI_CFG_ENABLE_LTE_COEX);
 	CASE_RETURN_STRING(WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED);
 	CASE_RETURN_STRING(WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP);
-	CASE_RETURN_STRING(WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY);
 	CASE_RETURN_STRING(WNI_CFG_IBSS_ATIM_WIN_SIZE);
-	CASE_RETURN_STRING(WNI_CFG_RATE_FOR_TX_MGMT);
 	CASE_RETURN_STRING(WNI_CFG_HE_CONTROL);
 	CASE_RETURN_STRING(WNI_CFG_HE_TWT_REQUESTOR);
 	CASE_RETURN_STRING(WNI_CFG_HE_TWT_RESPONDER);
@@ -181,8 +167,6 @@ const char *cfg_get_string(uint16_t cfg_id)
 	CASE_RETURN_STRING(WNI_CFG_HE_OPS_BASIC_MCS_NSS);
 	CASE_RETURN_STRING(WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT);
 	CASE_RETURN_STRING(WNI_CFG_HE_STA_OBSSPD);
-	CASE_RETURN_STRING(WNI_CFG_RATE_FOR_TX_MGMT_2G);
-	CASE_RETURN_STRING(WNI_CFG_RATE_FOR_TX_MGMT_5G);
 	CASE_RETURN_STRING(WNI_CFG_OBSS_DETECTION_OFFLOAD);
 	CASE_RETURN_STRING(WNI_CFG_OBSS_COLOR_COLLISION_OFFLOAD);
 	CASE_RETURN_STRING(WNI_CFG_TWT_REQUESTOR);

core/mac/src/cfg/cfg_proc_msg.c

@@ -32,17 +32,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	{WNI_CFG_SSID,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_RESTART,
 	0, 255, 6},
-	{WNI_CFG_BEACON_INTERVAL,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_SCH,
-	WNI_CFG_BEACON_INTERVAL_STAMIN,
-	WNI_CFG_BEACON_INTERVAL_STAMAX,
-	WNI_CFG_BEACON_INTERVAL_STADEF},
-	{WNI_CFG_DTIM_PERIOD,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_INT,
-	WNI_CFG_DTIM_PERIOD_STAMIN,
-	WNI_CFG_DTIM_PERIOD_STAMAX,
-	WNI_CFG_DTIM_PERIOD_STADEF},
 	{WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME_STAMIN,
@@ -59,12 +48,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_DOT11_MODE_STAMIN,
 	WNI_CFG_DOT11_MODE_STAMAX,
 	WNI_CFG_DOT11_MODE_STADEF},
-	{WNI_CFG_LISTEN_INTERVAL,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_RESTART,
-	WNI_CFG_LISTEN_INTERVAL_STAMIN,
-	WNI_CFG_LISTEN_INTERVAL_STAMAX,
-	WNI_CFG_LISTEN_INTERVAL_STADEF},
 	{WNI_CFG_VALID_CHANNEL_LIST,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_RESTART |
 	CFG_CTL_NTF_LIM,
@@ -106,41 +89,12 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_11H_ENABLED_STAMIN,
 	WNI_CFG_11H_ENABLED_STAMAX,
 	WNI_CFG_11H_ENABLED_STADEF},
-	{WNI_CFG_11G_SHORT_PREAMBLE_ENABLED,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_RESTART,
-	WNI_CFG_11G_SHORT_PREAMBLE_ENABLED_STAMIN,
-	WNI_CFG_11G_SHORT_PREAMBLE_ENABLED_STAMAX,
-	WNI_CFG_11G_SHORT_PREAMBLE_ENABLED_STADEF},
-	{WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_RESTART,
-	WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED_STAMIN,
-	WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED_STAMAX,
-	WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED_STADEF},
-	{WNI_CFG_11G_ONLY_POLICY,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_11G_ONLY_POLICY_STAMIN,
-	WNI_CFG_11G_ONLY_POLICY_STAMAX,
-	WNI_CFG_11G_ONLY_POLICY_STADEF},
 	{WNI_CFG_LOCAL_POWER_CONSTRAINT,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_RESTART,
 	WNI_CFG_LOCAL_POWER_CONSTRAINT_STAMIN,
 	WNI_CFG_LOCAL_POWER_CONSTRAINT_STAMAX,
 	WNI_CFG_LOCAL_POWER_CONSTRAINT_STADEF},
-	{WNI_CFG_ADMIT_POLICY,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_RESTART,
-	WNI_CFG_ADMIT_POLICY_STAMIN,
-	WNI_CFG_ADMIT_POLICY_STAMAX,
-	WNI_CFG_ADMIT_POLICY_STADEF},
-	{WNI_CFG_ADMIT_BWFACTOR,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_RESTART,
-	WNI_CFG_ADMIT_BWFACTOR_STAMIN,
-	WNI_CFG_ADMIT_BWFACTOR_STAMAX,
-	WNI_CFG_ADMIT_BWFACTOR_STADEF},
 	{WNI_CFG_SCAN_CONTROL_LIST,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_RESTART |
 	CFG_CTL_NTF_LIM,
@@ -211,16 +165,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_SCAN_IN_POWERSAVE_STAMIN,
 	WNI_CFG_SCAN_IN_POWERSAVE_STAMAX,
 	WNI_CFG_SCAN_IN_POWERSAVE_STADEF},
-	{WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE_STAMIN,
-	WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE_STAMAX,
-	WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE_STADEF},
-	{WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE_STAMIN,
-	WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE_STAMAX,
-	WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE_STADEF},
 	{WNI_CFG_IBSS_AUTO_BSSID,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_IBSS_AUTO_BSSID_STAMIN,
@@ -239,17 +183,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_TELE_BCN_MAX_LI_STAMIN,
 	WNI_CFG_TELE_BCN_MAX_LI_STAMAX,
 	WNI_CFG_TELE_BCN_MAX_LI_STADEF},
-	{WNI_CFG_ASSOC_STA_LIMIT,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_LIM,
-	WNI_CFG_ASSOC_STA_LIMIT_STAMIN,
-	WNI_CFG_ASSOC_STA_LIMIT_STAMAX,
-	WNI_CFG_ASSOC_STA_LIMIT_STADEF},
-	{WNI_CFG_ENABLE_LTE_COEX,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_ENABLE_LTE_COEX_STAMIN,
-	WNI_CFG_ENABLE_LTE_COEX_STAMAX,
-	WNI_CFG_ENABLE_LTE_COEX_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,
@@ -260,21 +193,11 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP_STAMIN,
 	WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP_STAMAX,
 	WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP_STADEF},
-	{WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STAMIN,
-	WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STAMAX,
-	WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STADEF},
 	{WNI_CFG_IBSS_ATIM_WIN_SIZE,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_IBSS_ATIM_WIN_SIZE_STAMIN,
 	WNI_CFG_IBSS_ATIM_WIN_SIZE_STAMAX,
 	WNI_CFG_IBSS_ATIM_WIN_SIZE_STADEF},
-	{WNI_CFG_RATE_FOR_TX_MGMT,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_RATE_FOR_TX_MGMT_STAMIN,
-	WNI_CFG_RATE_FOR_TX_MGMT_STAMAX,
-	WNI_CFG_RATE_FOR_TX_MGMT_STADEF},
 	{WNI_CFG_HE_CONTROL,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_HE_CONTROL_STAMIN, WNI_CFG_HE_CONTROL_STAMAX,
@@ -722,16 +645,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_HE_STA_OBSSPD_STAMIN, WNI_CFG_HE_STA_OBSSPD_STAMAX,
 	WNI_CFG_HE_STA_OBSSPD_STADEF},
-	{WNI_CFG_RATE_FOR_TX_MGMT_2G,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_RATE_FOR_TX_MGMT_2G_STAMIN,
-	WNI_CFG_RATE_FOR_TX_MGMT_2G_STAMAX,
-	WNI_CFG_RATE_FOR_TX_MGMT_2G_STADEF},
-	{WNI_CFG_RATE_FOR_TX_MGMT_5G,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_RATE_FOR_TX_MGMT_5G_STAMIN,
-	WNI_CFG_RATE_FOR_TX_MGMT_5G_STAMAX,
-	WNI_CFG_RATE_FOR_TX_MGMT_5G_STADEF},
 	{WNI_CFG_OBSS_DETECTION_OFFLOAD,
 	 CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	 0, 1, 0},

core/mac/src/pe/lim/lim_assoc_utils.c

@@ -2711,7 +2711,7 @@ lim_add_sta_self(tpAniSirGlobal pMac, uint16_t staIdx, uint8_t updateSta,
 	struct scheduler_msg msgQ = {0};
 	QDF_STATUS retCode = QDF_STATUS_SUCCESS;
 	tSirMacAddr staMac;
-	uint32_t listenInterval = WNI_CFG_LISTEN_INTERVAL_STADEF;
+	uint32_t listenInterval = MLME_CFG_LISTEN_INTERVAL;
 	/*This self Sta dot 11 mode comes from the cfg and the expectation here is
 	 * that cfg carries the systemwide capability that device under
 	 * consideration can support. This capability gets plumbed into the cfg
@@ -3579,7 +3579,7 @@ QDF_STATUS lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp,
 	tDot11fIEVHTCaps *vht_caps = NULL;
 	tDot11fIEVHTOperation *vht_oper = NULL;
 	tAddStaParams *sta_context;
-	uint32_t listen_interval = WNI_CFG_LISTEN_INTERVAL_STADEF;
+	uint32_t listen_interval = MLME_CFG_LISTEN_INTERVAL;
 	struct mlme_vht_capabilities_info vht_cap_info;
 
 	vht_cap_info = pMac->mlme_cfg->vht_caps.vht_cap_info;
@@ -4110,7 +4110,7 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t updateEnt
 	uint8_t chanWidthSupp = 0;
 	tDot11fIEVHTOperation *vht_oper = NULL;
 	tDot11fIEVHTCaps *vht_caps = NULL;
-	uint32_t listen_interval = WNI_CFG_LISTEN_INTERVAL_STADEF;
+	uint32_t listen_interval = MLME_CFG_LISTEN_INTERVAL;
 
 	tpSirBssDescription bssDescription =
 		&psessionEntry->pLimJoinReq->bssDescription;

core/mac/src/pe/lim/lim_process_mlm_host_roam.c

@@ -352,7 +352,7 @@ void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac,
 	tLimMlmReassocCnf mlmReassocCnf; /* keep sme */
 	tpDphHashNode pStaDs = NULL;
 	tpAddStaParams pAddStaParams = NULL;
-	uint32_t listenInterval = WNI_CFG_LISTEN_INTERVAL_STADEF;
+	uint32_t listenInterval = MLME_CFG_LISTEN_INTERVAL;
 	tpAddBssParams pAddBssParams = (tpAddBssParams) limMsgQ->bodyptr;
 	uint32_t selfStaDot11Mode = 0;
 

core/mac/src/pe/lim/lim_utils.c

@@ -8349,7 +8349,7 @@ void lim_process_ap_ecsa_timeout(void *data)
 		if (session->beaconParams.beaconInterval)
 			bcn_int = session->beaconParams.beaconInterval;
 		else
-			bcn_int = WNI_CFG_BEACON_INTERVAL_STADEF;
+			bcn_int = MLME_CFG_BEACON_INTERVAL_DEF;
 
 		status = qdf_mc_timer_start(&session->ap_ecsa_timer,
 					    bcn_int);

core/sme/src/csr/csr_api_roam.c

@@ -4715,15 +4715,15 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile,
 	 * CFG based on the advertised privacy setting from the AP for WPA
 	 * associations. See note below in this function...
 	 */
-	uint32_t privacy_enabled = 0, RsnEnabled = 0, wep_default_key_id = 0;
-	uint32_t WepKeyLength = WNI_CFG_WEP_KEY_LENGTH_5;
+	uint32_t privacy_enabled = 0, rsn_enabled = 0, wep_default_key_id = 0;
+	uint32_t WepKeyLength = MLME_WEP_KEY_LENGTH_5;
 	uint32_t Key0Length = 0, Key1Length = 0, Key2Length = 0, Key3Length = 0;
 
 	/* Reserve for the biggest key */
-	uint8_t Key0[MLME_WEP_MAX_KEY_LEN];
-	uint8_t Key1[MLME_WEP_MAX_KEY_LEN];
-	uint8_t Key2[MLME_WEP_MAX_KEY_LEN];
-	uint8_t Key3[MLME_WEP_MAX_KEY_LEN];
+	uint8_t Key0[MLME_WEP_KEY_LEN_13];
+	uint8_t Key1[MLME_WEP_KEY_LEN_13];
+	uint8_t Key2[MLME_WEP_KEY_LEN_13];
+	uint8_t Key3[MLME_WEP_KEY_LEN_13];
 
 	struct wlan_mlme_wep_cfg *wep_params = &pMac->mlme_cfg->wep_params;
 
@@ -4731,7 +4731,7 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile,
 	case eCSR_ENCRYPT_TYPE_NONE:
 		/* for NO encryption, turn off Privacy and Rsn. */
 		privacy_enabled = 0;
-		RsnEnabled = 0;
+		rsn_enabled = 0;
 		/* clear out the WEP keys that may be hanging around. */
 		Key0Length = 0;
 		Key1Length = 0;
@@ -4744,11 +4744,11 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile,
 
 		/* Privacy is ON.  NO RSN for Wep40 static key. */
 		privacy_enabled = 1;
-		RsnEnabled = 0;
+		rsn_enabled = 0;
 		/* Set the Wep default key ID. */
 		wep_default_key_id = pProfile->Keys.defaultIndex;
 		/* Wep key size if 5 bytes (40 bits). */
-		WepKeyLength = WNI_CFG_WEP_KEY_LENGTH_5;
+		WepKeyLength = MLME_WEP_KEY_LENGTH_5;
 		/*
 		 * set encryption keys in the CFG database or
 		 * clear those that are not present in this profile.
@@ -4756,8 +4756,8 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile,
 		if (pProfile->Keys.KeyLength[0]) {
 			qdf_mem_copy(Key0,
 				pProfile->Keys.KeyMaterial[0],
-				WNI_CFG_WEP_KEY_LENGTH_5);
-			Key0Length = WNI_CFG_WEP_KEY_LENGTH_5;
+				MLME_WEP_KEY_LENGTH_5);
+			Key0Length = MLME_WEP_KEY_LENGTH_5;
 		} else {
 			Key0Length = 0;
 		}
@@ -4765,8 +4765,8 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile,
 		if (pProfile->Keys.KeyLength[1]) {
 			qdf_mem_copy(Key1,
 				pProfile->Keys.KeyMaterial[1],
-				WNI_CFG_WEP_KEY_LENGTH_5);
-			Key1Length = WNI_CFG_WEP_KEY_LENGTH_5;
+				MLME_WEP_KEY_LENGTH_5);
+			Key1Length = MLME_WEP_KEY_LENGTH_5;
 		} else {
 			Key1Length = 0;
 		}
@@ -4774,8 +4774,8 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile,
 		if (pProfile->Keys.KeyLength[2]) {
 			qdf_mem_copy(Key2,
 				pProfile->Keys.KeyMaterial[2],
-				WNI_CFG_WEP_KEY_LENGTH_5);
-			Key2Length = WNI_CFG_WEP_KEY_LENGTH_5;
+				MLME_WEP_KEY_LENGTH_5);
+			Key2Length = MLME_WEP_KEY_LENGTH_5;
 		} else {
 			Key2Length = 0;
 		}
@@ -4783,8 +4783,8 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile,
 		if (pProfile->Keys.KeyLength[3]) {
 			qdf_mem_copy(Key3,
 				pProfile->Keys.KeyMaterial[3],
-				WNI_CFG_WEP_KEY_LENGTH_5);
-			Key3Length = WNI_CFG_WEP_KEY_LENGTH_5;
+				MLME_WEP_KEY_LENGTH_5);
+			Key3Length = MLME_WEP_KEY_LENGTH_5;
 		} else {
 			Key3Length = 0;
 		}
@@ -4795,11 +4795,11 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile,
 
 		/* Privacy is ON.  NO RSN for Wep40 static key. */
 		privacy_enabled = 1;
-		RsnEnabled = 0;
+		rsn_enabled = 0;
 		/* Set the Wep default key ID. */
 		wep_default_key_id = pProfile->Keys.defaultIndex;
 		/* Wep key size if 13 bytes (104 bits). */
-		WepKeyLength = WNI_CFG_WEP_KEY_LENGTH_13;
+		WepKeyLength = MLME_WEP_KEY_LEN_13;
 		/*
 		 * set encryption keys in the CFG database or clear
 		 * those that are not present in this profile.
@@ -4807,8 +4807,8 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile,
 		if (pProfile->Keys.KeyLength[0]) {
 			qdf_mem_copy(Key0,
 				pProfile->Keys.KeyMaterial[0],
-				WNI_CFG_WEP_KEY_LENGTH_13);
-			Key0Length = WNI_CFG_WEP_KEY_LENGTH_13;
+				MLME_WEP_KEY_LEN_13);
+			Key0Length = MLME_WEP_KEY_LEN_13;
 		} else {
 			Key0Length = 0;
 		}
@@ -4816,8 +4816,8 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile,
 		if (pProfile->Keys.KeyLength[1]) {
 			qdf_mem_copy(Key1,
 				pProfile->Keys.KeyMaterial[1],
-				WNI_CFG_WEP_KEY_LENGTH_13);
-			Key1Length = WNI_CFG_WEP_KEY_LENGTH_13;
+				MLME_WEP_KEY_LEN_13);
+			Key1Length = MLME_WEP_KEY_LEN_13;
 		} else {
 			Key1Length = 0;
 		}
@@ -4825,8 +4825,8 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile,
 		if (pProfile->Keys.KeyLength[2]) {
 			qdf_mem_copy(Key2,
 				pProfile->Keys.KeyMaterial[2],
-				WNI_CFG_WEP_KEY_LENGTH_13);
-			Key2Length = WNI_CFG_WEP_KEY_LENGTH_13;
+				MLME_WEP_KEY_LEN_13);
+			Key2Length = MLME_WEP_KEY_LEN_13;
 		} else {
 			Key2Length = 0;
 		}
@@ -4834,8 +4834,8 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile,
 		if (pProfile->Keys.KeyLength[3]) {
 			qdf_mem_copy(Key3,
 				pProfile->Keys.KeyMaterial[3],
-				WNI_CFG_WEP_KEY_LENGTH_13);
-			Key3Length = WNI_CFG_WEP_KEY_LENGTH_13;
+				MLME_WEP_KEY_LEN_13);
+			Key3Length = MLME_WEP_KEY_LEN_13;
 		} else {
 			Key3Length = 0;
 		}
@@ -4856,7 +4856,7 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile,
 		 */
 		privacy_enabled = (0 != fPrivacy);
 		/* turn on RSN enabled for WPA associations */
-		RsnEnabled = 1;
+		rsn_enabled = 1;
 		/* clear static WEP keys that may be hanging around. */
 		Key0Length = 0;
 		Key1Length = 0;
@@ -4865,12 +4865,12 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, struct csr_roam_profile *pProfile,
 		break;
 	default:
 		privacy_enabled = 0;
-		RsnEnabled = 0;
+		rsn_enabled = 0;
 		break;
 	}
 
 	pMac->mlme_cfg->wep_params.is_privacy_enabled = privacy_enabled;
-	pMac->mlme_cfg->feature_flags.enable_rsn = RsnEnabled;
+	pMac->mlme_cfg->feature_flags.enable_rsn = rsn_enabled;
 	mlme_set_wep_key(wep_params, MLME_WEP_DEFAULT_KEY_1, Key0, Key0Length);
 	mlme_set_wep_key(wep_params, MLME_WEP_DEFAULT_KEY_2, Key1, Key1Length);
 	mlme_set_wep_key(wep_params, MLME_WEP_DEFAULT_KEY_3, Key2, Key2Length);
@@ -16615,7 +16615,7 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t
 	else if (pParam->beaconInterval)
 		wTmp = pParam->beaconInterval;
 	else
-		wTmp = WNI_CFG_BEACON_INTERVAL_STADEF;
+		wTmp = MLME_CFG_BEACON_INTERVAL_DEF;
 
 	csr_validate_mcc_beacon_interval(pMac, pParam->operationChn,
 					 &wTmp, sessionId, pParam->bssPersona);

core/wma/src/wma_mgmt.c

@@ -695,24 +695,20 @@ void wma_set_vdev_mgmt_rate(tp_wma_handle wma, uint8_t vdev_id)
 
 	cfg_val = mac->mlme_cfg->sap_cfg.rate_tx_mgmt;
 	band = CDS_BAND_ALL;
-	if ((cfg_val == WNI_CFG_RATE_FOR_TX_MGMT_STADEF) ||
+	if ((cfg_val == MLME_CFG_TX_MGMT_RATE_DEF) ||
 	    !wma_verify_rate_code(cfg_val, band)) {
 		WMA_LOGD("default WNI_CFG_RATE_FOR_TX_MGMT, ignore");
 	} else {
-		ret = wma_vdev_set_param(
-			wma->wmi_handle,
-			vdev_id,
-			WMI_VDEV_PARAM_MGMT_TX_RATE,
-			cfg_val);
+		ret = wma_vdev_set_param(wma->wmi_handle, vdev_id,
+					 WMI_VDEV_PARAM_MGMT_TX_RATE,
+					 cfg_val);
 		if (ret)
-			WMA_LOGE(
-			"Failed to set WMI_VDEV_PARAM_MGMT_TX_RATE"
-			);
+			WMA_LOGE("Failed to set WMI_VDEV_PARAM_MGMT_TX_RATE");
 	}
 
 	cfg_val = mac->mlme_cfg->sap_cfg.rate_tx_mgmt_2g;
 	band = CDS_BAND_2GHZ;
-	if ((cfg_val == WNI_CFG_RATE_FOR_TX_MGMT_2G_STADEF) ||
+	if ((cfg_val == MLME_CFG_TX_MGMT_2G_RATE_DEF) ||
 	    !wma_verify_rate_code(cfg_val, band)) {
 		WMA_LOGD("use default 2G MGMT rate.");
 		per_band_mgmt_tx_rate &=
@@ -726,7 +722,7 @@ void wma_set_vdev_mgmt_rate(tp_wma_handle wma, uint8_t vdev_id)
 
 	cfg_val = mac->mlme_cfg->sap_cfg.rate_tx_mgmt;
 	band = CDS_BAND_5GHZ;
-	if ((cfg_val == WNI_CFG_RATE_FOR_TX_MGMT_5G_STADEF) ||
+	if ((cfg_val == MLME_CFG_TX_MGMT_5G_RATE_DEF) ||
 	    !wma_verify_rate_code(cfg_val, band)) {
 		WMA_LOGD("use default 5G MGMT rate.");
 		per_band_mgmt_tx_rate &=