qcacld-2.0: CL 3897491 - update fw commmon interface files
WMI: add timeout fields to the BTM config message
Change-Id: I91fe7d0f9e8762edbd3addce96d6803e820b3883
CRs-Fixed: 865207
diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h
index 91b0825..76adfcf 100644
--- a/CORE/SERVICES/COMMON/wmi_unified.h
+++ b/CORE/SERVICES/COMMON/wmi_unified.h
@@ -10040,7 +10040,8 @@
* BIT 0 : Enable/Disable the BTM offload.
* BIT 1-2 : Action on non matching candidate with cache. Used WMI_ROAM_BTM_OFLD_NON_MATCHING_CND_XXX
* BIT 3-5 : Roaming handoff decisions. Use WMI_ROAM_BTM_OFLD_CNDS_MATCH_XXX
- * BIT 6-31 : Reserved
+ * BIT 6 : Enable/Disable solicited BTM
+ * BIT 7-31 : Reserved
*/
#define WMI_ROAM_BTM_SET_ENABLE(flags, val) WMI_SET_BITS(flags, 0, 1, val)
#define WMI_ROAM_BTM_GET_ENABLE(flags) WMI_GET_BITS(flags, 0, 1)
@@ -10048,6 +10049,8 @@
#define WMI_ROAM_BTM_GET_NON_MATCHING_CND_ACTION(flags) WMI_GET_BITS(flags, 1, 2)
#define WMI_ROAM_BTM_SET_CNDS_MATCH_CONDITION(flags, val) WMI_SET_BITS(flags, 3, 3, val)
#define WMI_ROAM_BTM_GET_CNDS_MATCH_CONDITION(flags) WMI_GET_BITS(flags, 3, 3)
+#define WMI_ROAM_BTM_SET_SOLICITED_BTM_ENABLE(flags, val) WMI_SET_BITS(flags, 6, 1, val)
+#define WMI_ROAM_BTM_GET_SOLICITED_BTM_ENABLE(flags) WMI_GET_BITS(flags, 6, 1)
/** WMI_ROAM_BTM_SET_NON_MATCHING_CNDS_ACTION definition: When BTM candidate is not matched with cache by WMI_ROAM_BTM_SET_CNDS_MATCH_CONDITION, determine what to do */
#define WMI_ROAM_BTM_NON_MATCHING_CNDS_SCAN_CONSUME 0 /** Invoke roam scan and consume within firmware. Applicable only when ROAM_SCAN_MODE is enabled. If ROAM_SCAN_MODE is disabled, firmware won't scan and forward it to host */
@@ -10066,6 +10069,24 @@
A_UINT32 vdev_id;
/** BTM configuration control flags */
A_UINT32 flags;
+ /* BTM query timeout, unit: milliseconds
+ * valid value range: 1-10000,
+ * default value: 100 will be set if invalid value is given
+ */
+ A_UINT32 solicited_timeout_ms;
+ /* Maximum attempt of solicited BTM
+ * If continuous failure reach to this value, solicited BTM to current
+ * ESS will be disabled.
+ * valid value range: 1 - (2^32-1). (2^32)-1 means sending forever
+ * Default value: 3 will be set if invalid value is given
+ */
+ A_UINT32 max_attempt_cnt;
+ /* Time to stick to current AP after BTM, unit: seconds
+ * valid value range: 0 -(2^16-1).
+ * Either 0 or (2^16)-1 means stick to AP forever.
+ * Default value: 300 will be set if invalid value is given
+ */
+ A_UINT32 stick_time_seconds;
} wmi_btm_config_fixed_param;
#define WMI_ROAM_5G_BOOST_PENALIZE_ALGO_FIXED 0x0
diff --git a/CORE/SERVICES/COMMON/wmi_version.h b/CORE/SERVICES/COMMON/wmi_version.h
index 09493d3..3957aa6 100644
--- a/CORE/SERVICES/COMMON/wmi_version.h
+++ b/CORE/SERVICES/COMMON/wmi_version.h
@@ -36,7 +36,7 @@
#define __WMI_VER_MINOR_ 0
/** WMI revision number has to be incremented when there is a
* change that may or may not break compatibility. */
-#define __WMI_REVISION_ 479
+#define __WMI_REVISION_ 480
/** The Version Namespace should not be normally changed. Only
* host and firmware of the same WMI namespace will work