diff --git a/components/mlme/dispatcher/inc/cfg_mlme_lfr.h b/components/mlme/dispatcher/inc/cfg_mlme_lfr.h
index 1681339a46..3e3d72bbe1 100644
--- a/components/mlme/dispatcher/inc/cfg_mlme_lfr.h
+++ b/components/mlme/dispatcher/inc/cfg_mlme_lfr.h
@@ -64,6 +64,15 @@
# define RoamIdle_InactivePacketCount_min 0
# define RoamIdle_InactivePacketCount_max 20
# define RoamIdle_InactivePacketCount_default 5
+# define CONBEACONLOSS_TIMEOUTONWAKEUP_MIN 0
+# define CONBEACONLOSS_TIMEOUTONWAKEUP_MAX 20
+# define CONBEACONLOSS_TIMEOUTONWAKEUP_DEFAULT 6
+# define CONBEACONLOSS_TIMEOUTONSLEEP_MIN 0
+# define CONBEACONLOSS_TIMEOUTONSLEEP_MAX 20
+# define CONBEACONLOSS_TIMEOUTONSLEEP_DEFAULT 10
+# define ROAMCU_6GRSSIRANGE_MIN -70
+# define ROAMCU_6GRSSIRANGE_MAX -50
+# define ROAMCU_6GRSSIRANGE_DEFAULT -70
#else
# define RoamScan_ActiveCH_DwellTime_min 3
# define RoamScan_ActiveCH_DwellTime_max 300
@@ -104,6 +113,15 @@
# define RoamIdle_InactivePacketCount_min 0
# define RoamIdle_InactivePacketCount_max 0xFFFFFFFF
# define RoamIdle_InactivePacketCount_default 10
+# define CONBEACONLOSS_TIMEOUTONWAKEUP_MIN 0
+# define CONBEACONLOSS_TIMEOUTONWAKEUP_MAX 20
+# define CONBEACONLOSS_TIMEOUTONWAKEUP_DEFAULT 3
+# define CONBEACONLOSS_TIMEOUTONSLEEP_MIN 0
+# define CONBEACONLOSS_TIMEOUTONSLEEP_MAX 20
+# define CONBEACONLOSS_TIMEOUTONSLEEP_DEFAULT 5
+# define ROAMCU_6GRSSIRANGE_MIN -120
+# define ROAMCU_6GRSSIRANGE_MAX 0
+# define ROAMCU_6GRSSIRANGE_DEFAULT -70
#endif
/*
@@ -1848,11 +1866,30 @@
*
*
*/
+
+/*
+ *
+ * BeaconLoss_TimeoutOnWakeUp - Consecutive Beaconloss timeout on wakeup to
+ * trigger timeout
+ * @Min: 0
+ * @Max: 20
+ * @Default: 6
+ *
+ * This ini is used to control the beacon miss timeout when the system is awake.
+ * On the timeout, BMISS event will be triggered by FW.
+ * The units of this timeout is in seconds.
+ *
+ * Related: None
+ *
+ * Usage: External
+ *
+ *
+ */
#define CFG_LFR_BEACONLOSS_TIMEOUT_ON_WAKEUP CFG_INI_UINT( \
"ConBeaconLoss_TimeoutOnWakeUp", \
- 0, \
- 20, \
- 3, \
+ CONBEACONLOSS_TIMEOUTONWAKEUP_MIN, \
+ CONBEACONLOSS_TIMEOUTONWAKEUP_MAX, \
+ CONBEACONLOSS_TIMEOUTONWAKEUP_DEFAULT, \
CFG_VALUE_OR_DEFAULT, \
"ConBeaconloss timeout on wakeup")
@@ -1875,11 +1912,31 @@
*
*
*/
+
+/*
+ *
+ * BeaconLoss_TimeoutOnSleep - Consecutive Beaconloss timeout on sleep to
+ * trigger timeout
+ * @Min: 0
+ * @Max: 20
+ * @Default: 10
+ *
+ * This ini is used to control the beacon miss timeout
+ * when the system is in sleep.
+ * On the timeout, BMISS event will be triggered by FW.
+ * The units of this timeout is in seconds.
+ *
+ * Related: None
+ *
+ * Usage: External
+ *
+ *
+ */
#define CFG_LFR_BEACONLOSS_TIMEOUT_ON_SLEEP CFG_INI_UINT( \
"ConBeaconLoss_TimeoutOnSleep", \
- 0, \
- 20, \
- 5, \
+ CONBEACONLOSS_TIMEOUTONSLEEP_MIN, \
+ CONBEACONLOSS_TIMEOUTONSLEEP_MAX, \
+ CONBEACONLOSS_TIMEOUTONSLEEP_DEFAULT, \
CFG_VALUE_OR_DEFAULT, \
"ConBeaconloss timeout on sleep")
@@ -2249,11 +2306,33 @@
*
*
*/
+
+/*
+ *
+ * bss_load_trigger_6g_rssi_threshold/RoamCU_6GRSSIRange -
+ * Current AP minimum RSSI in dBm below
+ * which roaming can be triggered if BSS load exceeds bss_load_threshold.
+ * @Min: -70
+ * @Max: -50
+ * @Default: -70
+ *
+ * If connected AP is in 6Ghz, then consider bss load roam triggered only if
+ * load % > bss_load_threshold && connected AP rssi is worse than
+ * bss_load_trigger_6g_rssi_threshold
+ *
+ * Related: "bss_load_threshold"
+ *
+ * Supported Feature: Roaming
+ *
+ * Usage: Internal/External
+ *
+ *
+ */
#define CFG_BSS_LOAD_TRIG_6G_RSSI_THRES CFG_INI_INT( \
"bss_load_trigger_6g_rssi_threshold RoamCU_6GRSSIRange", \
- -120, \
- 0, \
- -70, \
+ ROAMCU_6GRSSIRANGE_MIN, \
+ ROAMCU_6GRSSIRANGE_MAX, \
+ ROAMCU_6GRSSIRANGE_DEFAULT, \
CFG_VALUE_OR_DEFAULT, \
"Minimum RSSI of current AP in 6GHz band for BSS load roam trigger")
diff --git a/components/mlme/dispatcher/inc/cfg_mlme_sta.h b/components/mlme/dispatcher/inc/cfg_mlme_sta.h
index 7a75ca8506..9a005f2ec5 100644
--- a/components/mlme/dispatcher/inc/cfg_mlme_sta.h
+++ b/components/mlme/dispatcher/inc/cfg_mlme_sta.h
@@ -24,6 +24,15 @@
#include "wlan_mlme_public_struct.h"
+#ifdef CONNECTION_ROAMING_CFG
+# define CONKEEPALIVE_INTERVAL_MIN 0
+# define CONKEEPALIVE_INTERVAL_MAX 120
+# define CONKEEPALIVE_INTERVAL_DEFAULT 30
+#else
+# define CONKEEPALIVE_INTERVAL_MIN 0
+# define CONKEEPALIVE_INTERVAL_MAX 1000
+# define CONKEEPALIVE_INTERVAL_DEFAULT 30
+#endif
/*
*
* gStaKeepAlivePeriod/ConKeepAlive_Interval - STA keep alive period
@@ -44,11 +53,32 @@
*
*
*/
+
+/*
+ *
+ * gStaKeepAlivePeriod/ConKeepAlive_Interval - STA keep alive period
+ *
+ *
+ * @Min: 0
+ * @Max: 120
+ * @Default: 30
+ *
+ * This ini is used to control how frequently STA should send NULL frames to AP
+ * (period in seconds) to notify AP of its existence.
+ *
+ * Related: None
+ *
+ * Supported Feature: STA
+ *
+ * Usage: Internal/External
+ *
+ *
+ */
#define CFG_INFRA_STA_KEEP_ALIVE_PERIOD CFG_INI_UINT( \
"gStaKeepAlivePeriod ConKeepAlive_Interval", \
- 0, \
- 1000, \
- 30, \
+ CONKEEPALIVE_INTERVAL_MIN, \
+ CONKEEPALIVE_INTERVAL_MAX, \
+ CONKEEPALIVE_INTERVAL_DEFAULT, \
CFG_VALUE_OR_DEFAULT, \
"send default NULL frame to AP")
diff --git a/components/pmo/dispatcher/inc/wlan_pmo_common_cfg.h b/components/pmo/dispatcher/inc/wlan_pmo_common_cfg.h
index e4e8f5f514..271b1d27ec 100644
--- a/components/pmo/dispatcher/inc/wlan_pmo_common_cfg.h
+++ b/components/pmo/dispatcher/inc/wlan_pmo_common_cfg.h
@@ -22,6 +22,16 @@
#include "wlan_pmo_common_public_struct.h"
+#ifdef CONNECTION_ROAMING_CFG
+# define CONDTIMSKIPPING_NUMBER_MIN 0
+# define CONDTIMSKIPPING_NUMBER_MAX 10
+# define CONDTIMSKIPPING_NUMBER_DEFAULT 3
+#else
+# define CONDTIMSKIPPING_NUMBER_MIN 0
+# define CONDTIMSKIPPING_NUMBER_MAX 10
+# define CONDTIMSKIPPING_NUMBER_DEFAULT 0
+#endif
+
/*
*
* hostArpOffload - Enable/disable host ARP offload
@@ -156,6 +166,31 @@
CFG_VALUE_OR_DEFAULT, \
"Enable Dynamic DTIM")
+/*
+ *
+ * gEnableModulatedDTIM/ConDTIMSkipping_Number - Enable/Disable modulated DTIM
+ * feature
+ * @Min: 0
+ * @Max: 10
+ * @Default: 0
+ *
+ * This ini is used to enable/disable modulated DTIM feature.
+ *
+ * 0 - Disable modulated DTIM.
+ * 1 to 10 - The maximum No. of modulated DTIM period used for calculating the
+ * target listen interval.
+ *
+ * The target listen interval will be updated to firmware when host driver is
+ * setting the suspend DTIM parameters.
+ *
+ * This configuration will be ignored when dynamic DTIM is enabled(by
+ * gEnableDynamicDTIM).
+ *
+ * Usage: External
+ *
+ *
+ */
+
/*
*
* gEnableModulatedDTIM/ConDTIMSkipping_Number - Enable/Disable modulated DTIM
@@ -182,9 +217,9 @@
*/
#define CFG_PMO_ENABLE_MODULATED_DTIM CFG_INI_UINT( \
"gEnableModulatedDTIM ConDTIMSkipping_Number", \
- 0, \
- 10, \
- 0, \
+ CONDTIMSKIPPING_NUMBER_MIN, \
+ CONDTIMSKIPPING_NUMBER_MAX, \
+ CONDTIMSKIPPING_NUMBER_DEFAULT, \
CFG_VALUE_OR_DEFAULT, \
"Enable/disable modulated DTIM feature")