qcacld: Remove obsolete calibration configuration support

qcacld inherited from prima support for the following cfg.ini items:
gCalibration & gCalibrationPeriod
These calibration parameters are not used by qcacld, so remove support
for them from cfg.txt and cfg.dat

Change-Id: I9d9b8e4d6c00de1bd9ae339a2e50ee32628121e5
CRs-Fixed: 736054

5 files changed, 410 insertions, 501 deletions

diff --git a/CORE/MAC/inc/wniCfgAp.h b/CORE/MAC/inc/wniCfgAp.h
index b5b2ce4121ce..d0b19fa522f2 100644
--- a/CORE/MAC/inc/wniCfgAp.h
+++ b/CORE/MAC/inc/wniCfgAp.h
@@ -143,212 +143,209 @@
 #define WNI_CFG_FORCE_POLICY_PROTECTION    96
 #define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED    97
 #define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED    98
-#define WNI_CFG_CAL_PERIOD    99
-#define WNI_CFG_STATS_PERIOD    100
-#define WNI_CFG_CAL_CONTROL    101
-#define WNI_CFG_11G_ONLY_POLICY    102
-#define WNI_CFG_PACKET_CLASSIFICATION    103
-#define WNI_CFG_WME_ENABLED    104
-#define WNI_CFG_ADDTS_RSP_TIMEOUT    105
-#define WNI_CFG_MAX_SP_LENGTH    106
-#define WNI_CFG_KEEP_ALIVE_STA_LIMIT_THRESHOLD    107
-#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS    108
-#define WNI_CFG_WSM_ENABLED    109
-#define WNI_CFG_EDCA_PROFILE    110
-#define WNI_CFG_EDCA_ANI_ACBK_LOCAL    111
-#define WNI_CFG_EDCA_ANI_ACBE_LOCAL    112
-#define WNI_CFG_EDCA_ANI_ACVI_LOCAL    113
-#define WNI_CFG_EDCA_ANI_ACVO_LOCAL    114
-#define WNI_CFG_EDCA_ANI_ACBK    115
-#define WNI_CFG_EDCA_ANI_ACBE    116
-#define WNI_CFG_EDCA_ANI_ACVI    117
-#define WNI_CFG_EDCA_ANI_ACVO    118
-#define WNI_CFG_EDCA_WME_ACBK_LOCAL    119
-#define WNI_CFG_EDCA_WME_ACBE_LOCAL    120
-#define WNI_CFG_EDCA_WME_ACVI_LOCAL    121
-#define WNI_CFG_EDCA_WME_ACVO_LOCAL    122
-#define WNI_CFG_EDCA_WME_ACBK    123
-#define WNI_CFG_EDCA_WME_ACBE    124
-#define WNI_CFG_EDCA_WME_ACVI    125
-#define WNI_CFG_EDCA_WME_ACVO    126
-#define WNI_CFG_RDET_FLAG    127
-#define WNI_CFG_RADAR_CHANNEL_LIST    128
-#define WNI_CFG_LOCAL_POWER_CONSTRAINT    129
-#define WNI_CFG_ADMIT_POLICY    130
-#define WNI_CFG_ADMIT_BWFACTOR    131
-#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE    132
-#define WNI_CFG_CHANNEL_BONDING_MODE    133
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE    134
-#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO    135
-#define WNI_CFG_DYNAMIC_THRESHOLD_ONE    136
-#define WNI_CFG_DYNAMIC_THRESHOLD_TWO    137
-#define WNI_CFG_TRIG_STA_BK_SCAN    138
-#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING    139
-#define WNI_CFG_SCAN_CONTROL_LIST    140
-#define WNI_CFG_MIMO_ENABLED    141
-#define WNI_CFG_BLOCK_ACK_ENABLED    142
-#define WNI_CFG_BA_ACTIVITY_CHECK_TIMEOUT    143
-#define WNI_CFG_HT_RX_STBC    144
-#define WNI_CFG_HT_CAP_INFO    145
-#define WNI_CFG_HT_AMPDU_PARAMS    146
-#define WNI_CFG_SUPPORTED_MCS_SET    147
-#define WNI_CFG_EXT_HT_CAP_INFO    148
-#define WNI_CFG_TX_BF_CAP    149
-#define WNI_CFG_AS_CAP    150
-#define WNI_CFG_HT_INFO_FIELD1    151
-#define WNI_CFG_HT_INFO_FIELD2    152
-#define WNI_CFG_HT_INFO_FIELD3    153
-#define WNI_CFG_BASIC_MCS_SET    154
-#define WNI_CFG_CURRENT_MCS_SET    155
-#define WNI_CFG_GREENFIELD_CAPABILITY    156
-#define WNI_CFG_VHT_MAX_MPDU_LENGTH    157
-#define WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET    158
-#define WNI_CFG_VHT_LDPC_CODING_CAP    159
-#define WNI_CFG_VHT_SHORT_GI_80MHZ    160
-#define WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ    161
-#define WNI_CFG_VHT_TXSTBC    162
-#define WNI_CFG_VHT_RXSTBC    163
-#define WNI_CFG_VHT_SU_BEAMFORMER_CAP    164
-#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP    165
-#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED    166
-#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS    167
-#define WNI_CFG_VHT_MU_BEAMFORMER_CAP    168
-#define WNI_CFG_VHT_MU_BEAMFORMEE_CAP    169
-#define WNI_CFG_VHT_TXOP_PS    170
-#define WNI_CFG_VHT_HTC_VHTC_CAP    171
-#define WNI_CFG_VHT_AMPDU_LEN_EXPONENT    172
-#define WNI_CFG_VHT_LINK_ADAPTATION_CAP    173
-#define WNI_CFG_VHT_RX_ANT_PATTERN    174
-#define WNI_CFG_VHT_TX_ANT_PATTERN    175
-#define WNI_CFG_VHT_RX_MCS_MAP    176
-#define WNI_CFG_VHT_TX_MCS_MAP    177
-#define WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE    178
-#define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE    179
-#define WNI_CFG_VHT_CHANNEL_WIDTH    180
-#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1    181
-#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2    182
-#define WNI_CFG_VHT_BASIC_MCS_SET    183
-#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT    184
-#define WNI_CFG_VHT_SS_UNDER_UTIL    185
-#define WNI_CFG_VHT_40MHZ_UTILIZATION    186
-#define WNI_CFG_VHT_80MHZ_UTILIZATION    187
-#define WNI_CFG_VHT_160MHZ_UTILIZATION    188
-#define WNI_CFG_MAX_AMSDU_LENGTH    189
-#define WNI_CFG_MPDU_DENSITY    190
-#define WNI_CFG_NUM_BUFF_ADVERT    191
-#define WNI_CFG_MAX_RX_AMPDU_FACTOR    192
-#define WNI_CFG_SHORT_GI_20MHZ    193
-#define WNI_CFG_SHORT_GI_40MHZ    194
-#define WNI_CFG_RIFS_ENABLED    195
-#define WNI_CFG_MAX_PS_POLL    196
-#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE    197
-#define WNI_CFG_RSSI_FILTER_PERIOD    198
-#define WNI_CFG_MIN_RSSI_THRESHOLD    199
-#define WNI_CFG_NTH_BEACON_FILTER    200
-#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE    201
-#define WNI_CFG_SCAN_IN_POWERSAVE    202
-#define WNI_CFG_IGNORE_DTIM    203
-#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE    204
-#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE    205
-#define WNI_CFG_WOWLAN_DEAUTH_ENABLE    206
-#define WNI_CFG_WOWLAN_DISASSOC_ENABLE    207
-#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON    208
-#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD    209
-#define WNI_CFG_BA_TIMEOUT    210
-#define WNI_CFG_BA_THRESHOLD_HIGH    211
-#define WNI_CFG_MAX_BA_BUFFERS    212
-#define WNI_CFG_MAX_BA_SESSIONS    213
-#define WNI_CFG_BA_AUTO_SETUP    214
-#define WNI_CFG_ADDBA_REQ_DECLINE    215
-#define WNI_CFG_DEL_ALL_RX_BA_SESSIONS_2_4_G_BTC    216
-#define WNI_CFG_BG_SCAN_CHANNEL_LIST    217
-#define WNI_CFG_MAX_MEDIUM_TIME    218
-#define WNI_CFG_MAX_MPDUS_IN_AMPDU    219
-#define WNI_CFG_IBSS_AUTO_BSSID    220
-#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG    221
-#define WNI_CFG_PROBE_REQ_ADDNIE_DATA    222
-#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG    223
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1    224
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2    225
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3    226
-#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG    227
-#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA    228
-#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG    229
-#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA    230
-#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG    231
-#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA    232
-#define WNI_CFG_WPS_ENABLE    233
-#define WNI_CFG_WPS_STATE    234
-#define WNI_CFG_WPS_PROBE_REQ_FLAG    235
-#define WNI_CFG_WPS_VERSION    236
-#define WNI_CFG_WPS_REQUEST_TYPE    237
-#define WNI_CFG_WPS_CFG_METHOD    238
-#define WNI_CFG_WPS_UUID    239
-#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY    240
-#define WNI_CFG_WPS_PIMARY_DEVICE_OUI    241
-#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY    242
-#define WNI_CFG_WPS_ASSOCIATION_STATE    243
-#define WNI_CFG_WPS_CONFIGURATION_ERROR    244
-#define WNI_CFG_WPS_DEVICE_PASSWORD_ID    245
-#define WNI_CFG_WPS_ASSOC_METHOD    246
-#define WNI_CFG_LOW_GAIN_OVERRIDE    247
-#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE    248
-#define WNI_CFG_RPE_POLLING_THRESHOLD    249
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG    250
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG    251
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG    252
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG    253
-#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS    254
-#define WNI_CFG_SINGLE_TID_RC    255
-#define WNI_CFG_RRM_ENABLED    256
-#define WNI_CFG_RRM_OPERATING_CHAN_MAX    257
-#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX    258
-#define WNI_CFG_TX_PWR_CTRL_ENABLE    259
-#define WNI_CFG_MCAST_BCAST_FILTER_SETTING    260
-#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK    261
-#define WNI_CFG_DYNAMIC_PS_POLL_VALUE    262
-#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT    263
-#define WNI_CFG_TELE_BCN_WAKEUP_EN    264
-#define WNI_CFG_TELE_BCN_TRANS_LI    265
-#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS    266
-#define WNI_CFG_TELE_BCN_MAX_LI    267
-#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS    268
-#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS    269
-#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD    270
-#define WNI_CFG_ASSOC_STA_LIMIT    271
-#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL    272
-#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL    273
-#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND    274
-#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD    275
-#define WNI_CFG_ENABLE_CLOSE_LOOP    276
-#define WNI_CFG_ENABLE_LTE_COEX    277
-#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT    278
-#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT    279
-#define WNI_CFG_ENABLE_MC_ADDR_LIST    280
-#define WNI_CFG_ENABLE_UC_FILTER    281
-#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION    282
-#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED    283
-#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP    284
-#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT    285
-#define WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK    286
-#define WNI_CFG_TDLS_BUF_STA_ENABLED    287
-#define WNI_CFG_TDLS_PUAPSD_INACT_TIME    288
-#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD    289
-#define WNI_CFG_PMF_SA_QUERY_MAX_RETRIES    290
-#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL    291
-#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN    292
-#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR    293
-#define WNI_CFG_ANTENNA_DIVESITY    294
-#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT    295
-#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY    296
-#define WNI_CFG_CURRENT_RSSI    297
-#define WNI_CFG_RTT3_ENABLE    298
-#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL    299
-#define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED    300
-#define WNI_CFG_IBSS_ATIM_WIN_SIZE    301
-#define WNI_CFG_DFS_MASTER_ENABLED    302
-#define WNI_CFG_VHT_ENABLE_TXBF_20MHZ    303
-#define WNI_CFG_TDLS_WMM_MODE_ENABLED    304
+#define WNI_CFG_11G_ONLY_POLICY    99
+#define WNI_CFG_PACKET_CLASSIFICATION    100
+#define WNI_CFG_WME_ENABLED    101
+#define WNI_CFG_ADDTS_RSP_TIMEOUT    102
+#define WNI_CFG_MAX_SP_LENGTH    103
+#define WNI_CFG_KEEP_ALIVE_STA_LIMIT_THRESHOLD    104
+#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS    105
+#define WNI_CFG_WSM_ENABLED    106
+#define WNI_CFG_EDCA_PROFILE    107
+#define WNI_CFG_EDCA_ANI_ACBK_LOCAL    108
+#define WNI_CFG_EDCA_ANI_ACBE_LOCAL    109
+#define WNI_CFG_EDCA_ANI_ACVI_LOCAL    110
+#define WNI_CFG_EDCA_ANI_ACVO_LOCAL    111
+#define WNI_CFG_EDCA_ANI_ACBK    112
+#define WNI_CFG_EDCA_ANI_ACBE    113
+#define WNI_CFG_EDCA_ANI_ACVI    114
+#define WNI_CFG_EDCA_ANI_ACVO    115
+#define WNI_CFG_EDCA_WME_ACBK_LOCAL    116
+#define WNI_CFG_EDCA_WME_ACBE_LOCAL    117
+#define WNI_CFG_EDCA_WME_ACVI_LOCAL    118
+#define WNI_CFG_EDCA_WME_ACVO_LOCAL    119
+#define WNI_CFG_EDCA_WME_ACBK    120
+#define WNI_CFG_EDCA_WME_ACBE    121
+#define WNI_CFG_EDCA_WME_ACVI    122
+#define WNI_CFG_EDCA_WME_ACVO    123
+#define WNI_CFG_RDET_FLAG    124
+#define WNI_CFG_RADAR_CHANNEL_LIST    125
+#define WNI_CFG_LOCAL_POWER_CONSTRAINT    126
+#define WNI_CFG_ADMIT_POLICY    127
+#define WNI_CFG_ADMIT_BWFACTOR    128
+#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE    129
+#define WNI_CFG_CHANNEL_BONDING_MODE    130
+#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE    131
+#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO    132
+#define WNI_CFG_DYNAMIC_THRESHOLD_ONE    133
+#define WNI_CFG_DYNAMIC_THRESHOLD_TWO    134
+#define WNI_CFG_TRIG_STA_BK_SCAN    135
+#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING    136
+#define WNI_CFG_SCAN_CONTROL_LIST    137
+#define WNI_CFG_MIMO_ENABLED    138
+#define WNI_CFG_BLOCK_ACK_ENABLED    139
+#define WNI_CFG_BA_ACTIVITY_CHECK_TIMEOUT    140
+#define WNI_CFG_HT_RX_STBC    141
+#define WNI_CFG_HT_CAP_INFO    142
+#define WNI_CFG_HT_AMPDU_PARAMS    143
+#define WNI_CFG_SUPPORTED_MCS_SET    144
+#define WNI_CFG_EXT_HT_CAP_INFO    145
+#define WNI_CFG_TX_BF_CAP    146
+#define WNI_CFG_AS_CAP    147
+#define WNI_CFG_HT_INFO_FIELD1    148
+#define WNI_CFG_HT_INFO_FIELD2    149
+#define WNI_CFG_HT_INFO_FIELD3    150
+#define WNI_CFG_BASIC_MCS_SET    151
+#define WNI_CFG_CURRENT_MCS_SET    152
+#define WNI_CFG_GREENFIELD_CAPABILITY    153
+#define WNI_CFG_VHT_MAX_MPDU_LENGTH    154
+#define WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET    155
+#define WNI_CFG_VHT_LDPC_CODING_CAP    156
+#define WNI_CFG_VHT_SHORT_GI_80MHZ    157
+#define WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ    158
+#define WNI_CFG_VHT_TXSTBC    159
+#define WNI_CFG_VHT_RXSTBC    160
+#define WNI_CFG_VHT_SU_BEAMFORMER_CAP    161
+#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP    162
+#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED    163
+#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS    164
+#define WNI_CFG_VHT_MU_BEAMFORMER_CAP    165
+#define WNI_CFG_VHT_MU_BEAMFORMEE_CAP    166
+#define WNI_CFG_VHT_TXOP_PS    167
+#define WNI_CFG_VHT_HTC_VHTC_CAP    168
+#define WNI_CFG_VHT_AMPDU_LEN_EXPONENT    169
+#define WNI_CFG_VHT_LINK_ADAPTATION_CAP    170
+#define WNI_CFG_VHT_RX_ANT_PATTERN    171
+#define WNI_CFG_VHT_TX_ANT_PATTERN    172
+#define WNI_CFG_VHT_RX_MCS_MAP    173
+#define WNI_CFG_VHT_TX_MCS_MAP    174
+#define WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE    175
+#define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE    176
+#define WNI_CFG_VHT_CHANNEL_WIDTH    177
+#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1    178
+#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2    179
+#define WNI_CFG_VHT_BASIC_MCS_SET    180
+#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT    181
+#define WNI_CFG_VHT_SS_UNDER_UTIL    182
+#define WNI_CFG_VHT_40MHZ_UTILIZATION    183
+#define WNI_CFG_VHT_80MHZ_UTILIZATION    184
+#define WNI_CFG_VHT_160MHZ_UTILIZATION    185
+#define WNI_CFG_MAX_AMSDU_LENGTH    186
+#define WNI_CFG_MPDU_DENSITY    187
+#define WNI_CFG_NUM_BUFF_ADVERT    188
+#define WNI_CFG_MAX_RX_AMPDU_FACTOR    189
+#define WNI_CFG_SHORT_GI_20MHZ    190
+#define WNI_CFG_SHORT_GI_40MHZ    191
+#define WNI_CFG_RIFS_ENABLED    192
+#define WNI_CFG_MAX_PS_POLL    193
+#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE    194
+#define WNI_CFG_RSSI_FILTER_PERIOD    195
+#define WNI_CFG_MIN_RSSI_THRESHOLD    196
+#define WNI_CFG_NTH_BEACON_FILTER    197
+#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE    198
+#define WNI_CFG_SCAN_IN_POWERSAVE    199
+#define WNI_CFG_IGNORE_DTIM    200
+#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE    201
+#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE    202
+#define WNI_CFG_WOWLAN_DEAUTH_ENABLE    203
+#define WNI_CFG_WOWLAN_DISASSOC_ENABLE    204
+#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON    205
+#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD    206
+#define WNI_CFG_BA_TIMEOUT    207
+#define WNI_CFG_BA_THRESHOLD_HIGH    208
+#define WNI_CFG_MAX_BA_BUFFERS    209
+#define WNI_CFG_MAX_BA_SESSIONS    210
+#define WNI_CFG_BA_AUTO_SETUP    211
+#define WNI_CFG_ADDBA_REQ_DECLINE    212
+#define WNI_CFG_DEL_ALL_RX_BA_SESSIONS_2_4_G_BTC    213
+#define WNI_CFG_BG_SCAN_CHANNEL_LIST    214
+#define WNI_CFG_MAX_MEDIUM_TIME    215
+#define WNI_CFG_MAX_MPDUS_IN_AMPDU    216
+#define WNI_CFG_IBSS_AUTO_BSSID    217
+#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG    218
+#define WNI_CFG_PROBE_REQ_ADDNIE_DATA    219
+#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG    220
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1    221
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2    222
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3    223
+#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG    224
+#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA    225
+#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG    226
+#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA    227
+#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG    228
+#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA    229
+#define WNI_CFG_WPS_ENABLE    230
+#define WNI_CFG_WPS_STATE    231
+#define WNI_CFG_WPS_PROBE_REQ_FLAG    232
+#define WNI_CFG_WPS_VERSION    233
+#define WNI_CFG_WPS_REQUEST_TYPE    234
+#define WNI_CFG_WPS_CFG_METHOD    235
+#define WNI_CFG_WPS_UUID    236
+#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY    237
+#define WNI_CFG_WPS_PIMARY_DEVICE_OUI    238
+#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY    239
+#define WNI_CFG_WPS_ASSOCIATION_STATE    240
+#define WNI_CFG_WPS_CONFIGURATION_ERROR    241
+#define WNI_CFG_WPS_DEVICE_PASSWORD_ID    242
+#define WNI_CFG_WPS_ASSOC_METHOD    243
+#define WNI_CFG_LOW_GAIN_OVERRIDE    244
+#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE    245
+#define WNI_CFG_RPE_POLLING_THRESHOLD    246
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG    247
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG    248
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG    249
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG    250
+#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS    251
+#define WNI_CFG_SINGLE_TID_RC    252
+#define WNI_CFG_RRM_ENABLED    253
+#define WNI_CFG_RRM_OPERATING_CHAN_MAX    254
+#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX    255
+#define WNI_CFG_TX_PWR_CTRL_ENABLE    256
+#define WNI_CFG_MCAST_BCAST_FILTER_SETTING    257
+#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK    258
+#define WNI_CFG_DYNAMIC_PS_POLL_VALUE    259
+#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT    260
+#define WNI_CFG_TELE_BCN_WAKEUP_EN    261
+#define WNI_CFG_TELE_BCN_TRANS_LI    262
+#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS    263
+#define WNI_CFG_TELE_BCN_MAX_LI    264
+#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS    265
+#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS    266
+#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD    267
+#define WNI_CFG_ASSOC_STA_LIMIT    268
+#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL    269
+#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL    270
+#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND    271
+#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD    272
+#define WNI_CFG_ENABLE_CLOSE_LOOP    273
+#define WNI_CFG_ENABLE_LTE_COEX    274
+#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT    275
+#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT    276
+#define WNI_CFG_ENABLE_MC_ADDR_LIST    277
+#define WNI_CFG_ENABLE_UC_FILTER    278
+#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION    279
+#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED    280
+#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP    281
+#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT    282
+#define WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK    283
+#define WNI_CFG_TDLS_BUF_STA_ENABLED    284
+#define WNI_CFG_TDLS_PUAPSD_INACT_TIME    285
+#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD    286
+#define WNI_CFG_PMF_SA_QUERY_MAX_RETRIES    287
+#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL    288
+#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN    289
+#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR    290
+#define WNI_CFG_ANTENNA_DIVESITY    291
+#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT    292
+#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY    293
+#define WNI_CFG_CURRENT_RSSI    294
+#define WNI_CFG_RTT3_ENABLE    295
+#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL    296
+#define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED    297
+#define WNI_CFG_IBSS_ATIM_WIN_SIZE    298
+#define WNI_CFG_DFS_MASTER_ENABLED    299
+#define WNI_CFG_VHT_ENABLE_TXBF_20MHZ    300
+#define WNI_CFG_TDLS_WMM_MODE_ENABLED    301
 
 /*
  * String parameter lengths
@@ -1098,33 +1095,6 @@
 #define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED_APMAX    1
 #define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED_APDEF    1
 
-#define WNI_CFG_CAL_PERIOD_STAMIN    2
-#define WNI_CFG_CAL_PERIOD_STAMAX    10
-#define WNI_CFG_CAL_PERIOD_STADEF    5
-
-#define WNI_CFG_CAL_PERIOD_APMIN    2
-#define WNI_CFG_CAL_PERIOD_APMAX    10
-#define WNI_CFG_CAL_PERIOD_APDEF    5
-
-#define WNI_CFG_STATS_PERIOD_STAMIN    1
-#define WNI_CFG_STATS_PERIOD_STAMAX    10
-#define WNI_CFG_STATS_PERIOD_STADEF    10
-
-#define WNI_CFG_STATS_PERIOD_APMIN    1
-#define WNI_CFG_STATS_PERIOD_APMAX    10
-#define WNI_CFG_STATS_PERIOD_APDEF    10
-
-#define WNI_CFG_CAL_CONTROL_STAMIN    0
-#define WNI_CFG_CAL_CONTROL_STAMAX    1
-#define WNI_CFG_CAL_CONTROL_STADEF    0
-
-#define WNI_CFG_CAL_CONTROL_APMIN    0
-#define WNI_CFG_CAL_CONTROL_APMAX    1
-#define WNI_CFG_CAL_CONTROL_APDEF    0
-
-#define WNI_CFG_CAL_CONTROL_CAL_ON    0
-#define WNI_CFG_CAL_CONTROL_CAL_OFF    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
@@ -2578,10 +2548,10 @@
 #define WNI_CFG_TDLS_WMM_MODE_ENABLED_APMAX    1
 #define WNI_CFG_TDLS_WMM_MODE_ENABLED_APDEF    0
 
-#define CFG_PARAM_MAX_NUM         305
-#define CFG_AP_IBUF_MAX_SIZE      253
+#define CFG_PARAM_MAX_NUM         302
+#define CFG_AP_IBUF_MAX_SIZE      250
 #define CFG_AP_SBUF_MAX_SIZE      3238
-#define CFG_STA_IBUF_MAX_SIZE     248
+#define CFG_STA_IBUF_MAX_SIZE     245
 #define CFG_STA_SBUF_MAX_SIZE     3204
 #define CFG_SEM_MAX_NUM           19
 
diff --git a/CORE/MAC/inc/wniCfgSta.h b/CORE/MAC/inc/wniCfgSta.h
index 10cb585692b2..6dea1a502425 100644
--- a/CORE/MAC/inc/wniCfgSta.h
+++ b/CORE/MAC/inc/wniCfgSta.h
@@ -138,211 +138,208 @@
 #define WNI_CFG_FORCE_POLICY_PROTECTION    96
 #define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED    97
 #define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED    98
-#define WNI_CFG_CAL_PERIOD    99
-#define WNI_CFG_STATS_PERIOD    100
-#define WNI_CFG_CAL_CONTROL    101
-#define WNI_CFG_11G_ONLY_POLICY    102
-#define WNI_CFG_PACKET_CLASSIFICATION    103
-#define WNI_CFG_WME_ENABLED    104
-#define WNI_CFG_ADDTS_RSP_TIMEOUT    105
-#define WNI_CFG_MAX_SP_LENGTH    106
-#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS    108
-#define WNI_CFG_WSM_ENABLED    109
-#define WNI_CFG_EDCA_PROFILE    110
-#define WNI_CFG_EDCA_ANI_ACBK_LOCAL    111
-#define WNI_CFG_EDCA_ANI_ACBE_LOCAL    112
-#define WNI_CFG_EDCA_ANI_ACVI_LOCAL    113
-#define WNI_CFG_EDCA_ANI_ACVO_LOCAL    114
-#define WNI_CFG_EDCA_ANI_ACBK    115
-#define WNI_CFG_EDCA_ANI_ACBE    116
-#define WNI_CFG_EDCA_ANI_ACVI    117
-#define WNI_CFG_EDCA_ANI_ACVO    118
-#define WNI_CFG_EDCA_WME_ACBK_LOCAL    119
-#define WNI_CFG_EDCA_WME_ACBE_LOCAL    120
-#define WNI_CFG_EDCA_WME_ACVI_LOCAL    121
-#define WNI_CFG_EDCA_WME_ACVO_LOCAL    122
-#define WNI_CFG_EDCA_WME_ACBK    123
-#define WNI_CFG_EDCA_WME_ACBE    124
-#define WNI_CFG_EDCA_WME_ACVI    125
-#define WNI_CFG_EDCA_WME_ACVO    126
-#define WNI_CFG_RDET_FLAG    127
-#define WNI_CFG_RADAR_CHANNEL_LIST    128
-#define WNI_CFG_LOCAL_POWER_CONSTRAINT    129
-#define WNI_CFG_ADMIT_POLICY    130
-#define WNI_CFG_ADMIT_BWFACTOR    131
-#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE    132
-#define WNI_CFG_CHANNEL_BONDING_MODE    133
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE    134
-#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO    135
-#define WNI_CFG_DYNAMIC_THRESHOLD_ONE    136
-#define WNI_CFG_DYNAMIC_THRESHOLD_TWO    137
-#define WNI_CFG_TRIG_STA_BK_SCAN    138
-#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING    139
-#define WNI_CFG_SCAN_CONTROL_LIST    140
-#define WNI_CFG_MIMO_ENABLED    141
-#define WNI_CFG_BLOCK_ACK_ENABLED    142
-#define WNI_CFG_BA_ACTIVITY_CHECK_TIMEOUT    143
-#define WNI_CFG_HT_RX_STBC    144
-#define WNI_CFG_HT_CAP_INFO    145
-#define WNI_CFG_HT_AMPDU_PARAMS    146
-#define WNI_CFG_SUPPORTED_MCS_SET    147
-#define WNI_CFG_EXT_HT_CAP_INFO    148
-#define WNI_CFG_TX_BF_CAP    149
-#define WNI_CFG_AS_CAP    150
-#define WNI_CFG_HT_INFO_FIELD1    151
-#define WNI_CFG_HT_INFO_FIELD2    152
-#define WNI_CFG_HT_INFO_FIELD3    153
-#define WNI_CFG_BASIC_MCS_SET    154
-#define WNI_CFG_CURRENT_MCS_SET    155
-#define WNI_CFG_GREENFIELD_CAPABILITY    156
-#define WNI_CFG_VHT_MAX_MPDU_LENGTH    157
-#define WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET    158
-#define WNI_CFG_VHT_LDPC_CODING_CAP    159
-#define WNI_CFG_VHT_SHORT_GI_80MHZ    160
-#define WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ    161
-#define WNI_CFG_VHT_TXSTBC    162
-#define WNI_CFG_VHT_RXSTBC    163
-#define WNI_CFG_VHT_SU_BEAMFORMER_CAP    164
-#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP    165
-#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED    166
-#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS    167
-#define WNI_CFG_VHT_MU_BEAMFORMER_CAP    168
-#define WNI_CFG_VHT_MU_BEAMFORMEE_CAP    169
-#define WNI_CFG_VHT_TXOP_PS    170
-#define WNI_CFG_VHT_HTC_VHTC_CAP    171
-#define WNI_CFG_VHT_AMPDU_LEN_EXPONENT    172
-#define WNI_CFG_VHT_LINK_ADAPTATION_CAP    173
-#define WNI_CFG_VHT_RX_ANT_PATTERN    174
-#define WNI_CFG_VHT_TX_ANT_PATTERN    175
-#define WNI_CFG_VHT_RX_MCS_MAP    176
-#define WNI_CFG_VHT_TX_MCS_MAP    177
-#define WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE    178
-#define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE    179
-#define WNI_CFG_VHT_CHANNEL_WIDTH    180
-#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1    181
-#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2    182
-#define WNI_CFG_VHT_BASIC_MCS_SET    183
-#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT    184
-#define WNI_CFG_VHT_SS_UNDER_UTIL    185
-#define WNI_CFG_VHT_40MHZ_UTILIZATION    186
-#define WNI_CFG_VHT_80MHZ_UTILIZATION    187
-#define WNI_CFG_VHT_160MHZ_UTILIZATION    188
-#define WNI_CFG_MAX_AMSDU_LENGTH    189
-#define WNI_CFG_MPDU_DENSITY    190
-#define WNI_CFG_NUM_BUFF_ADVERT    191
-#define WNI_CFG_MAX_RX_AMPDU_FACTOR    192
-#define WNI_CFG_SHORT_GI_20MHZ    193
-#define WNI_CFG_SHORT_GI_40MHZ    194
-#define WNI_CFG_RIFS_ENABLED    195
-#define WNI_CFG_MAX_PS_POLL    196
-#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE    197
-#define WNI_CFG_RSSI_FILTER_PERIOD    198
-#define WNI_CFG_MIN_RSSI_THRESHOLD    199
-#define WNI_CFG_NTH_BEACON_FILTER    200
-#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE    201
-#define WNI_CFG_SCAN_IN_POWERSAVE    202
-#define WNI_CFG_IGNORE_DTIM    203
-#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE    204
-#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE    205
-#define WNI_CFG_WOWLAN_DEAUTH_ENABLE    206
-#define WNI_CFG_WOWLAN_DISASSOC_ENABLE    207
-#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON    208
-#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD    209
-#define WNI_CFG_BA_TIMEOUT    210
-#define WNI_CFG_BA_THRESHOLD_HIGH    211
-#define WNI_CFG_MAX_BA_BUFFERS    212
-#define WNI_CFG_MAX_BA_SESSIONS    213
-#define WNI_CFG_BA_AUTO_SETUP    214
-#define WNI_CFG_ADDBA_REQ_DECLINE    215
-#define WNI_CFG_DEL_ALL_RX_BA_SESSIONS_2_4_G_BTC    216
-#define WNI_CFG_BG_SCAN_CHANNEL_LIST    217
-#define WNI_CFG_MAX_MEDIUM_TIME    218
-#define WNI_CFG_MAX_MPDUS_IN_AMPDU    219
-#define WNI_CFG_IBSS_AUTO_BSSID    220
-#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG    221
-#define WNI_CFG_PROBE_REQ_ADDNIE_DATA    222
-#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG    223
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1    224
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2    225
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3    226
-#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG    227
-#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA    228
-#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG    229
-#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA    230
-#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG    231
-#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA    232
-#define WNI_CFG_WPS_ENABLE    233
-#define WNI_CFG_WPS_STATE    234
-#define WNI_CFG_WPS_PROBE_REQ_FLAG    235
-#define WNI_CFG_WPS_VERSION    236
-#define WNI_CFG_WPS_REQUEST_TYPE    237
-#define WNI_CFG_WPS_CFG_METHOD    238
-#define WNI_CFG_WPS_UUID    239
-#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY    240
-#define WNI_CFG_WPS_PIMARY_DEVICE_OUI    241
-#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY    242
-#define WNI_CFG_WPS_ASSOCIATION_STATE    243
-#define WNI_CFG_WPS_CONFIGURATION_ERROR    244
-#define WNI_CFG_WPS_DEVICE_PASSWORD_ID    245
-#define WNI_CFG_WPS_ASSOC_METHOD    246
-#define WNI_CFG_LOW_GAIN_OVERRIDE    247
-#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE    248
-#define WNI_CFG_RPE_POLLING_THRESHOLD    249
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG    250
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG    251
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG    252
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG    253
-#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS    254
-#define WNI_CFG_SINGLE_TID_RC    255
-#define WNI_CFG_RRM_ENABLED    256
-#define WNI_CFG_RRM_OPERATING_CHAN_MAX    257
-#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX    258
-#define WNI_CFG_TX_PWR_CTRL_ENABLE    259
-#define WNI_CFG_MCAST_BCAST_FILTER_SETTING    260
-#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK    261
-#define WNI_CFG_DYNAMIC_PS_POLL_VALUE    262
-#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT    263
-#define WNI_CFG_TELE_BCN_WAKEUP_EN    264
-#define WNI_CFG_TELE_BCN_TRANS_LI    265
-#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS    266
-#define WNI_CFG_TELE_BCN_MAX_LI    267
-#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS    268
-#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS    269
-#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD    270
-#define WNI_CFG_ASSOC_STA_LIMIT    271
-#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL    272
-#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL    273
-#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND    274
-#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD    275
-#define WNI_CFG_ENABLE_CLOSE_LOOP    276
-#define WNI_CFG_ENABLE_LTE_COEX    277
-#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT    278
-#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT    279
-#define WNI_CFG_ENABLE_MC_ADDR_LIST    280
-#define WNI_CFG_ENABLE_UC_FILTER    281
-#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION    282
-#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED    283
-#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP    284
-#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT    285
-#define WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK    286
-#define WNI_CFG_TDLS_BUF_STA_ENABLED    287
-#define WNI_CFG_TDLS_PUAPSD_INACT_TIME    288
-#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD    289
-#define WNI_CFG_PMF_SA_QUERY_MAX_RETRIES    290
-#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL    291
-#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN    292
-#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR    293
-#define WNI_CFG_ANTENNA_DIVESITY    294
-#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT    295
-#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY    296
-#define WNI_CFG_CURRENT_RSSI    297
-#define WNI_CFG_RTT3_ENABLE    298
-#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL    299
-#define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED    300
-#define WNI_CFG_IBSS_ATIM_WIN_SIZE    301
-#define WNI_CFG_DFS_MASTER_ENABLED    302
-#define WNI_CFG_VHT_ENABLE_TXBF_20MHZ    303
-#define WNI_CFG_TDLS_WMM_MODE_ENABLED    304
+#define WNI_CFG_11G_ONLY_POLICY    99
+#define WNI_CFG_PACKET_CLASSIFICATION    100
+#define WNI_CFG_WME_ENABLED    101
+#define WNI_CFG_ADDTS_RSP_TIMEOUT    102
+#define WNI_CFG_MAX_SP_LENGTH    103
+#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS    105
+#define WNI_CFG_WSM_ENABLED    106
+#define WNI_CFG_EDCA_PROFILE    107
+#define WNI_CFG_EDCA_ANI_ACBK_LOCAL    108
+#define WNI_CFG_EDCA_ANI_ACBE_LOCAL    109
+#define WNI_CFG_EDCA_ANI_ACVI_LOCAL    110
+#define WNI_CFG_EDCA_ANI_ACVO_LOCAL    111
+#define WNI_CFG_EDCA_ANI_ACBK    112
+#define WNI_CFG_EDCA_ANI_ACBE    113
+#define WNI_CFG_EDCA_ANI_ACVI    114
+#define WNI_CFG_EDCA_ANI_ACVO    115
+#define WNI_CFG_EDCA_WME_ACBK_LOCAL    116
+#define WNI_CFG_EDCA_WME_ACBE_LOCAL    117
+#define WNI_CFG_EDCA_WME_ACVI_LOCAL    118
+#define WNI_CFG_EDCA_WME_ACVO_LOCAL    119
+#define WNI_CFG_EDCA_WME_ACBK    120
+#define WNI_CFG_EDCA_WME_ACBE    121
+#define WNI_CFG_EDCA_WME_ACVI    122
+#define WNI_CFG_EDCA_WME_ACVO    123
+#define WNI_CFG_RDET_FLAG    124
+#define WNI_CFG_RADAR_CHANNEL_LIST    125
+#define WNI_CFG_LOCAL_POWER_CONSTRAINT    126
+#define WNI_CFG_ADMIT_POLICY    127
+#define WNI_CFG_ADMIT_BWFACTOR    128
+#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE    129
+#define WNI_CFG_CHANNEL_BONDING_MODE    130
+#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE    131
+#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO    132
+#define WNI_CFG_DYNAMIC_THRESHOLD_ONE    133
+#define WNI_CFG_DYNAMIC_THRESHOLD_TWO    134
+#define WNI_CFG_TRIG_STA_BK_SCAN    135
+#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING    136
+#define WNI_CFG_SCAN_CONTROL_LIST    137
+#define WNI_CFG_MIMO_ENABLED    138
+#define WNI_CFG_BLOCK_ACK_ENABLED    139
+#define WNI_CFG_BA_ACTIVITY_CHECK_TIMEOUT    140
+#define WNI_CFG_HT_RX_STBC    141
+#define WNI_CFG_HT_CAP_INFO    142
+#define WNI_CFG_HT_AMPDU_PARAMS    143
+#define WNI_CFG_SUPPORTED_MCS_SET    144
+#define WNI_CFG_EXT_HT_CAP_INFO    145
+#define WNI_CFG_TX_BF_CAP    146
+#define WNI_CFG_AS_CAP    147
+#define WNI_CFG_HT_INFO_FIELD1    148
+#define WNI_CFG_HT_INFO_FIELD2    149
+#define WNI_CFG_HT_INFO_FIELD3    150
+#define WNI_CFG_BASIC_MCS_SET    151
+#define WNI_CFG_CURRENT_MCS_SET    152
+#define WNI_CFG_GREENFIELD_CAPABILITY    153
+#define WNI_CFG_VHT_MAX_MPDU_LENGTH    154
+#define WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET    155
+#define WNI_CFG_VHT_LDPC_CODING_CAP    156
+#define WNI_CFG_VHT_SHORT_GI_80MHZ    157
+#define WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ    158
+#define WNI_CFG_VHT_TXSTBC    159
+#define WNI_CFG_VHT_RXSTBC    160
+#define WNI_CFG_VHT_SU_BEAMFORMER_CAP    161
+#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP    162
+#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED    163
+#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS    164
+#define WNI_CFG_VHT_MU_BEAMFORMER_CAP    165
+#define WNI_CFG_VHT_MU_BEAMFORMEE_CAP    166
+#define WNI_CFG_VHT_TXOP_PS    167
+#define WNI_CFG_VHT_HTC_VHTC_CAP    168
+#define WNI_CFG_VHT_AMPDU_LEN_EXPONENT    169
+#define WNI_CFG_VHT_LINK_ADAPTATION_CAP    170
+#define WNI_CFG_VHT_RX_ANT_PATTERN    171
+#define WNI_CFG_VHT_TX_ANT_PATTERN    172
+#define WNI_CFG_VHT_RX_MCS_MAP    173
+#define WNI_CFG_VHT_TX_MCS_MAP    174
+#define WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE    175
+#define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE    176
+#define WNI_CFG_VHT_CHANNEL_WIDTH    177
+#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1    178
+#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2    179
+#define WNI_CFG_VHT_BASIC_MCS_SET    180
+#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT    181
+#define WNI_CFG_VHT_SS_UNDER_UTIL    182
+#define WNI_CFG_VHT_40MHZ_UTILIZATION    183
+#define WNI_CFG_VHT_80MHZ_UTILIZATION    184
+#define WNI_CFG_VHT_160MHZ_UTILIZATION    185
+#define WNI_CFG_MAX_AMSDU_LENGTH    186
+#define WNI_CFG_MPDU_DENSITY    187
+#define WNI_CFG_NUM_BUFF_ADVERT    188
+#define WNI_CFG_MAX_RX_AMPDU_FACTOR    189
+#define WNI_CFG_SHORT_GI_20MHZ    190
+#define WNI_CFG_SHORT_GI_40MHZ    191
+#define WNI_CFG_RIFS_ENABLED    192
+#define WNI_CFG_MAX_PS_POLL    193
+#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE    194
+#define WNI_CFG_RSSI_FILTER_PERIOD    195
+#define WNI_CFG_MIN_RSSI_THRESHOLD    196
+#define WNI_CFG_NTH_BEACON_FILTER    197
+#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE    198
+#define WNI_CFG_SCAN_IN_POWERSAVE    199
+#define WNI_CFG_IGNORE_DTIM    200
+#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE    201
+#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE    202
+#define WNI_CFG_WOWLAN_DEAUTH_ENABLE    203
+#define WNI_CFG_WOWLAN_DISASSOC_ENABLE    204
+#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON    205
+#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD    206
+#define WNI_CFG_BA_TIMEOUT    207
+#define WNI_CFG_BA_THRESHOLD_HIGH    208
+#define WNI_CFG_MAX_BA_BUFFERS    209
+#define WNI_CFG_MAX_BA_SESSIONS    210
+#define WNI_CFG_BA_AUTO_SETUP    211
+#define WNI_CFG_ADDBA_REQ_DECLINE    212
+#define WNI_CFG_DEL_ALL_RX_BA_SESSIONS_2_4_G_BTC    213
+#define WNI_CFG_BG_SCAN_CHANNEL_LIST    214
+#define WNI_CFG_MAX_MEDIUM_TIME    215
+#define WNI_CFG_MAX_MPDUS_IN_AMPDU    216
+#define WNI_CFG_IBSS_AUTO_BSSID    217
+#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG    218
+#define WNI_CFG_PROBE_REQ_ADDNIE_DATA    219
+#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG    220
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1    221
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2    222
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3    223
+#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG    224
+#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA    225
+#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG    226
+#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA    227
+#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG    228
+#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA    229
+#define WNI_CFG_WPS_ENABLE    230
+#define WNI_CFG_WPS_STATE    231
+#define WNI_CFG_WPS_PROBE_REQ_FLAG    232
+#define WNI_CFG_WPS_VERSION    233
+#define WNI_CFG_WPS_REQUEST_TYPE    234
+#define WNI_CFG_WPS_CFG_METHOD    235
+#define WNI_CFG_WPS_UUID    236
+#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY    237
+#define WNI_CFG_WPS_PIMARY_DEVICE_OUI    238
+#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY    239
+#define WNI_CFG_WPS_ASSOCIATION_STATE    240
+#define WNI_CFG_WPS_CONFIGURATION_ERROR    241
+#define WNI_CFG_WPS_DEVICE_PASSWORD_ID    242
+#define WNI_CFG_WPS_ASSOC_METHOD    243
+#define WNI_CFG_LOW_GAIN_OVERRIDE    244
+#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE    245
+#define WNI_CFG_RPE_POLLING_THRESHOLD    246
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG    247
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG    248
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG    249
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG    250
+#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS    251
+#define WNI_CFG_SINGLE_TID_RC    252
+#define WNI_CFG_RRM_ENABLED    253
+#define WNI_CFG_RRM_OPERATING_CHAN_MAX    254
+#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX    255
+#define WNI_CFG_TX_PWR_CTRL_ENABLE    256
+#define WNI_CFG_MCAST_BCAST_FILTER_SETTING    257
+#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK    258
+#define WNI_CFG_DYNAMIC_PS_POLL_VALUE    259
+#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT    260
+#define WNI_CFG_TELE_BCN_WAKEUP_EN    261
+#define WNI_CFG_TELE_BCN_TRANS_LI    262
+#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS    263
+#define WNI_CFG_TELE_BCN_MAX_LI    264
+#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS    265
+#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS    266
+#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD    267
+#define WNI_CFG_ASSOC_STA_LIMIT    268
+#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL    269
+#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL    270
+#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND    271
+#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD    272
+#define WNI_CFG_ENABLE_CLOSE_LOOP    273
+#define WNI_CFG_ENABLE_LTE_COEX    274
+#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT    275
+#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT    276
+#define WNI_CFG_ENABLE_MC_ADDR_LIST    277
+#define WNI_CFG_ENABLE_UC_FILTER    278
+#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION    279
+#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED    280
+#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP    281
+#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT    282
+#define WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK    283
+#define WNI_CFG_TDLS_BUF_STA_ENABLED    284
+#define WNI_CFG_TDLS_PUAPSD_INACT_TIME    285
+#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD    286
+#define WNI_CFG_PMF_SA_QUERY_MAX_RETRIES    287
+#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL    288
+#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN    289
+#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR    290
+#define WNI_CFG_ANTENNA_DIVESITY    291
+#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT    292
+#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY    293
+#define WNI_CFG_CURRENT_RSSI    294
+#define WNI_CFG_RTT3_ENABLE    295
+#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL    296
+#define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED    297
+#define WNI_CFG_IBSS_ATIM_WIN_SIZE    298
+#define WNI_CFG_DFS_MASTER_ENABLED    299
+#define WNI_CFG_VHT_ENABLE_TXBF_20MHZ    300
+#define WNI_CFG_TDLS_WMM_MODE_ENABLED    301
 
 /*
  * String parameter lengths
@@ -811,21 +808,6 @@
 #define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED_STAMAX    1
 #define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED_STADEF    1
 
-#define WNI_CFG_CAL_PERIOD_STAMIN    2
-#define WNI_CFG_CAL_PERIOD_STAMAX    10
-#define WNI_CFG_CAL_PERIOD_STADEF    5
-
-#define WNI_CFG_STATS_PERIOD_STAMIN    1
-#define WNI_CFG_STATS_PERIOD_STAMAX    10
-#define WNI_CFG_STATS_PERIOD_STADEF    10
-
-#define WNI_CFG_CAL_CONTROL_STAMIN    0
-#define WNI_CFG_CAL_CONTROL_STAMAX    1
-#define WNI_CFG_CAL_CONTROL_STADEF    0
-
-#define WNI_CFG_CAL_CONTROL_CAL_ON    0
-#define WNI_CFG_CAL_CONTROL_CAL_OFF    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
@@ -1647,8 +1629,8 @@
 #define WNI_CFG_TDLS_WMM_MODE_ENABLED_STAMAX    1
 #define WNI_CFG_TDLS_WMM_MODE_ENABLED_STADEF    0
 
-#define CFG_PARAM_MAX_NUM        305
-#define CFG_STA_IBUF_MAX_SIZE    248
+#define CFG_PARAM_MAX_NUM        302
+#define CFG_STA_IBUF_MAX_SIZE    245
 #define CFG_STA_SBUF_MAX_SIZE    3204
 #define CFG_SEM_MAX_NUM          19
 
diff --git a/CORE/MAC/src/cfg/cfgParamName.c b/CORE/MAC/src/cfg/cfgParamName.c
index 07f3eb2b1bac..f2df54750757 100644
--- a/CORE/MAC/src/cfg/cfgParamName.c
+++ b/CORE/MAC/src/cfg/cfgParamName.c
@@ -134,9 +134,6 @@ unsigned char *gCfgParamName[] = {
     (unsigned char *)"FORCE_POLICY_PROTECTION",
     (unsigned char *)"11G_SHORT_PREAMBLE_ENABLED",
     (unsigned char *)"11G_SHORT_SLOT_TIME_ENABLED",
-    (unsigned char *)"CAL_PERIOD",
-    (unsigned char *)"STATS_PERIOD",
-    (unsigned char *)"CAL_CONTROL",
     (unsigned char *)"11G_ONLY_POLICY",
     (unsigned char *)"PACKET_CLASSIFICATION",
     (unsigned char *)"WME_ENABLED",
diff --git a/CORE/MAC/src/cfg/cfgUtil/cfg.txt b/CORE/MAC/src/cfg/cfgUtil/cfg.txt
index 0b49d79ce106..131f66345d79 100644
--- a/CORE/MAC/src/cfg/cfgUtil/cfg.txt
+++ b/CORE/MAC/src/cfg/cfgUtil/cfg.txt
@@ -1538,46 +1538,6 @@ NONE
 0    1    1
 
 *
-* Calibration periodicity (minutes)
-*
-
-WNI_CFG_CAL_PERIOD    I    4    12
-V    RW    NP
-HAL
-2    10    5
-V    RW    NP
-HAL
-2    10    5
-
-*
-* Statistics collection periodicity (seconds)
-*
-
-WNI_CFG_STATS_PERIOD    I    4    12
-V    RW    NP
-HAL
-1    10    10
-V    RW    NP
-HAL
-1    10    10
-
-*
-* Calibration on/off control
-*
-
-WNI_CFG_CAL_CONTROL    I    4    12
-V    RW    NP
-HAL
-0    1    0
-V    RW    NP
-HAL
-0    1    0
-
-#ENUM CAL_ON  0
-#ENUM CAL_OFF 1
-
-
-*
 * Parameter to allow 11g only STAs while operating in 11g mode
 *
 
diff --git a/firmware_bin/WCNSS_cfg.dat b/firmware_bin/WCNSS_cfg.dat
index ec818c3fd5b3..328912272d65 100644
--- a/firmware_bin/WCNSS_cfg.dat
+++ b/firmware_bin/WCNSS_cfg.dat