qcacld-3.0: Remove obsolete config items Part 1

Remove unused configuration items

CRs-Fixed: 1014978
Change-Id: I4c41de218033055bebb6bcdb5bde77ec028b3381

2 files changed, 4 insertions, 690 deletions

diff --git a/core/mac/inc/wni_cfg.h b/core/mac/inc/wni_cfg.h
index 2c46e7d2ee35..db3abb294002 100644
--- a/core/mac/inc/wni_cfg.h
+++ b/core/mac/inc/wni_cfg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -34,7 +34,6 @@
 
 enum {
 	WNI_CFG_STA_ID,
-	WNI_CFG_CF_POLLABLE,
 	WNI_CFG_CFP_PERIOD,
 	WNI_CFG_CFP_MAX_DURATION,
 	WNI_CFG_SSID,
@@ -60,7 +59,6 @@ enum {
 	WNI_CFG_AUTHENTICATE_RSP_TIMEOUT,
 	WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT,
 	WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT,
-	WNI_CFG_RA_PERIODICITY_TIMEOUT_IN_PS,
 	WNI_CFG_PS_ENABLE_BCN_FILTER,
 	WNI_CFG_PS_ENABLE_HEART_BEAT,
 	WNI_CFG_PS_ENABLE_RSSI_MONITOR,
@@ -76,33 +74,21 @@ enum {
 	WNI_CFG_LISTEN_INTERVAL,
 	WNI_CFG_VALID_CHANNEL_LIST,
 	WNI_CFG_CURRENT_CHANNEL,
-	WNI_CFG_DEFAULT_RATE_INDEX_5GHZ,
 	WNI_CFG_DEFAULT_RATE_INDEX_24GHZ,
-	WNI_CFG_RATE_ADAPTATION_TYPE,
 	WNI_CFG_FIXED_RATE,
-	WNI_CFG_FIXED_RATE_MULTICAST_24GHZ,
-	WNI_CFG_FIXED_RATE_MULTICAST_5GHZ,
-	WNI_CFG_RETRYRATE_POLICY,
-	WNI_CFG_RETRYRATE_SECONDARY,
-	WNI_CFG_RETRYRATE_TERTIARY,
 	WNI_CFG_APSD_ENABLED,
 	WNI_CFG_SHARED_KEY_AUTH_ENABLE,
 	WNI_CFG_OPEN_SYSTEM_AUTH_ENABLE,
 	WNI_CFG_AUTHENTICATION_TYPE,
-	WNI_CFG_CF_POLL_REQUEST,
 	WNI_CFG_PRIVACY_ENABLED,
 	WNI_CFG_SHORT_PREAMBLE,
-	WNI_CFG_SHORT_SLOT_TIME,
 	WNI_CFG_ACCEPT_SHORT_SLOT_ASSOC_ONLY,
 	WNI_CFG_QOS_ENABLED,
 	WNI_CFG_HCF_ENABLED,
 	WNI_CFG_RSN_ENABLED,
 	WNI_CFG_MAX_NUM_PRE_AUTH,
-	WNI_CFG_PREAUTH_CLNUP_TIMEOUT,
-	WNI_CFG_RELEASE_AID_TIMEOUT,
 	WNI_CFG_HEART_BEAT_THRESHOLD,
 	WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT,
-	WNI_CFG_MANUFACTURER_OUI,
 	WNI_CFG_MANUFACTURER_NAME,
 	WNI_CFG_MODEL_NUMBER,
 	WNI_CFG_MODEL_NAME,
@@ -111,18 +97,12 @@ enum {
 	WNI_CFG_11D_ENABLED,
 	WNI_CFG_MAX_TX_POWER_2_4,
 	WNI_CFG_MAX_TX_POWER_5,
-	WNI_CFG_NETWORK_DENSITY,
-	WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM,
-	WNI_CFG_CURRENT_TX_ANTENNA,
 	WNI_CFG_CURRENT_RX_ANTENNA,
 	WNI_CFG_CURRENT_TX_POWER_LEVEL,
 	WNI_CFG_NEW_BSS_FOUND_IND,
-	WNI_CFG_PROPRIETARY_RATES_ENABLED,
-	WNI_CFG_AP_NODE_NAME,
 	WNI_CFG_COUNTRY_CODE,
 	WNI_CFG_11H_ENABLED,
 	WNI_CFG_WT_CNF_TIMEOUT,
-	WNI_CFG_PROXIMITY,
 	WNI_CFG_LOG_LEVEL,
 	WNI_CFG_OLBC_DETECT_TIMEOUT,
 	WNI_CFG_PROTECTION_ENABLED,
@@ -131,12 +111,9 @@ enum {
 	WNI_CFG_11G_SHORT_PREAMBLE_ENABLED,
 	WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED,
 	WNI_CFG_11G_ONLY_POLICY,
-	WNI_CFG_PACKET_CLASSIFICATION,
 	WNI_CFG_WME_ENABLED,
 	WNI_CFG_ADDTS_RSP_TIMEOUT,
 	WNI_CFG_MAX_SP_LENGTH,
-	WNI_CFG_KEEP_ALIVE_STA_LIMIT_THRESHOLD,
-	WNI_CFG_SEND_SINGLE_SSID_ALWAYS,
 	WNI_CFG_WSM_ENABLED,
 	WNI_CFG_EDCA_PROFILE,
 	WNI_CFG_EDCA_ANI_ACBK_LOCAL,
@@ -155,21 +132,14 @@ enum {
 	WNI_CFG_EDCA_WME_ACBE,
 	WNI_CFG_EDCA_WME_ACVI,
 	WNI_CFG_EDCA_WME_ACVO,
-	WNI_CFG_RDET_FLAG,
-	WNI_CFG_RADAR_CHANNEL_LIST,
 	WNI_CFG_LOCAL_POWER_CONSTRAINT,
 	WNI_CFG_ADMIT_POLICY,
 	WNI_CFG_ADMIT_BWFACTOR,
-	WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE,
 	WNI_CFG_CHANNEL_BONDING_MODE,
-	WNI_CFG_CB_SECONDARY_CHANNEL_STATE,
 	WNI_CFG_DYNAMIC_THRESHOLD_ZERO,
 	WNI_CFG_DYNAMIC_THRESHOLD_ONE,
 	WNI_CFG_DYNAMIC_THRESHOLD_TWO,
-	WNI_CFG_TRIG_STA_BK_SCAN,
-	WNI_CFG_DYNAMIC_PROFILE_SWITCHING,
 	WNI_CFG_SCAN_CONTROL_LIST,
-	WNI_CFG_MIMO_ENABLED,
 	WNI_CFG_BLOCK_ACK_ENABLED,
 	WNI_CFG_HT_RX_STBC,
 	WNI_CFG_HT_CAP_INFO,
@@ -207,8 +177,6 @@ enum {
 	WNI_CFG_VHT_TX_MCS_MAP,
 	WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE,
 	WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE,
-	WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1,
-	WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2,
 	WNI_CFG_VHT_BASIC_MCS_SET,
 	WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT,
 	WNI_CFG_VHT_SS_UNDER_UTIL,
@@ -220,12 +188,8 @@ enum {
 	WNI_CFG_MAX_RX_AMPDU_FACTOR,
 	WNI_CFG_SHORT_GI_20MHZ,
 	WNI_CFG_SHORT_GI_40MHZ,
-	WNI_CFG_RIFS_ENABLED,
 	WNI_CFG_MAX_PS_POLL,
-	WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE,
 	WNI_CFG_RSSI_FILTER_PERIOD,
-	WNI_CFG_MIN_RSSI_THRESHOLD,
-	WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE,
 	WNI_CFG_SCAN_IN_POWERSAVE,
 	WNI_CFG_IGNORE_DTIM,
 	WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE,
@@ -234,48 +198,23 @@ enum {
 	WNI_CFG_WOWLAN_DISASSOC_ENABLE,
 	WNI_CFG_WOWLAN_MAX_MISSED_BEACON,
 	WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD,
-	WNI_CFG_BG_SCAN_CHANNEL_LIST,
 	WNI_CFG_MAX_MEDIUM_TIME,
-	WNI_CFG_MAX_MPDUS_IN_AMPDU,
 	WNI_CFG_IBSS_AUTO_BSSID,
-	WNI_CFG_PROBE_REQ_ADDNIE_FLAG,
-	WNI_CFG_PROBE_REQ_ADDNIE_DATA,
-	WNI_CFG_PROBE_RSP_ADDNIE_FLAG,
-	WNI_CFG_PROBE_RSP_ADDNIE_DATA1,
-	WNI_CFG_PROBE_RSP_ADDNIE_DATA2,
-	WNI_CFG_PROBE_RSP_ADDNIE_DATA3,
-	WNI_CFG_ASSOC_RSP_ADDNIE_FLAG,
-	WNI_CFG_ASSOC_RSP_ADDNIE_DATA,
-	WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG,
-	WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA,
 	WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG,
-	WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA,
 	WNI_CFG_WPS_ENABLE,
 	WNI_CFG_WPS_STATE,
-	WNI_CFG_WPS_PROBE_REQ_FLAG,
 	WNI_CFG_WPS_VERSION,
-	WNI_CFG_WPS_REQUEST_TYPE,
 	WNI_CFG_WPS_CFG_METHOD,
 	WNI_CFG_WPS_UUID,
 	WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY,
 	WNI_CFG_WPS_PIMARY_DEVICE_OUI,
 	WNI_CFG_WPS_DEVICE_SUB_CATEGORY,
-	WNI_CFG_WPS_ASSOCIATION_STATE,
-	WNI_CFG_WPS_CONFIGURATION_ERROR,
 	WNI_CFG_WPS_DEVICE_PASSWORD_ID,
-	WNI_CFG_WPS_ASSOC_METHOD,
 	WNI_CFG_LOW_GAIN_OVERRIDE,
 	WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE,
-	WNI_CFG_RPE_POLLING_THRESHOLD,
-	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG,
-	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG,
-	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG,
-	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG,
-	WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS,
 	WNI_CFG_SINGLE_TID_RC,
 	WNI_CFG_TX_PWR_CTRL_ENABLE,
 	WNI_CFG_MCAST_BCAST_FILTER_SETTING,
-	WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK,
 	WNI_CFG_DYNAMIC_PS_POLL_VALUE,
 	WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT,
 	WNI_CFG_TELE_BCN_WAKEUP_EN,
@@ -283,19 +222,14 @@ enum {
 	WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS,
 	WNI_CFG_TELE_BCN_MAX_LI,
 	WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS,
-	WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS,
 	WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD,
 	WNI_CFG_ASSOC_STA_LIMIT,
-	WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL,
-	WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL,
-	WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND,
 	WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD,
 	WNI_CFG_ENABLE_CLOSE_LOOP,
 	WNI_CFG_ENABLE_LTE_COEX,
 	WNI_CFG_AP_KEEP_ALIVE_TIMEOUT,
 	WNI_CFG_GO_KEEP_ALIVE_TIMEOUT,
 	WNI_CFG_ENABLE_MC_ADDR_LIST,
-	WNI_CFG_ENABLE_UC_FILTER,
 	WNI_CFG_ENABLE_LPWR_IMG_TRANSITION,
 	WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED,
 	WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP,
@@ -325,7 +259,9 @@ enum {
 	WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL,
 	WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL,
 	WNI_CFG_OBSS_HT40_WIDTH_CH_TRANSITION_DELAY,
-	WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD
+	WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD,
+	/* Any new items to be added should be above this strictly */
+	CFG_PARAM_MAX_NUM
 };
 /*
  * String parameter lengths
@@ -343,7 +279,6 @@ enum {
 #define WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET_LEN    8
 #define WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET_LEN    4
 #define WNI_CFG_VALID_CHANNEL_LIST_LEN    100
-#define WNI_CFG_MANUFACTURER_OUI_LEN    3
 #define WNI_CFG_MANUFACTURER_NAME_LEN    64
 #define WNI_CFG_MODEL_NUMBER_LEN    32
 #define WNI_CFG_MODEL_NAME_LEN    32
@@ -351,7 +286,6 @@ enum {
 #define WNI_CFG_MANUFACTURER_PRODUCT_VERSION_LEN    32
 #define WNI_CFG_MAX_TX_POWER_2_4_LEN    128
 #define WNI_CFG_MAX_TX_POWER_5_LEN    128
-#define WNI_CFG_AP_NODE_NAME_LEN    32
 #define WNI_CFG_COUNTRY_CODE_LEN    3
 #define WNI_CFG_EDCA_ANI_ACBK_LOCAL_LEN    20
 #define WNI_CFG_EDCA_ANI_ACBE_LOCAL_LEN    20
@@ -369,18 +303,12 @@ enum {
 #define WNI_CFG_EDCA_WME_ACBE_LEN    20
 #define WNI_CFG_EDCA_WME_ACVI_LEN    20
 #define WNI_CFG_EDCA_WME_ACVO_LEN    20
-#define WNI_CFG_RADAR_CHANNEL_LIST_LEN    20
 #define WNI_CFG_SCAN_CONTROL_LIST_LEN    128
 #define WNI_CFG_SUPPORTED_MCS_SET_LEN    16
 #define WNI_CFG_BASIC_MCS_SET_LEN    16
 #define WNI_CFG_CURRENT_MCS_SET_LEN    16
-#define WNI_CFG_BG_SCAN_CHANNEL_LIST_LEN    100
-#define WNI_CFG_PROBE_REQ_ADDNIE_DATA_LEN    255
 #define WNI_CFG_PROBE_RSP_ADDNIE_DATA1_LEN    255
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2_LEN    255
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3_LEN    255
 #define WNI_CFG_ASSOC_RSP_ADDNIE_DATA_LEN    255
-#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA_LEN    255
 #define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA_LEN    255
 #define WNI_CFG_WPS_UUID_LEN    16
 
@@ -476,10 +404,6 @@ enum {
 #define WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT_STAMAX    65535
 #define WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT_STADEF    1000
 
-#define WNI_CFG_RA_PERIODICITY_TIMEOUT_IN_PS_STAMIN    0
-#define WNI_CFG_RA_PERIODICITY_TIMEOUT_IN_PS_STAMAX    65535
-#define WNI_CFG_RA_PERIODICITY_TIMEOUT_IN_PS_STADEF    1000
-
 #define WNI_CFG_PS_ENABLE_BCN_FILTER_STAMIN    0
 #define WNI_CFG_PS_ENABLE_BCN_FILTER_STAMAX    1
 #define WNI_CFG_PS_ENABLE_BCN_FILTER_STADEF    1
@@ -531,18 +455,10 @@ enum {
 #define WNI_CFG_CURRENT_CHANNEL_STAMAX    165
 #define WNI_CFG_CURRENT_CHANNEL_STADEF    1
 
-#define WNI_CFG_DEFAULT_RATE_INDEX_5GHZ_STAMIN    0
-#define WNI_CFG_DEFAULT_RATE_INDEX_5GHZ_STAMAX    11
-#define WNI_CFG_DEFAULT_RATE_INDEX_5GHZ_STADEF    5
-
 #define WNI_CFG_DEFAULT_RATE_INDEX_24GHZ_STAMIN    0
 #define WNI_CFG_DEFAULT_RATE_INDEX_24GHZ_STAMAX    31
 #define WNI_CFG_DEFAULT_RATE_INDEX_24GHZ_STADEF    1
 
-#define WNI_CFG_RATE_ADAPTATION_TYPE_STAMIN    0
-#define WNI_CFG_RATE_ADAPTATION_TYPE_STAMAX    2
-#define WNI_CFG_RATE_ADAPTATION_TYPE_STADEF    1
-
 #define WNI_CFG_RATE_ADAPTATION_TYPE_FIXED    0
 #define WNI_CFG_RATE_ADAPTATION_TYPE_AUTO    1
 #define WNI_CFG_RATE_ADAPTATION_TYPE_SNR_BASED    2
@@ -597,18 +513,6 @@ enum {
 #define WNI_CFG_FIXED_RATE_135MBPS_MCS6_40MHZ_SIMO_SGI    43
 #define WNI_CFG_FIXED_RATE_150MBPS_MCS7_40MHZ_SIMO_SGI    44
 
-#define WNI_CFG_FIXED_RATE_MULTICAST_24GHZ_STAMIN    0
-#define WNI_CFG_FIXED_RATE_MULTICAST_24GHZ_STAMAX    31
-#define WNI_CFG_FIXED_RATE_MULTICAST_24GHZ_STADEF    1
-
-#define WNI_CFG_FIXED_RATE_MULTICAST_5GHZ_STAMIN    0
-#define WNI_CFG_FIXED_RATE_MULTICAST_5GHZ_STAMAX    31
-#define WNI_CFG_FIXED_RATE_MULTICAST_5GHZ_STADEF    5
-
-#define WNI_CFG_RETRYRATE_POLICY_STAMIN    0
-#define WNI_CFG_RETRYRATE_POLICY_STAMAX    255
-#define WNI_CFG_RETRYRATE_POLICY_STADEF    4
-
 #define WNI_CFG_RETRYRATE_POLICY_MIN_SUPPORTED    0
 #define WNI_CFG_RETRYRATE_POLICY_PRIMARY    1
 #define WNI_CFG_RETRYRATE_POLICY_RESERVED    2
@@ -616,14 +520,6 @@ enum {
 #define WNI_CFG_RETRYRATE_POLICY_AUTOSELECT    4
 #define WNI_CFG_RETRYRATE_POLICY_MAX    5
 
-#define WNI_CFG_RETRYRATE_SECONDARY_STAMIN    0
-#define WNI_CFG_RETRYRATE_SECONDARY_STAMAX    255
-#define WNI_CFG_RETRYRATE_SECONDARY_STADEF    0
-
-#define WNI_CFG_RETRYRATE_TERTIARY_STAMIN    0
-#define WNI_CFG_RETRYRATE_TERTIARY_STAMAX    255
-#define WNI_CFG_RETRYRATE_TERTIARY_STADEF    0
-
 #define WNI_CFG_APSD_ENABLED_STAMIN    0
 #define WNI_CFG_APSD_ENABLED_STAMAX    1
 #define WNI_CFG_APSD_ENABLED_STADEF    0
@@ -688,26 +584,14 @@ enum {
 #define WNI_CFG_11D_ENABLED_STAMAX    1
 #define WNI_CFG_11D_ENABLED_STADEF    1
 
-#define WNI_CFG_NETWORK_DENSITY_STAMIN    0
-#define WNI_CFG_NETWORK_DENSITY_STAMAX    3
-#define WNI_CFG_NETWORK_DENSITY_STADEF    3
-
 #define WNI_CFG_NETWORK_DENSITY_LOW    0
 #define WNI_CFG_NETWORK_DENSITY_MEDIUM    1
 #define WNI_CFG_NETWORK_DENSITY_HIGH    2
 #define WNI_CFG_NETWORK_DENSITY_ADAPTIVE    3
 
-#define WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM_STAMIN    1
-#define WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM_STAMAX    2
-#define WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM_STADEF    2
-
 #define WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM_CARRIER    1
 #define WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM_CORRELATION    2
 
-#define WNI_CFG_CURRENT_TX_ANTENNA_STAMIN    1
-#define WNI_CFG_CURRENT_TX_ANTENNA_STAMAX    1
-#define WNI_CFG_CURRENT_TX_ANTENNA_STADEF    1
-
 #define WNI_CFG_CURRENT_RX_ANTENNA_STAMIN    1
 #define WNI_CFG_CURRENT_RX_ANTENNA_STAMAX    2
 #define WNI_CFG_CURRENT_RX_ANTENNA_STADEF    2
@@ -723,10 +607,6 @@ enum {
 #define WNI_CFG_NEW_BSS_FOUND_IND_STADEF    0
 
 
-#define WNI_CFG_PROPRIETARY_RATES_ENABLED_STAMIN    0
-#define WNI_CFG_PROPRIETARY_RATES_ENABLED_STAMAX    1
-#define WNI_CFG_PROPRIETARY_RATES_ENABLED_STADEF    0
-
 #define WNI_CFG_11H_ENABLED_STAMIN    0
 #define WNI_CFG_11H_ENABLED_STAMAX    1
 #define WNI_CFG_11H_ENABLED_STADEF    1
@@ -735,13 +615,6 @@ enum {
 #define WNI_CFG_WT_CNF_TIMEOUT_STAMAX    3000
 #define WNI_CFG_WT_CNF_TIMEOUT_STADEF    1000
 
-#define WNI_CFG_PROXIMITY_STAMIN    0
-#define WNI_CFG_PROXIMITY_STAMAX    1
-#define WNI_CFG_PROXIMITY_STADEF    0
-
-#define WNI_CFG_PROXIMITY_OFF    0
-#define WNI_CFG_PROXIMITY_ON    1
-
 #define WNI_CFG_LOG_LEVEL_STAMIN    0
 #define WNI_CFG_LOG_LEVEL_STAMAX    7
 #define WNI_CFG_LOG_LEVEL_STADEF    4
@@ -798,15 +671,6 @@ enum {
 #define WNI_CFG_11G_ONLY_POLICY_STAMAX    1
 #define WNI_CFG_11G_ONLY_POLICY_STADEF    0
 
-#define WNI_CFG_PACKET_CLASSIFICATION_STAMIN    0
-#define WNI_CFG_PACKET_CLASSIFICATION_STAMAX    3
-#define WNI_CFG_PACKET_CLASSIFICATION_STADEF    0
-
-#define WNI_CFG_PACKET_CLASSIFICATION_DISABLED    0
-#define WNI_CFG_PACKET_CLASSIFICATION_DSCP    1
-#define WNI_CFG_PACKET_CLASSIFICATION_8021P    2
-#define WNI_CFG_PACKET_CLASSIFICATION_ALL    3
-
 #define WNI_CFG_WME_ENABLED_STAMIN    0
 #define WNI_CFG_WME_ENABLED_STAMAX    1
 #define WNI_CFG_WME_ENABLED_STADEF    1
@@ -819,10 +683,6 @@ enum {
 #define WNI_CFG_MAX_SP_LENGTH_STAMAX    3
 #define WNI_CFG_MAX_SP_LENGTH_STADEF    0
 
-#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS_STAMIN    0
-#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS_STAMAX    1
-#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS_STADEF    0
-
 #define WNI_CFG_WSM_ENABLED_STAMIN    0
 #define WNI_CFG_WSM_ENABLED_STAMAX    1
 #define WNI_CFG_WSM_ENABLED_STADEF    0
@@ -847,13 +707,6 @@ enum {
 #define WNI_CFG_EDCA_PROFILE_CWMAXG_IDX    14
 #define WNI_CFG_EDCA_PROFILE_TXOPG_IDX    16
 
-#define WNI_CFG_RDET_FLAG_STAMIN    0
-#define WNI_CFG_RDET_FLAG_STAMAX    1
-#define WNI_CFG_RDET_FLAG_STADEF    0
-
-#define WNI_CFG_RDET_FLAG_ENABLE    1
-#define WNI_CFG_RDET_FLAG_DISABLE    0
-
 #define WNI_CFG_LOCAL_POWER_CONSTRAINT_STAMIN    0
 #define WNI_CFG_LOCAL_POWER_CONSTRAINT_STAMAX    255
 #define WNI_CFG_LOCAL_POWER_CONSTRAINT_STADEF    0
@@ -870,10 +723,6 @@ enum {
 #define WNI_CFG_ADMIT_BWFACTOR_STAMAX    100
 #define WNI_CFG_ADMIT_BWFACTOR_STADEF    20
 
-#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE_STAMIN    0
-#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE_STAMAX    256
-#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE_STADEF    60
-
 #define WNI_CFG_CHANNEL_BONDING_MODE_STAMIN    0
 #define WNI_CFG_CHANNEL_BONDING_MODE_STAMAX    10
 #define WNI_CFG_CHANNEL_BONDING_MODE_STADEF    0
@@ -884,21 +733,6 @@ enum {
 #define WNI_CFG_CHANNEL_BONDING_MODE_IF_NO_LEGACY_ALL    3
 #define WNI_CFG_CHANNEL_BONDING_MODE_INTELLIGENT    4
 
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE_STAMIN    0
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE_STAMAX    10
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE_STADEF    0
-
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE_NONE    0
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE_LOWER    1
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE_HIGHER    2
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE_11AC_20MHZ_LOW_40MHZ_CENTERED    3
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE_11AC_20MHZ_CENTERED_40MHZ_CENTERED    4
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE_11AC_20MHZ_HIGH_40MHZ_CENTERED    5
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE_11AC_20MHZ_LOW_40MHZ_LOW    6
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE_11AC_20MHZ_HIGH_40MHZ_LOW    7
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE_11AC_20MHZ_LOW_40MHZ_HIGH    8
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE_11AC_20MHZ_HIGH_40MHZ_HIGH    9
-
 #define WNI_CFG_DYNAMIC_THRESHOLD_ZERO_STAMIN    0
 #define WNI_CFG_DYNAMIC_THRESHOLD_ZERO_STAMAX    255
 #define WNI_CFG_DYNAMIC_THRESHOLD_ZERO_STADEF    2
@@ -911,23 +745,6 @@ enum {
 #define WNI_CFG_DYNAMIC_THRESHOLD_TWO_STAMAX    255
 #define WNI_CFG_DYNAMIC_THRESHOLD_TWO_STADEF    6
 
-#define WNI_CFG_TRIG_STA_BK_SCAN_STAMIN    0
-#define WNI_CFG_TRIG_STA_BK_SCAN_STAMAX    1
-#define WNI_CFG_TRIG_STA_BK_SCAN_STADEF    0
-
-#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING_STAMIN    0
-#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING_STAMAX    255
-#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING_STADEF    255
-
-#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING_UNUSED    255
-
-#define WNI_CFG_MIMO_ENABLED_STAMIN    0
-#define WNI_CFG_MIMO_ENABLED_STAMAX    1
-#define WNI_CFG_MIMO_ENABLED_STADEF    1
-
-#define WNI_CFG_MIMO_ENABLED_ENABLE    1
-#define WNI_CFG_MIMO_ENABLED_DISABLE    0
-
 #define WNI_CFG_BLOCK_ACK_ENABLED_STAMIN    0
 #define WNI_CFG_BLOCK_ACK_ENABLED_STAMAX    3
 #define WNI_CFG_BLOCK_ACK_ENABLED_STADEF    0
@@ -1124,14 +941,6 @@ enum {
 #define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE_STAMAX    780
 #define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE_STADEF    780
 
-#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1_STAMIN    0
-#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1_STAMAX    256
-#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1_STADEF    0
-
-#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2_STAMIN    0
-#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2_STAMAX    0
-#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2_STADEF    0
-
 #define WNI_CFG_VHT_BASIC_MCS_SET_STAMIN    0
 #define WNI_CFG_VHT_BASIC_MCS_SET_STAMAX    65535
 #define WNI_CFG_VHT_BASIC_MCS_SET_STADEF    65534
@@ -1189,33 +998,14 @@ enum {
 #define WNI_CFG_SHORT_GI_40MHZ_ENABLE    1
 #define WNI_CFG_SHORT_GI_40MHZ_DISABLE    0
 
-#define WNI_CFG_RIFS_ENABLED_STAMIN    0
-#define WNI_CFG_RIFS_ENABLED_STAMAX    1
-#define WNI_CFG_RIFS_ENABLED_STADEF    1
-
-#define WNI_CFG_RIFS_ENABLED_ENABLE    1
-#define WNI_CFG_RIFS_ENABLED_DISABLE    0
-
 #define WNI_CFG_MAX_PS_POLL_STAMIN    0
 #define WNI_CFG_MAX_PS_POLL_STAMAX    255
 #define WNI_CFG_MAX_PS_POLL_STADEF    0
 
-#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE_STAMIN    1
-#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE_STAMAX    20
-#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE_STADEF    20
-
 #define WNI_CFG_RSSI_FILTER_PERIOD_STAMIN    0
 #define WNI_CFG_RSSI_FILTER_PERIOD_STAMAX    255
 #define WNI_CFG_RSSI_FILTER_PERIOD_STADEF    5
 
-#define WNI_CFG_MIN_RSSI_THRESHOLD_STAMIN    0
-#define WNI_CFG_MIN_RSSI_THRESHOLD_STAMAX    10
-#define WNI_CFG_MIN_RSSI_THRESHOLD_STADEF    10
-
-#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE_STAMIN    0
-#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE_STAMAX    1
-#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE_STADEF    0
-
 #define WNI_CFG_SCAN_IN_POWERSAVE_STAMIN    0
 #define WNI_CFG_SCAN_IN_POWERSAVE_STAMAX    1
 #define WNI_CFG_SCAN_IN_POWERSAVE_STADEF    1
@@ -1252,30 +1042,10 @@ enum {
 #define WNI_CFG_MAX_MEDIUM_TIME_STAMAX    65535
 #define WNI_CFG_MAX_MEDIUM_TIME_STADEF    2048
 
-#define WNI_CFG_MAX_MPDUS_IN_AMPDU_STAMIN    0
-#define WNI_CFG_MAX_MPDUS_IN_AMPDU_STAMAX    65535
-#define WNI_CFG_MAX_MPDUS_IN_AMPDU_STADEF    64
-
 #define WNI_CFG_IBSS_AUTO_BSSID_STAMIN    0
 #define WNI_CFG_IBSS_AUTO_BSSID_STAMAX    1
 #define WNI_CFG_IBSS_AUTO_BSSID_STADEF    1
 
-#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG_STAMIN    0
-#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG_STAMAX    1
-#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG_STADEF    0
-
-#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG_STAMIN    0
-#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG_STAMAX    1
-#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG_STADEF    0
-
-#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG_STAMIN    0
-#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG_STAMAX    1
-#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG_STADEF    0
-
-#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG_STAMIN    0
-#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG_STAMAX    1
-#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG_STADEF    0
-
 #define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG_STAMIN    0
 #define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG_STAMAX    1
 #define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG_STADEF    0
@@ -1291,18 +1061,10 @@ enum {
 #define WNI_CFG_WPS_STATE_STAMAX    255
 #define WNI_CFG_WPS_STATE_STADEF    1
 
-#define WNI_CFG_WPS_PROBE_REQ_FLAG_STAMIN    0
-#define WNI_CFG_WPS_PROBE_REQ_FLAG_STAMAX    1
-#define WNI_CFG_WPS_PROBE_REQ_FLAG_STADEF    0
-
 #define WNI_CFG_WPS_VERSION_STAMIN    0
 #define WNI_CFG_WPS_VERSION_STAMAX    255
 #define WNI_CFG_WPS_VERSION_STADEF    16
 
-#define WNI_CFG_WPS_REQUEST_TYPE_STAMIN    0
-#define WNI_CFG_WPS_REQUEST_TYPE_STAMAX    255
-#define WNI_CFG_WPS_REQUEST_TYPE_STADEF    0
-
 #define WNI_CFG_WPS_CFG_METHOD_STAMIN    0
 #define WNI_CFG_WPS_CFG_METHOD_STAMAX    4294967295
 #define WNI_CFG_WPS_CFG_METHOD_STADEF    8
@@ -1319,22 +1081,10 @@ enum {
 #define WNI_CFG_WPS_DEVICE_SUB_CATEGORY_STAMAX    65535
 #define WNI_CFG_WPS_DEVICE_SUB_CATEGORY_STADEF    1
 
-#define WNI_CFG_WPS_ASSOCIATION_STATE_STAMIN    0
-#define WNI_CFG_WPS_ASSOCIATION_STATE_STAMAX    65535
-#define WNI_CFG_WPS_ASSOCIATION_STATE_STADEF    0
-
-#define WNI_CFG_WPS_CONFIGURATION_ERROR_STAMIN    0
-#define WNI_CFG_WPS_CONFIGURATION_ERROR_STAMAX    65535
-#define WNI_CFG_WPS_CONFIGURATION_ERROR_STADEF    0
-
 #define WNI_CFG_WPS_DEVICE_PASSWORD_ID_STAMIN    0
 #define WNI_CFG_WPS_DEVICE_PASSWORD_ID_STAMAX    4294967295
 #define WNI_CFG_WPS_DEVICE_PASSWORD_ID_STADEF    0
 
-#define WNI_CFG_WPS_ASSOC_METHOD_STAMIN    0
-#define WNI_CFG_WPS_ASSOC_METHOD_STAMAX    65535
-#define WNI_CFG_WPS_ASSOC_METHOD_STADEF    0
-
 #define WNI_CFG_LOW_GAIN_OVERRIDE_STAMIN    0
 #define WNI_CFG_LOW_GAIN_OVERRIDE_STAMAX    1
 #define WNI_CFG_LOW_GAIN_OVERRIDE_STADEF    0
@@ -1343,30 +1093,6 @@ enum {
 #define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE_STAMAX    128
 #define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE_STADEF    128
 
-#define WNI_CFG_RPE_POLLING_THRESHOLD_STAMIN    0
-#define WNI_CFG_RPE_POLLING_THRESHOLD_STAMAX    65535
-#define WNI_CFG_RPE_POLLING_THRESHOLD_STADEF    10
-
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG_STAMIN    0
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG_STAMAX    65535
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG_STADEF    30
-
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG_STAMIN    0
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG_STAMAX    65535
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG_STADEF    30
-
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG_STAMIN    0
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG_STAMAX    65535
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG_STADEF    30
-
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG_STAMIN    0
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG_STAMAX    65535
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG_STADEF    30
-
-#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS_STAMIN    0
-#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS_STAMAX    2
-#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS_STADEF    1
-
 #define WNI_CFG_SINGLE_TID_RC_STAMIN    0
 #define WNI_CFG_SINGLE_TID_RC_STAMAX    1
 #define WNI_CFG_SINGLE_TID_RC_STADEF    1
@@ -1379,10 +1105,6 @@ enum {
 #define WNI_CFG_MCAST_BCAST_FILTER_SETTING_STAMAX    3
 #define WNI_CFG_MCAST_BCAST_FILTER_SETTING_STADEF    0
 
-#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK_STAMIN    0
-#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK_STAMAX    255
-#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK_STADEF    0
-
 #define WNI_CFG_DYNAMIC_PS_POLL_VALUE_STAMIN    0
 #define WNI_CFG_DYNAMIC_PS_POLL_VALUE_STAMAX    255
 #define WNI_CFG_DYNAMIC_PS_POLL_VALUE_STADEF    0
@@ -1411,10 +1133,6 @@ enum {
 #define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS_STAMAX    255
 #define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS_STADEF    15
 
-#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS_STAMIN    0
-#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS_STAMAX    255
-#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS_STADEF    7
-
 #define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD_STAMIN    0
 #define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD_STAMAX    1000
 #define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD_STADEF    0
@@ -1423,18 +1141,6 @@ enum {
 #define WNI_CFG_ASSOC_STA_LIMIT_STAMAX    32
 #define WNI_CFG_ASSOC_STA_LIMIT_STADEF    10
 
-#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL_STAMIN    1
-#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL_STAMAX    252
-#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL_STADEF    1
-
-#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL_STAMIN    1
-#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL_STAMAX    252
-#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL_STADEF    11
-
-#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND_STAMIN    0
-#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND_STAMAX    5
-#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND_STADEF    0
-
 #define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STAMIN    0
 #define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STAMAX    65535
 #define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STADEF    5
@@ -1459,10 +1165,6 @@ enum {
 #define WNI_CFG_ENABLE_MC_ADDR_LIST_STAMAX    1
 #define WNI_CFG_ENABLE_MC_ADDR_LIST_STADEF    0
 
-#define WNI_CFG_ENABLE_UC_FILTER_STAMIN    0
-#define WNI_CFG_ENABLE_UC_FILTER_STAMAX    1
-#define WNI_CFG_ENABLE_UC_FILTER_STADEF    0
-
 #define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STAMIN    0
 #define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STAMAX    1
 #define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STADEF    0
@@ -1583,9 +1285,6 @@ enum {
 #define WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD_STAMAX    100
 #define WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD_STADEF    25
 
-
-#define CFG_PARAM_MAX_NUM        293
-
 #define CFG_STA_MAGIC_DWORD    0xbeefbeef
 
 #endif
diff --git a/core/mac/src/cfg/cfg_proc_msg.c b/core/mac/src/cfg/cfg_proc_msg.c
index 0105a09a52c8..6fae32353106 100644
--- a/core/mac/src/cfg/cfg_proc_msg.c
+++ b/core/mac/src/cfg/cfg_proc_msg.c
@@ -39,9 +39,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_RELOAD |
 	CFG_CTL_NTF_HAL,
 	0, 255, 1},
-	{WNI_CFG_CF_POLLABLE,
-	CFG_CTL_RE | CFG_CTL_INT | CFG_CTL_RESTART,
-	0, 255, 1},
 	{WNI_CFG_CFP_PERIOD,
 	CFG_CTL_VALID  | CFG_CTL_RE | CFG_CTL_INT,
 	WNI_CFG_CFP_PERIOD_STAMIN,
@@ -166,12 +163,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT_STAMIN,
 	WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT_STAMAX,
 	WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT_STADEF},
-	{WNI_CFG_RA_PERIODICITY_TIMEOUT_IN_PS,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_RA_PERIODICITY_TIMEOUT_IN_PS_STAMIN,
-	WNI_CFG_RA_PERIODICITY_TIMEOUT_IN_PS_STAMAX,
-	WNI_CFG_RA_PERIODICITY_TIMEOUT_IN_PS_STADEF},
 	{WNI_CFG_PS_ENABLE_BCN_FILTER,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_HAL,
@@ -243,58 +234,17 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_CURRENT_CHANNEL_STAMIN,
 	WNI_CFG_CURRENT_CHANNEL_STAMAX,
 	WNI_CFG_CURRENT_CHANNEL_STADEF},
-	{WNI_CFG_DEFAULT_RATE_INDEX_5GHZ,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_DEFAULT_RATE_INDEX_5GHZ_STAMIN,
-	WNI_CFG_DEFAULT_RATE_INDEX_5GHZ_STAMAX,
-	WNI_CFG_DEFAULT_RATE_INDEX_5GHZ_STADEF},
 	{WNI_CFG_DEFAULT_RATE_INDEX_24GHZ,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_DEFAULT_RATE_INDEX_24GHZ_STAMIN,
 	WNI_CFG_DEFAULT_RATE_INDEX_24GHZ_STAMAX,
 	WNI_CFG_DEFAULT_RATE_INDEX_24GHZ_STADEF},
-	{WNI_CFG_RATE_ADAPTATION_TYPE,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_SCH,
-	WNI_CFG_RATE_ADAPTATION_TYPE_STAMIN,
-	WNI_CFG_RATE_ADAPTATION_TYPE_STAMAX,
-	WNI_CFG_RATE_ADAPTATION_TYPE_STADEF},
 	{WNI_CFG_FIXED_RATE,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_HAL,
 	WNI_CFG_FIXED_RATE_STAMIN,
 	WNI_CFG_FIXED_RATE_STAMAX,
 	WNI_CFG_FIXED_RATE_STADEF},
-	{WNI_CFG_FIXED_RATE_MULTICAST_24GHZ,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_FIXED_RATE_MULTICAST_24GHZ_STAMIN,
-	WNI_CFG_FIXED_RATE_MULTICAST_24GHZ_STAMAX,
-	WNI_CFG_FIXED_RATE_MULTICAST_24GHZ_STADEF},
-	{WNI_CFG_FIXED_RATE_MULTICAST_5GHZ,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_FIXED_RATE_MULTICAST_5GHZ_STAMIN,
-	WNI_CFG_FIXED_RATE_MULTICAST_5GHZ_STAMAX,
-	WNI_CFG_FIXED_RATE_MULTICAST_5GHZ_STADEF},
-	{WNI_CFG_RETRYRATE_POLICY,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_RETRYRATE_POLICY_STAMIN,
-	WNI_CFG_RETRYRATE_POLICY_STAMAX,
-	WNI_CFG_RETRYRATE_POLICY_STADEF},
-	{WNI_CFG_RETRYRATE_SECONDARY,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_RETRYRATE_SECONDARY_STAMIN,
-	WNI_CFG_RETRYRATE_SECONDARY_STAMAX,
-	WNI_CFG_RETRYRATE_SECONDARY_STADEF},
-	{WNI_CFG_RETRYRATE_TERTIARY,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_RETRYRATE_TERTIARY_STAMIN,
-	WNI_CFG_RETRYRATE_TERTIARY_STAMAX,
-	WNI_CFG_RETRYRATE_TERTIARY_STADEF},
 	{WNI_CFG_APSD_ENABLED,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_APSD_ENABLED_STAMIN,
@@ -316,9 +266,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_AUTHENTICATION_TYPE_STAMIN,
 	WNI_CFG_AUTHENTICATION_TYPE_STAMAX,
 	WNI_CFG_AUTHENTICATION_TYPE_STADEF},
-	{WNI_CFG_CF_POLL_REQUEST,
-	CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT | CFG_CTL_RESTART,
-	0, 255, 1},
 	{WNI_CFG_PRIVACY_ENABLED,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_RESTART,
@@ -331,11 +278,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_SHORT_PREAMBLE_STAMIN,
 	WNI_CFG_SHORT_PREAMBLE_STAMAX,
 	WNI_CFG_SHORT_PREAMBLE_STADEF},
-	{WNI_CFG_SHORT_SLOT_TIME,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_SHORT_SLOT_TIME_STAMIN,
-	WNI_CFG_SHORT_SLOT_TIME_STAMAX,
-	WNI_CFG_SHORT_SLOT_TIME_STADEF},
 	{WNI_CFG_ACCEPT_SHORT_SLOT_ASSOC_ONLY,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_RESTART,
@@ -366,12 +308,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_MAX_NUM_PRE_AUTH_STAMIN,
 	WNI_CFG_MAX_NUM_PRE_AUTH_STAMAX,
 	WNI_CFG_MAX_NUM_PRE_AUTH_STADEF},
-	{WNI_CFG_PREAUTH_CLNUP_TIMEOUT,
-	CFG_CTL_INT,
-	0, 255, 1},
-	{WNI_CFG_RELEASE_AID_TIMEOUT,
-	CFG_CTL_INT,
-	0, 255, 1},
 	{WNI_CFG_HEART_BEAT_THRESHOLD,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_LIM,
@@ -384,9 +320,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT_STAMIN,
 	WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT_STAMAX,
 	WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT_STADEF},
-	{WNI_CFG_MANUFACTURER_OUI,
-	CFG_CTL_VALID | CFG_CTL_RE,
-	0, 0, 0},
 	{WNI_CFG_MANUFACTURER_NAME,
 	CFG_CTL_VALID | CFG_CTL_RE,
 	0, 0, 0},
@@ -414,24 +347,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	{WNI_CFG_MAX_TX_POWER_5,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE,
 	0, 0, 0},
-	{WNI_CFG_NETWORK_DENSITY,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_NETWORK_DENSITY_STAMIN,
-	WNI_CFG_NETWORK_DENSITY_STAMAX,
-	WNI_CFG_NETWORK_DENSITY_STADEF},
-	{WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM_STAMIN,
-	WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM_STAMAX,
-	WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM_STADEF},
-	{WNI_CFG_CURRENT_TX_ANTENNA,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_CURRENT_TX_ANTENNA_STAMIN,
-	WNI_CFG_CURRENT_TX_ANTENNA_STAMAX,
-	WNI_CFG_CURRENT_TX_ANTENNA_STADEF},
 	{WNI_CFG_CURRENT_RX_ANTENNA,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_HAL,
@@ -448,15 +363,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_NEW_BSS_FOUND_IND_STAMIN,
 	WNI_CFG_NEW_BSS_FOUND_IND_STAMAX,
 	WNI_CFG_NEW_BSS_FOUND_IND_STADEF},
-	{WNI_CFG_PROPRIETARY_RATES_ENABLED,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_RESTART,
-	WNI_CFG_PROPRIETARY_RATES_ENABLED_STAMIN,
-	WNI_CFG_PROPRIETARY_RATES_ENABLED_STAMAX,
-	WNI_CFG_PROPRIETARY_RATES_ENABLED_STADEF},
-	{WNI_CFG_AP_NODE_NAME,
-	CFG_CTL_RE,
-	0, 255, 1},
 	{WNI_CFG_COUNTRY_CODE,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE,
 	0, 0, 0},
@@ -471,12 +377,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_WT_CNF_TIMEOUT_STAMIN,
 	WNI_CFG_WT_CNF_TIMEOUT_STAMAX,
 	WNI_CFG_WT_CNF_TIMEOUT_STADEF},
-	{WNI_CFG_PROXIMITY,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_PROXIMITY_STAMIN,
-	WNI_CFG_PROXIMITY_STAMAX,
-	WNI_CFG_PROXIMITY_STADEF},
 	{WNI_CFG_LOG_LEVEL,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_LOG_LEVEL_STAMIN,
@@ -522,12 +422,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_11G_ONLY_POLICY_STAMIN,
 	WNI_CFG_11G_ONLY_POLICY_STAMAX,
 	WNI_CFG_11G_ONLY_POLICY_STADEF},
-	{WNI_CFG_PACKET_CLASSIFICATION,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_PACKET_CLASSIFICATION_STAMIN,
-	WNI_CFG_PACKET_CLASSIFICATION_STAMAX,
-	WNI_CFG_PACKET_CLASSIFICATION_STADEF},
 	{WNI_CFG_WME_ENABLED,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_RESTART,
@@ -544,14 +438,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_MAX_SP_LENGTH_STAMIN,
 	WNI_CFG_MAX_SP_LENGTH_STAMAX,
 	WNI_CFG_MAX_SP_LENGTH_STADEF},
-	{WNI_CFG_KEEP_ALIVE_STA_LIMIT_THRESHOLD,
-	CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	0, 255, 1},
-	{WNI_CFG_SEND_SINGLE_SSID_ALWAYS,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_SEND_SINGLE_SSID_ALWAYS_STAMIN,
-	WNI_CFG_SEND_SINGLE_SSID_ALWAYS_STAMAX,
-	WNI_CFG_SEND_SINGLE_SSID_ALWAYS_STADEF},
 	{WNI_CFG_WSM_ENABLED,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_WSM_ENABLED_STAMIN,
@@ -611,14 +497,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	{WNI_CFG_EDCA_WME_ACVO,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_RESTART,
 	0, 0, 0},
-	{WNI_CFG_RDET_FLAG,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_RDET_FLAG_STAMIN,
-	WNI_CFG_RDET_FLAG_STAMAX,
-	WNI_CFG_RDET_FLAG_STADEF},
-	{WNI_CFG_RADAR_CHANNEL_LIST,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_RESTART,
-	0, 0, 0},
 	{WNI_CFG_LOCAL_POWER_CONSTRAINT,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_RESTART,
@@ -637,23 +515,12 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_ADMIT_BWFACTOR_STAMIN,
 	WNI_CFG_ADMIT_BWFACTOR_STAMAX,
 	WNI_CFG_ADMIT_BWFACTOR_STADEF},
-	{WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_RESTART,
-	WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE_STAMIN,
-	WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE_STAMAX,
-	WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE_STADEF},
 	{WNI_CFG_CHANNEL_BONDING_MODE,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_RESTART | CFG_CTL_NTF_LIM,
 	WNI_CFG_CHANNEL_BONDING_MODE_STAMIN,
 	WNI_CFG_CHANNEL_BONDING_MODE_STAMAX,
 	WNI_CFG_CHANNEL_BONDING_MODE_STADEF},
-	{WNI_CFG_CB_SECONDARY_CHANNEL_STATE,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_CB_SECONDARY_CHANNEL_STATE_STAMIN,
-	WNI_CFG_CB_SECONDARY_CHANNEL_STATE_STAMAX,
-	WNI_CFG_CB_SECONDARY_CHANNEL_STATE_STADEF},
 	{WNI_CFG_DYNAMIC_THRESHOLD_ZERO,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_HAL,
@@ -672,28 +539,10 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_DYNAMIC_THRESHOLD_TWO_STAMIN,
 	WNI_CFG_DYNAMIC_THRESHOLD_TWO_STAMAX,
 	WNI_CFG_DYNAMIC_THRESHOLD_TWO_STADEF},
-	{WNI_CFG_TRIG_STA_BK_SCAN,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_LIM,
-	WNI_CFG_TRIG_STA_BK_SCAN_STAMIN,
-	WNI_CFG_TRIG_STA_BK_SCAN_STAMAX,
-	WNI_CFG_TRIG_STA_BK_SCAN_STADEF},
-	{WNI_CFG_DYNAMIC_PROFILE_SWITCHING,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_RESTART,
-	WNI_CFG_DYNAMIC_PROFILE_SWITCHING_STAMIN,
-	WNI_CFG_DYNAMIC_PROFILE_SWITCHING_STAMAX,
-	WNI_CFG_DYNAMIC_PROFILE_SWITCHING_STADEF},
 	{WNI_CFG_SCAN_CONTROL_LIST,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_RESTART |
 	CFG_CTL_NTF_LIM,
 	0, 0, 0},
-	{WNI_CFG_MIMO_ENABLED,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_RELOAD,
-	WNI_CFG_MIMO_ENABLED_STAMIN,
-	WNI_CFG_MIMO_ENABLED_STAMAX,
-	WNI_CFG_MIMO_ENABLED_STADEF},
 	{WNI_CFG_BLOCK_ACK_ENABLED,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_RESTART | CFG_CTL_NTF_LIM,
@@ -910,18 +759,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE_STAMIN,
 	WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE_STAMAX,
 	WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE_STADEF},
-	{WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_LIM,
-	WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1_STAMIN,
-	WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1_STAMAX,
-	WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1_STADEF},
-	{WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_LIM,
-	WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2_STAMIN,
-	WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2_STAMAX,
-	WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2_STADEF},
 	{WNI_CFG_VHT_BASIC_MCS_SET,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_LIM,
@@ -988,42 +825,18 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_SHORT_GI_40MHZ_STAMIN,
 	WNI_CFG_SHORT_GI_40MHZ_STAMAX,
 	WNI_CFG_SHORT_GI_40MHZ_STADEF},
-	{WNI_CFG_RIFS_ENABLED,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_RESTART,
-	WNI_CFG_RIFS_ENABLED_STAMIN,
-	WNI_CFG_RIFS_ENABLED_STAMAX,
-	WNI_CFG_RIFS_ENABLED_STADEF},
 	{WNI_CFG_MAX_PS_POLL,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_LIM,
 	WNI_CFG_MAX_PS_POLL_STAMIN,
 	WNI_CFG_MAX_PS_POLL_STAMAX,
 	WNI_CFG_MAX_PS_POLL_STADEF},
-	{WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_LIM,
-	WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE_STAMIN,
-	WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE_STAMAX,
-	WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE_STADEF},
 	{WNI_CFG_RSSI_FILTER_PERIOD,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_LIM,
 	WNI_CFG_RSSI_FILTER_PERIOD_STAMIN,
 	WNI_CFG_RSSI_FILTER_PERIOD_STAMAX,
 	WNI_CFG_RSSI_FILTER_PERIOD_STADEF},
-	{WNI_CFG_MIN_RSSI_THRESHOLD,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_LIM,
-	WNI_CFG_MIN_RSSI_THRESHOLD_STAMIN,
-	WNI_CFG_MIN_RSSI_THRESHOLD_STAMAX,
-	WNI_CFG_MIN_RSSI_THRESHOLD_STADEF},
-	{WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_LIM,
-	WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE_STAMIN,
-	WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE_STAMAX,
-	WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE_STADEF},
 	{WNI_CFG_SCAN_IN_POWERSAVE,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_LIM,
@@ -1065,73 +878,23 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD_STAMIN,
 	WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD_STAMAX,
 	WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD_STADEF},
-	{WNI_CFG_BG_SCAN_CHANNEL_LIST,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_NTF_LIM,
-	0, 0, 0},
 	{WNI_CFG_MAX_MEDIUM_TIME,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_HAL,
 	WNI_CFG_MAX_MEDIUM_TIME_STAMIN,
 	WNI_CFG_MAX_MEDIUM_TIME_STAMAX,
 	WNI_CFG_MAX_MEDIUM_TIME_STADEF},
-	{WNI_CFG_MAX_MPDUS_IN_AMPDU,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_MAX_MPDUS_IN_AMPDU_STAMIN,
-	WNI_CFG_MAX_MPDUS_IN_AMPDU_STAMAX,
-	WNI_CFG_MAX_MPDUS_IN_AMPDU_STADEF},
 	{WNI_CFG_IBSS_AUTO_BSSID,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_IBSS_AUTO_BSSID_STAMIN,
 	WNI_CFG_IBSS_AUTO_BSSID_STAMAX,
 	WNI_CFG_IBSS_AUTO_BSSID_STADEF},
-	{WNI_CFG_PROBE_REQ_ADDNIE_FLAG,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_PROBE_REQ_ADDNIE_FLAG_STAMIN,
-	WNI_CFG_PROBE_REQ_ADDNIE_FLAG_STAMAX,
-	WNI_CFG_PROBE_REQ_ADDNIE_FLAG_STADEF},
-	{WNI_CFG_PROBE_REQ_ADDNIE_DATA,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE,
-	0, 0, 0},
-	{WNI_CFG_PROBE_RSP_ADDNIE_FLAG,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_PROBE_RSP_ADDNIE_FLAG_STAMIN,
-	WNI_CFG_PROBE_RSP_ADDNIE_FLAG_STAMAX,
-	WNI_CFG_PROBE_RSP_ADDNIE_FLAG_STADEF},
-	{WNI_CFG_PROBE_RSP_ADDNIE_DATA1,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE,
-	0, 0, 0},
-	{WNI_CFG_PROBE_RSP_ADDNIE_DATA2,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE,
-	0, 0, 0},
-	{WNI_CFG_PROBE_RSP_ADDNIE_DATA3,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE,
-	0, 0, 0},
-	{WNI_CFG_ASSOC_RSP_ADDNIE_FLAG,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_ASSOC_RSP_ADDNIE_FLAG_STAMIN,
-	WNI_CFG_ASSOC_RSP_ADDNIE_FLAG_STAMAX,
-	WNI_CFG_ASSOC_RSP_ADDNIE_FLAG_STADEF},
-	{WNI_CFG_ASSOC_RSP_ADDNIE_DATA,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE,
-	0, 0, 0},
-	{WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG_STAMIN,
-	WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG_STAMAX,
-	WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG_STADEF},
-	{WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE,
-	0, 0, 0},
 	{WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_LIM,
 	WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG_STAMIN,
 	WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG_STAMAX,
 	WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG_STADEF},
-	{WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_NTF_LIM,
-	0, 0, 0},
 	{WNI_CFG_WPS_ENABLE,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_LIM,
@@ -1144,24 +907,12 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_WPS_STATE_STAMIN,
 	WNI_CFG_WPS_STATE_STAMAX,
 	WNI_CFG_WPS_STATE_STADEF},
-	{WNI_CFG_WPS_PROBE_REQ_FLAG,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_LIM,
-	WNI_CFG_WPS_PROBE_REQ_FLAG_STAMIN,
-	WNI_CFG_WPS_PROBE_REQ_FLAG_STAMAX,
-	WNI_CFG_WPS_PROBE_REQ_FLAG_STADEF},
 	{WNI_CFG_WPS_VERSION,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_LIM,
 	WNI_CFG_WPS_VERSION_STAMIN,
 	WNI_CFG_WPS_VERSION_STAMAX,
 	WNI_CFG_WPS_VERSION_STADEF},
-	{WNI_CFG_WPS_REQUEST_TYPE,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_LIM,
-	WNI_CFG_WPS_REQUEST_TYPE_STAMIN,
-	WNI_CFG_WPS_REQUEST_TYPE_STAMAX,
-	WNI_CFG_WPS_REQUEST_TYPE_STADEF},
 	{WNI_CFG_WPS_CFG_METHOD,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_LIM,
@@ -1189,30 +940,12 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_WPS_DEVICE_SUB_CATEGORY_STAMIN,
 	WNI_CFG_WPS_DEVICE_SUB_CATEGORY_STAMAX,
 	WNI_CFG_WPS_DEVICE_SUB_CATEGORY_STADEF},
-	{WNI_CFG_WPS_ASSOCIATION_STATE,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_LIM,
-	WNI_CFG_WPS_ASSOCIATION_STATE_STAMIN,
-	WNI_CFG_WPS_ASSOCIATION_STATE_STAMAX,
-	WNI_CFG_WPS_ASSOCIATION_STATE_STADEF},
-	{WNI_CFG_WPS_CONFIGURATION_ERROR,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_LIM,
-	WNI_CFG_WPS_CONFIGURATION_ERROR_STAMIN,
-	WNI_CFG_WPS_CONFIGURATION_ERROR_STAMAX,
-	WNI_CFG_WPS_CONFIGURATION_ERROR_STADEF},
 	{WNI_CFG_WPS_DEVICE_PASSWORD_ID,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_LIM,
 	WNI_CFG_WPS_DEVICE_PASSWORD_ID_STAMIN,
 	4294967295u,
 	WNI_CFG_WPS_DEVICE_PASSWORD_ID_STADEF},
-	{WNI_CFG_WPS_ASSOC_METHOD,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_LIM,
-	WNI_CFG_WPS_ASSOC_METHOD_STAMIN,
-	WNI_CFG_WPS_ASSOC_METHOD_STAMAX,
-	WNI_CFG_WPS_ASSOC_METHOD_STADEF},
 	{WNI_CFG_LOW_GAIN_OVERRIDE,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_HAL,
@@ -1225,42 +958,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE_STAMIN,
 	WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE_STAMAX,
 	WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE_STADEF},
-	{WNI_CFG_RPE_POLLING_THRESHOLD,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_RPE_POLLING_THRESHOLD_STAMIN,
-	WNI_CFG_RPE_POLLING_THRESHOLD_STAMAX,
-	WNI_CFG_RPE_POLLING_THRESHOLD_STADEF},
-	{WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG_STAMIN,
-	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG_STAMAX,
-	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG_STADEF},
-	{WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG_STAMIN,
-	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG_STAMAX,
-	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG_STADEF},
-	{WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG_STAMIN,
-	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG_STAMAX,
-	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG_STADEF},
-	{WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG_STAMIN,
-	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG_STAMAX,
-	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG_STADEF},
-	{WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS_STAMIN,
-	WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS_STAMAX,
-	WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS_STADEF},
 	{WNI_CFG_SINGLE_TID_RC,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_SINGLE_TID_RC_STAMIN,
@@ -1277,12 +974,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_MCAST_BCAST_FILTER_SETTING_STAMIN,
 	WNI_CFG_MCAST_BCAST_FILTER_SETTING_STAMAX,
 	WNI_CFG_MCAST_BCAST_FILTER_SETTING_STADEF},
-	{WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK_STAMIN,
-	WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK_STAMAX,
-	WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK_STADEF},
 	{WNI_CFG_DYNAMIC_PS_POLL_VALUE,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_HAL,
@@ -1325,12 +1016,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS_STAMIN,
 	WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS_STAMAX,
 	WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS_STADEF},
-	{WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS_STAMIN,
-	WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS_STAMAX,
-	WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS_STADEF},
 	{WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_HAL,
@@ -1343,21 +1028,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_ASSOC_STA_LIMIT_STAMIN,
 	WNI_CFG_ASSOC_STA_LIMIT_STAMAX,
 	WNI_CFG_ASSOC_STA_LIMIT_STADEF},
-	{WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL_STAMIN,
-	WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL_STAMAX,
-	WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL_STADEF},
-	{WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL_STAMIN,
-	WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL_STAMAX,
-	WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL_STADEF},
-	{WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND_STAMIN,
-	WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND_STAMAX,
-	WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND_STADEF},
 	{WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STAMIN,
@@ -1391,12 +1061,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_ENABLE_MC_ADDR_LIST_STAMIN,
 	WNI_CFG_ENABLE_MC_ADDR_LIST_STAMAX,
 	WNI_CFG_ENABLE_MC_ADDR_LIST_STADEF},
-	{WNI_CFG_ENABLE_UC_FILTER,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_ENABLE_UC_FILTER_STAMIN,
-	WNI_CFG_ENABLE_UC_FILTER_STAMAX,
-	WNI_CFG_ENABLE_UC_FILTER_STADEF},
 	{WNI_CFG_ENABLE_LPWR_IMG_TRANSITION,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STAMIN,
@@ -1624,10 +1288,6 @@ cfgstatic_string cfg_static_string[CFG_MAX_STATIC_STRING] = {
 	 132, 136, 140, 149, 151, 153, 155, 157, 159, 161, 50, 54, 58, 62, 240,
 	 242, 244, 246, 248, 250, 252} },
 
-	{WNI_CFG_MANUFACTURER_OUI,
-	WNI_CFG_MANUFACTURER_OUI_LEN,
-	3,
-	{0x0, 0xa, 0xf5} },
 	{WNI_CFG_MANUFACTURER_NAME,
 	WNI_CFG_MANUFACTURER_NAME_LEN,
 	8,
@@ -1656,10 +1316,6 @@ cfgstatic_string cfg_static_string[CFG_MAX_STATIC_STRING] = {
 	WNI_CFG_MAX_TX_POWER_5_LEN,
 	3,
 	{0x24, 0x7e, 0x14} },
-	{WNI_CFG_AP_NODE_NAME,
-	WNI_CFG_AP_NODE_NAME_LEN,
-	0,
-	{0} },
 	{WNI_CFG_COUNTRY_CODE,
 	WNI_CFG_COUNTRY_CODE_LEN,
 	0,
@@ -1741,11 +1397,6 @@ cfgstatic_string cfg_static_string[CFG_MAX_STATIC_STRING] = {
 	17,
 	{0x0, 0x2, 0x0, 0x3, 0x0, 0x7, 0x2f, 0x0, 0x3, 0x0, 0x7, 0x66, 0x0, 0x3,
 	 0x0, 0x7, 0x2f} },
-	{WNI_CFG_RADAR_CHANNEL_LIST,
-	WNI_CFG_RADAR_CHANNEL_LIST_LEN,
-	15,
-	{0x34, 0x38, 0x3c, 0x40, 0x64, 0x68, 0x6c, 0x70, 0x74, 0x78, 0x7c, 0x80,
-	 0x84, 0x88, 0x8c} },
 	{WNI_CFG_SCAN_CONTROL_LIST,
 	WNI_CFG_SCAN_CONTROL_LIST_LEN,
 	114,
@@ -1773,42 +1424,6 @@ cfgstatic_string cfg_static_string[CFG_MAX_STATIC_STRING] = {
 	16,
 	{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
 	 0x0, 0x0} },
-	{WNI_CFG_BG_SCAN_CHANNEL_LIST,
-	WNI_CFG_BG_SCAN_CHANNEL_LIST_LEN,
-	55,
-	{0x24, 0x28, 0x2c, 0x30, 0x34, 0x38, 0x3c, 0x40, 0x1, 0x6, 0xb, 0x22,
-	 0x26, 0x2a, 0x2e, 0x2,  0x3, 0x4, 0x5, 0x7, 0x8, 0x9, 0xa, 0xc, 0xd,
-	 0xe, 0x64, 0x68, 0x6c, 0x70, 0x74, 0x78, 0x7c, 0x80, 0x84, 0x88, 0x8c,
-	 0x95, 0x97, 0x99, 0x9b, 0x9d, 0x9f, 0xa1, 0x32, 0x36, 0x3a, 0x3e, 0xf0,
-	 0xf2, 0xf4, 0xf6, 0xf8, 0xfa, 0xfc} },
-	{WNI_CFG_PROBE_REQ_ADDNIE_DATA,
-	WNI_CFG_PROBE_REQ_ADDNIE_DATA_LEN,
-	0,
-	{0} },
-	{WNI_CFG_PROBE_RSP_ADDNIE_DATA1,
-	WNI_CFG_PROBE_RSP_ADDNIE_DATA1_LEN,
-	0,
-	{0} },
-	{WNI_CFG_PROBE_RSP_ADDNIE_DATA2,
-	WNI_CFG_PROBE_RSP_ADDNIE_DATA2_LEN,
-	0,
-	{0} },
-	{WNI_CFG_PROBE_RSP_ADDNIE_DATA3,
-	WNI_CFG_PROBE_RSP_ADDNIE_DATA3_LEN,
-	0,
-	{0} },
-	{WNI_CFG_ASSOC_RSP_ADDNIE_DATA,
-	WNI_CFG_ASSOC_RSP_ADDNIE_DATA_LEN,
-	0,
-	{0} },
-	{WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA,
-	WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA_LEN,
-	0,
-	{0} },
-	{WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA,
-	WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA_LEN,
-	0,
-	{0} },
 	{WNI_CFG_WPS_UUID,
 	WNI_CFG_WPS_UUID_LEN,
 	6,