diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2022-08-14 18:26:52 -0700 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2022-08-14 18:26:52 -0700 |
| commit | 2659fc5bc818f6ea587921a7e36d57f7a7f34894 (patch) | |
| tree | ca5b5f5d05f88b430cd61d734f5a5c3313bd2d37 | |
| parent | fb62f0801f8655d4b0a66e6811902715c84c4f8c (diff) | |
| parent | b90e16652ca08258a908f780f051cd53daa8cf0f (diff) | |
| download | wlan-fw-api-android-msm-redbull-4.19-android14-release.tar.gz | |
Merge android-msm-pixel-4.19-tm-qpr1 into android-msm-pixel-4.19android-u-qpr3-beta-2_r0.1android-u-qpr3-beta-2.1_r0.6android-u-qpr3-beta-1_r0.6android-u-qpr2-beta-3_r0.1android-u-qpr2-beta-3.1_r0.6android-u-qpr2-beta-1_r0.8android-u-qpr1-beta-1_r0.6android-u-preview-2_r0.1android-u-preview-1_r0.1android-u-beta-5_r0.6android-u-beta-5.3_r0.6android-u-beta-5.2_r0.2android-u-beta-4_r0.6android-u-beta-3_r0.1android-u-beta-2_r0.1android-u-beta-2.1_r0.1android-u-beta-1_r0.2android-14.0.0_r0.68android-14.0.0_r0.58android-14.0.0_r0.47android-14.0.0_r0.46android-14.0.0_r0.32android-14.0.0_r0.20android-14.0.0_r0.12android-14.0.0_r0.1android-msm-redbull-4.19-u-preview-2android-msm-redbull-4.19-u-preview-1android-msm-redbull-4.19-u-beta5.3android-msm-redbull-4.19-u-beta5.2android-msm-redbull-4.19-u-beta5android-msm-redbull-4.19-u-beta4android-msm-redbull-4.19-u-beta3android-msm-redbull-4.19-u-beta2android-msm-redbull-4.19-u-beta1android-msm-redbull-4.19-android14-releaseandroid-msm-redbull-4.19-android14-qpr3-betaandroid-msm-redbull-4.19-android14-qpr2-betaandroid-msm-redbull-4.19-android14-qpr2android-msm-redbull-4.19-android14-qpr1-betaandroid-msm-redbull-4.19-android14-qpr1android-msm-redbull-4.19-android14
SBMerger: 442815275
Change-Id: Ie9f7167c15c4af448650677decc5e9be967593c4
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | fw/wmi_unified.h | 2 | ||||
| -rw-r--r-- | fw/wmi_version.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 3859f73..449caa5 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -6935,6 +6935,8 @@ typedef enum { /* Param to enable/disable PCIE HW ILP */ WMI_PDEV_PARAM_PCIE_HW_ILP, + /* Param to disable Hardware Assist feature */ + WMI_PDEV_PARAM_DISABLE_HW_ASSIST = 0xCF, } WMI_PDEV_PARAM; #define WMI_PDEV_ONLY_BSR_TRIG_IS_ENABLED(trig_type) WMI_GET_BITS(trig_type, 0, 1) diff --git a/fw/wmi_version.h b/fw/wmi_version.h index bec929d..f30a5ff 100644 --- a/fw/wmi_version.h +++ b/fw/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_ 882 +#define __WMI_REVISION_ 945 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work |