wlan: Remove FTRssiFilterPeriod
There are two cfg items RSSI filter period and FT RSSI filter period.
Separate variables for the same
purpose are not required with recent code. RSSI filter period is not
longer used in here, because RSSI averaging is done fr every TBTT. Hence
at present we are removeing FT RSSI filter period and chaning RSSI
filter period to 5.
Change-Id: I0ce0ac0fcffebc836a61347c4c508329d52ca84a
CR-Fixed: 431526
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index b498893..4eb3b1b 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -739,11 +739,6 @@
#endif // FEATURE_WLAN_LFR
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
-#define CFG_FT_RSSI_FILTER_PERIOD_NAME "FTRssiFilterPeriod"
-#define CFG_FT_RSSI_FILTER_PERIOD_MIN WNI_CFG_FT_RSSI_FILTER_PERIOD_STAMIN
-#define CFG_FT_RSSI_FILTER_PERIOD_MAX WNI_CFG_FT_RSSI_FILTER_PERIOD_STAMAX
-#define CFG_FT_RSSI_FILTER_PERIOD_DEFAULT WNI_CFG_FT_RSSI_FILTER_PERIOD_STADEF
-
// This flag will control fasttransition in case of 11r and ccx.
// Basically with this the whole neighbor roam, pre-auth, reassoc
// can be turned ON/OFF.
@@ -1668,7 +1663,6 @@
v_BOOL_t isCcxIniFeatureEnabled;
#endif
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
- v_U8_t FTRssiFilterPeriod;
v_BOOL_t isFastTransitionEnabled;
v_U8_t RoamRssiDiff;
v_U8_t nImmediateRoamRssiDiff;
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 684032c..cca2a51 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -925,14 +925,6 @@
#endif // FEATURE_WLAN_LFR
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
- REG_VARIABLE( CFG_FT_RSSI_FILTER_PERIOD_NAME, WLAN_PARAM_Integer,
- hdd_config_t, FTRssiFilterPeriod,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_FT_RSSI_FILTER_PERIOD_DEFAULT,
- CFG_FT_RSSI_FILTER_PERIOD_MIN,
- CFG_FT_RSSI_FILTER_PERIOD_MAX ),
-
-
// flag to turn ON/OFF 11r and CCX FastTransition
REG_DYNAMIC_VARIABLE( CFG_FAST_TRANSITION_ENABLED_NAME, WLAN_PARAM_Integer,
hdd_config_t, isFastTransitionEnabled,
@@ -2894,15 +2886,6 @@
hddLog(LOGE, "Could not pass on WNI_CFG_RSSI_FILTER_PERIOD to CCM\n");
}
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
- if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_FT_RSSI_FILTER_PERIOD, pConfig->FTRssiFilterPeriod,
- NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
- {
- fStatus = FALSE;
- hddLog(LOGE, "Could not pass on WNI_CFG_FT_RSSI_FILTER_PERIOD to CCM\n");
- }
-#endif
-
if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_IGNORE_DTIM, pConfig->fIgnoreDtim,
NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
{
diff --git a/CORE/MAC/inc/wniCfgAp.h b/CORE/MAC/inc/wniCfgAp.h
index 2753c49..3befdb5 100644
--- a/CORE/MAC/inc/wniCfgAp.h
+++ b/CORE/MAC/inc/wniCfgAp.h
@@ -273,90 +273,89 @@
#define WNI_CFG_MAX_PS_POLL 208
#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE 209
#define WNI_CFG_RSSI_FILTER_PERIOD 210
-#define WNI_CFG_FT_RSSI_FILTER_PERIOD 211
-#define WNI_CFG_MIN_RSSI_THRESHOLD 212
-#define WNI_CFG_NTH_BEACON_FILTER 213
-#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE 214
-#define WNI_CFG_SCAN_IN_POWERSAVE 215
-#define WNI_CFG_IGNORE_DTIM 216
-#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE 217
-#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE 218
-#define WNI_CFG_WOWLAN_DEAUTH_ENABLE 219
-#define WNI_CFG_WOWLAN_DISASSOC_ENABLE 220
-#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON 221
-#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD 222
-#define WNI_CFG_BA_TIMEOUT 223
-#define WNI_CFG_BA_THRESHOLD_HIGH 224
-#define WNI_CFG_MAX_BA_BUFFERS 225
-#define WNI_CFG_MAX_BA_SESSIONS 226
-#define WNI_CFG_BA_AUTO_SETUP 227
-#define WNI_CFG_ADDBA_REQ_DECLINE 228
-#define WNI_CFG_BG_SCAN_CHANNEL_LIST 229
-#define WNI_CFG_MAX_MEDIUM_TIME 230
-#define WNI_CFG_MAX_MPDUS_IN_AMPDU 231
-#define WNI_CFG_IBSS_AUTO_BSSID 232
-#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG 233
-#define WNI_CFG_PROBE_REQ_ADDNIE_DATA 234
-#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG 235
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1 236
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2 237
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3 238
-#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG 239
-#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA 240
-#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG 241
-#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA 242
-#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG 243
-#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA 244
-#define WNI_CFG_WPS_ENABLE 245
-#define WNI_CFG_WPS_STATE 246
-#define WNI_CFG_WPS_PROBE_REQ_FLAG 247
-#define WNI_CFG_WPS_VERSION 248
-#define WNI_CFG_WPS_REQUEST_TYPE 249
-#define WNI_CFG_WPS_CFG_METHOD 250
-#define WNI_CFG_WPS_UUID 251
-#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY 252
-#define WNI_CFG_WPS_PIMARY_DEVICE_OUI 253
-#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY 254
-#define WNI_CFG_WPS_ASSOCIATION_STATE 255
-#define WNI_CFG_WPS_CONFIGURATION_ERROR 256
-#define WNI_CFG_WPS_DEVICE_PASSWORD_ID 257
-#define WNI_CFG_WPS_ASSOC_METHOD 258
-#define WNI_CFG_LOW_GAIN_OVERRIDE 259
-#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE 260
-#define WNI_CFG_RPE_POLLING_THRESHOLD 261
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG 262
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG 263
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG 264
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG 265
-#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS 266
-#define WNI_CFG_SINGLE_TID_RC 267
-#define WNI_CFG_RRM_ENABLED 268
-#define WNI_CFG_RRM_OPERATING_CHAN_MAX 269
-#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX 270
-#define WNI_CFG_TX_PWR_CTRL_ENABLE 271
-#define WNI_CFG_MCAST_BCAST_FILTER_SETTING 272
-#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK 273
-#define WNI_CFG_DYNAMIC_PS_POLL_VALUE 274
-#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT 275
-#define WNI_CFG_TELE_BCN_WAKEUP_EN 276
-#define WNI_CFG_TELE_BCN_TRANS_LI 277
-#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS 278
-#define WNI_CFG_TELE_BCN_MAX_LI 279
-#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS 280
-#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS 281
-#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD 282
-#define WNI_CFG_ASSOC_STA_LIMIT 283
-#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL 284
-#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL 285
-#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND 286
-#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD 287
-#define WNI_CFG_ENABLE_CLOSE_LOOP 288
-#define WNI_CFG_ENABLE_LTE_COEX 289
-#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT 290
-#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT 291
-#define WNI_CFG_ENABLE_MC_ADDR_LIST 292
-#define WNI_CFG_ENABLE_UC_FILTER 293
-#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION 294
+#define WNI_CFG_MIN_RSSI_THRESHOLD 211
+#define WNI_CFG_NTH_BEACON_FILTER 212
+#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE 213
+#define WNI_CFG_SCAN_IN_POWERSAVE 214
+#define WNI_CFG_IGNORE_DTIM 215
+#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE 216
+#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE 217
+#define WNI_CFG_WOWLAN_DEAUTH_ENABLE 218
+#define WNI_CFG_WOWLAN_DISASSOC_ENABLE 219
+#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON 220
+#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD 221
+#define WNI_CFG_BA_TIMEOUT 222
+#define WNI_CFG_BA_THRESHOLD_HIGH 223
+#define WNI_CFG_MAX_BA_BUFFERS 224
+#define WNI_CFG_MAX_BA_SESSIONS 225
+#define WNI_CFG_BA_AUTO_SETUP 226
+#define WNI_CFG_ADDBA_REQ_DECLINE 227
+#define WNI_CFG_BG_SCAN_CHANNEL_LIST 228
+#define WNI_CFG_MAX_MEDIUM_TIME 229
+#define WNI_CFG_MAX_MPDUS_IN_AMPDU 230
+#define WNI_CFG_IBSS_AUTO_BSSID 231
+#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG 232
+#define WNI_CFG_PROBE_REQ_ADDNIE_DATA 233
+#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG 234
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1 235
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2 236
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3 237
+#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG 238
+#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA 239
+#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG 240
+#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA 241
+#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG 242
+#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA 243
+#define WNI_CFG_WPS_ENABLE 244
+#define WNI_CFG_WPS_STATE 245
+#define WNI_CFG_WPS_PROBE_REQ_FLAG 246
+#define WNI_CFG_WPS_VERSION 247
+#define WNI_CFG_WPS_REQUEST_TYPE 248
+#define WNI_CFG_WPS_CFG_METHOD 249
+#define WNI_CFG_WPS_UUID 250
+#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY 251
+#define WNI_CFG_WPS_PIMARY_DEVICE_OUI 252
+#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY 253
+#define WNI_CFG_WPS_ASSOCIATION_STATE 254
+#define WNI_CFG_WPS_CONFIGURATION_ERROR 255
+#define WNI_CFG_WPS_DEVICE_PASSWORD_ID 256
+#define WNI_CFG_WPS_ASSOC_METHOD 257
+#define WNI_CFG_LOW_GAIN_OVERRIDE 258
+#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE 259
+#define WNI_CFG_RPE_POLLING_THRESHOLD 260
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG 261
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG 262
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG 263
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG 264
+#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS 265
+#define WNI_CFG_SINGLE_TID_RC 266
+#define WNI_CFG_RRM_ENABLED 267
+#define WNI_CFG_RRM_OPERATING_CHAN_MAX 268
+#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX 269
+#define WNI_CFG_TX_PWR_CTRL_ENABLE 270
+#define WNI_CFG_MCAST_BCAST_FILTER_SETTING 271
+#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK 272
+#define WNI_CFG_DYNAMIC_PS_POLL_VALUE 273
+#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT 274
+#define WNI_CFG_TELE_BCN_WAKEUP_EN 275
+#define WNI_CFG_TELE_BCN_TRANS_LI 276
+#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS 277
+#define WNI_CFG_TELE_BCN_MAX_LI 278
+#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS 279
+#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS 280
+#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD 281
+#define WNI_CFG_ASSOC_STA_LIMIT 282
+#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL 283
+#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL 284
+#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND 285
+#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD 286
+#define WNI_CFG_ENABLE_CLOSE_LOOP 287
+#define WNI_CFG_ENABLE_LTE_COEX 288
+#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT 289
+#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT 290
+#define WNI_CFG_ENABLE_MC_ADDR_LIST 291
+#define WNI_CFG_ENABLE_UC_FILTER 292
+#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION 293
/*
* String parameter lengths
@@ -1895,11 +1894,7 @@
#define WNI_CFG_RSSI_FILTER_PERIOD_STAMIN 0
#define WNI_CFG_RSSI_FILTER_PERIOD_STAMAX 255
-#define WNI_CFG_RSSI_FILTER_PERIOD_STADEF 20
-
-#define WNI_CFG_FT_RSSI_FILTER_PERIOD_STAMIN 0
-#define WNI_CFG_FT_RSSI_FILTER_PERIOD_STAMAX 255
-#define WNI_CFG_FT_RSSI_FILTER_PERIOD_STADEF 5
+#define WNI_CFG_RSSI_FILTER_PERIOD_STADEF 5
#define WNI_CFG_MIN_RSSI_THRESHOLD_STAMIN 0
#define WNI_CFG_MIN_RSSI_THRESHOLD_STAMAX 10
@@ -2455,10 +2450,10 @@
#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_APMAX 1
#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_APDEF 0
-#define CFG_PARAM_MAX_NUM 295
-#define CFG_AP_IBUF_MAX_SIZE 234
+#define CFG_PARAM_MAX_NUM 294
+#define CFG_AP_IBUF_MAX_SIZE 233
#define CFG_AP_SBUF_MAX_SIZE 3422
-#define CFG_STA_IBUF_MAX_SIZE 229
+#define CFG_STA_IBUF_MAX_SIZE 228
#define CFG_STA_SBUF_MAX_SIZE 3388
#define CFG_SEM_MAX_NUM 19
diff --git a/CORE/MAC/inc/wniCfgSta.h b/CORE/MAC/inc/wniCfgSta.h
index 9f91b1d..dcf380c 100644
--- a/CORE/MAC/inc/wniCfgSta.h
+++ b/CORE/MAC/inc/wniCfgSta.h
@@ -267,90 +267,89 @@
#define WNI_CFG_MAX_PS_POLL 208
#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE 209
#define WNI_CFG_RSSI_FILTER_PERIOD 210
-#define WNI_CFG_FT_RSSI_FILTER_PERIOD 211
-#define WNI_CFG_MIN_RSSI_THRESHOLD 212
-#define WNI_CFG_NTH_BEACON_FILTER 213
-#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE 214
-#define WNI_CFG_SCAN_IN_POWERSAVE 215
-#define WNI_CFG_IGNORE_DTIM 216
-#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE 217
-#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE 218
-#define WNI_CFG_WOWLAN_DEAUTH_ENABLE 219
-#define WNI_CFG_WOWLAN_DISASSOC_ENABLE 220
-#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON 221
-#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD 222
-#define WNI_CFG_BA_TIMEOUT 223
-#define WNI_CFG_BA_THRESHOLD_HIGH 224
-#define WNI_CFG_MAX_BA_BUFFERS 225
-#define WNI_CFG_MAX_BA_SESSIONS 226
-#define WNI_CFG_BA_AUTO_SETUP 227
-#define WNI_CFG_ADDBA_REQ_DECLINE 228
-#define WNI_CFG_BG_SCAN_CHANNEL_LIST 229
-#define WNI_CFG_MAX_MEDIUM_TIME 230
-#define WNI_CFG_MAX_MPDUS_IN_AMPDU 231
-#define WNI_CFG_IBSS_AUTO_BSSID 232
-#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG 233
-#define WNI_CFG_PROBE_REQ_ADDNIE_DATA 234
-#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG 235
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1 236
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2 237
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3 238
-#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG 239
-#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA 240
-#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG 241
-#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA 242
-#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG 243
-#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA 244
-#define WNI_CFG_WPS_ENABLE 245
-#define WNI_CFG_WPS_STATE 246
-#define WNI_CFG_WPS_PROBE_REQ_FLAG 247
-#define WNI_CFG_WPS_VERSION 248
-#define WNI_CFG_WPS_REQUEST_TYPE 249
-#define WNI_CFG_WPS_CFG_METHOD 250
-#define WNI_CFG_WPS_UUID 251
-#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY 252
-#define WNI_CFG_WPS_PIMARY_DEVICE_OUI 253
-#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY 254
-#define WNI_CFG_WPS_ASSOCIATION_STATE 255
-#define WNI_CFG_WPS_CONFIGURATION_ERROR 256
-#define WNI_CFG_WPS_DEVICE_PASSWORD_ID 257
-#define WNI_CFG_WPS_ASSOC_METHOD 258
-#define WNI_CFG_LOW_GAIN_OVERRIDE 259
-#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE 260
-#define WNI_CFG_RPE_POLLING_THRESHOLD 261
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG 262
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG 263
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG 264
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG 265
-#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS 266
-#define WNI_CFG_SINGLE_TID_RC 267
-#define WNI_CFG_RRM_ENABLED 268
-#define WNI_CFG_RRM_OPERATING_CHAN_MAX 269
-#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX 270
-#define WNI_CFG_TX_PWR_CTRL_ENABLE 271
-#define WNI_CFG_MCAST_BCAST_FILTER_SETTING 272
-#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK 273
-#define WNI_CFG_DYNAMIC_PS_POLL_VALUE 274
-#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT 275
-#define WNI_CFG_TELE_BCN_WAKEUP_EN 276
-#define WNI_CFG_TELE_BCN_TRANS_LI 277
-#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS 278
-#define WNI_CFG_TELE_BCN_MAX_LI 279
-#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS 280
-#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS 281
-#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD 282
-#define WNI_CFG_ASSOC_STA_LIMIT 283
-#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL 284
-#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL 285
-#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND 286
-#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD 287
-#define WNI_CFG_ENABLE_CLOSE_LOOP 288
-#define WNI_CFG_ENABLE_LTE_COEX 289
-#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT 290
-#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT 291
-#define WNI_CFG_ENABLE_MC_ADDR_LIST 292
-#define WNI_CFG_ENABLE_UC_FILTER 293
-#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION 294
+#define WNI_CFG_MIN_RSSI_THRESHOLD 211
+#define WNI_CFG_NTH_BEACON_FILTER 212
+#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE 213
+#define WNI_CFG_SCAN_IN_POWERSAVE 214
+#define WNI_CFG_IGNORE_DTIM 215
+#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE 216
+#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE 217
+#define WNI_CFG_WOWLAN_DEAUTH_ENABLE 218
+#define WNI_CFG_WOWLAN_DISASSOC_ENABLE 219
+#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON 220
+#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD 221
+#define WNI_CFG_BA_TIMEOUT 222
+#define WNI_CFG_BA_THRESHOLD_HIGH 223
+#define WNI_CFG_MAX_BA_BUFFERS 224
+#define WNI_CFG_MAX_BA_SESSIONS 225
+#define WNI_CFG_BA_AUTO_SETUP 226
+#define WNI_CFG_ADDBA_REQ_DECLINE 227
+#define WNI_CFG_BG_SCAN_CHANNEL_LIST 228
+#define WNI_CFG_MAX_MEDIUM_TIME 229
+#define WNI_CFG_MAX_MPDUS_IN_AMPDU 230
+#define WNI_CFG_IBSS_AUTO_BSSID 231
+#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG 232
+#define WNI_CFG_PROBE_REQ_ADDNIE_DATA 233
+#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG 234
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1 235
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2 236
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3 237
+#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG 238
+#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA 239
+#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG 240
+#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA 241
+#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG 242
+#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA 243
+#define WNI_CFG_WPS_ENABLE 244
+#define WNI_CFG_WPS_STATE 245
+#define WNI_CFG_WPS_PROBE_REQ_FLAG 246
+#define WNI_CFG_WPS_VERSION 247
+#define WNI_CFG_WPS_REQUEST_TYPE 248
+#define WNI_CFG_WPS_CFG_METHOD 249
+#define WNI_CFG_WPS_UUID 250
+#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY 251
+#define WNI_CFG_WPS_PIMARY_DEVICE_OUI 252
+#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY 253
+#define WNI_CFG_WPS_ASSOCIATION_STATE 254
+#define WNI_CFG_WPS_CONFIGURATION_ERROR 255
+#define WNI_CFG_WPS_DEVICE_PASSWORD_ID 256
+#define WNI_CFG_WPS_ASSOC_METHOD 257
+#define WNI_CFG_LOW_GAIN_OVERRIDE 258
+#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE 259
+#define WNI_CFG_RPE_POLLING_THRESHOLD 260
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG 261
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG 262
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG 263
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG 264
+#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS 265
+#define WNI_CFG_SINGLE_TID_RC 266
+#define WNI_CFG_RRM_ENABLED 267
+#define WNI_CFG_RRM_OPERATING_CHAN_MAX 268
+#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX 269
+#define WNI_CFG_TX_PWR_CTRL_ENABLE 270
+#define WNI_CFG_MCAST_BCAST_FILTER_SETTING 271
+#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK 272
+#define WNI_CFG_DYNAMIC_PS_POLL_VALUE 273
+#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT 274
+#define WNI_CFG_TELE_BCN_WAKEUP_EN 275
+#define WNI_CFG_TELE_BCN_TRANS_LI 276
+#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS 277
+#define WNI_CFG_TELE_BCN_MAX_LI 278
+#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS 279
+#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS 280
+#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD 281
+#define WNI_CFG_ASSOC_STA_LIMIT 282
+#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL 283
+#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL 284
+#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND 285
+#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD 286
+#define WNI_CFG_ENABLE_CLOSE_LOOP 287
+#define WNI_CFG_ENABLE_LTE_COEX 288
+#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT 289
+#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT 290
+#define WNI_CFG_ENABLE_MC_ADDR_LIST 291
+#define WNI_CFG_ENABLE_UC_FILTER 292
+#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION 293
/*
* String parameter lengths
@@ -1292,11 +1291,7 @@
#define WNI_CFG_RSSI_FILTER_PERIOD_STAMIN 0
#define WNI_CFG_RSSI_FILTER_PERIOD_STAMAX 255
-#define WNI_CFG_RSSI_FILTER_PERIOD_STADEF 20
-
-#define WNI_CFG_FT_RSSI_FILTER_PERIOD_STAMIN 0
-#define WNI_CFG_FT_RSSI_FILTER_PERIOD_STAMAX 255
-#define WNI_CFG_FT_RSSI_FILTER_PERIOD_STADEF 5
+#define WNI_CFG_RSSI_FILTER_PERIOD_STADEF 5
#define WNI_CFG_MIN_RSSI_THRESHOLD_STAMIN 0
#define WNI_CFG_MIN_RSSI_THRESHOLD_STAMAX 10
@@ -1600,8 +1595,8 @@
#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STAMAX 1
#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STADEF 0
-#define CFG_PARAM_MAX_NUM 295
-#define CFG_STA_IBUF_MAX_SIZE 229
+#define CFG_PARAM_MAX_NUM 294
+#define CFG_STA_IBUF_MAX_SIZE 228
#define CFG_STA_SBUF_MAX_SIZE 3388
#define CFG_SEM_MAX_NUM 19
diff --git a/CORE/MAC/src/cfg/cfgParamName.c b/CORE/MAC/src/cfg/cfgParamName.c
index 96fae7d..b868caf 100644
--- a/CORE/MAC/src/cfg/cfgParamName.c
+++ b/CORE/MAC/src/cfg/cfgParamName.c
@@ -264,7 +264,6 @@
(unsigned char *)"MAX_PS_POLL",
(unsigned char *)"NUM_BEACON_PER_RSSI_AVERAGE",
(unsigned char *)"RSSI_FILTER_PERIOD",
- (unsigned char *)"FT_RSSI_FILTER_PERIOD",
(unsigned char *)"MIN_RSSI_THRESHOLD",
(unsigned char *)"NTH_BEACON_FILTER",
(unsigned char *)"BROADCAST_FRAME_FILTER_ENABLE",
diff --git a/CORE/MAC/src/cfg/cfgUtil/cfg.txt b/CORE/MAC/src/cfg/cfgUtil/cfg.txt
index a448149..5f37b8e 100644
--- a/CORE/MAC/src/cfg/cfgUtil/cfg.txt
+++ b/CORE/MAC/src/cfg/cfgUtil/cfg.txt
@@ -3255,21 +3255,6 @@
WNI_CFG_RSSI_FILTER_PERIOD I 4 5
V RW NP
LIM
-0 255 20
-NV RW NP
-LIM
-0 255 20
-
-*
-* Period for which Firmware will collect the
-* RSSI stats. Its in units of beacon interval.
-* Rssi Filter period should always be >=
-* the num_beacon_per_rssi_average.
-* This value is used ONLY for CCX and 11r Fasttransition
-*
-WNI_CFG_FT_RSSI_FILTER_PERIOD I 4 5
-V RW NP
-LIM
0 255 5
NV RW NP
LIM
diff --git a/CORE/MAC/src/pe/pmm/pmmApi.c b/CORE/MAC/src/pe/pmm/pmmApi.c
index c27b6c9..9c8f343 100644
--- a/CORE/MAC/src/pe/pmm/pmmApi.c
+++ b/CORE/MAC/src/pe/pmm/pmmApi.c
@@ -641,7 +641,6 @@
tSirRetStatus retCode = eSIR_SUCCESS;
tSirMsgQ msgQ;
tpEnterBmpsParams pBmpsParams = NULL;
- int i=0;
tANI_U32 rssiFilterPeriod = 5;
tANI_U32 numBeaconPerRssiAverage = 5;
@@ -674,21 +673,6 @@
pmmLog(pMac, LOGP, FL("pmmCfg: cfgGet failed for Rssi monitor enable flag"));
pBmpsParams->bRssiFilterEnable = bRssiFilterEnable;
-
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
- // If there is a CCX assoc or 11r assoc we need to pick up the rssiFilterPeriod from the
- // FT config value.
- for(i =0; i < pMac->lim.maxBssId; i++)
- {
- if (limisFastTransitionRequired(pMac, i))
- {
- if(wlan_cfgGetInt(pMac, WNI_CFG_FT_RSSI_FILTER_PERIOD, &rssiFilterPeriod) != eSIR_SUCCESS)
- pmmLog(pMac, LOGP, FL("pmmCfg: cfgGet failed for Rssi filter period"));
- break;
- }
- }
-#endif
-
pBmpsParams->rssiFilterPeriod = (tANI_U8)rssiFilterPeriod;
/* The numBeaconPerRssiAverage should be less than the max allowed (default set to 20 in CFG)
diff --git a/firmware_bin/WCNSS_cfg.dat b/firmware_bin/WCNSS_cfg.dat
index 0dac5be..88c5efa 100755
--- a/firmware_bin/WCNSS_cfg.dat
+++ b/firmware_bin/WCNSS_cfg.dat
Binary files differ