From 05ac7ee5594f8cd5a3fd4a0a522203252ddfeb42 Mon Sep 17 00:00:00 2001 From: Manikandan Mohan Date: Wed, 23 Dec 2015 14:18:36 -0800 Subject: [PATCH] qcacld-3.0: CL 1432708 update fw common interface files qcacld-2.0 to qcacld-3.0 propagation Update SET BPF Instructions WMI TLV with missing item. Change-Id: I691f55bb27a66e9833e87bd4c6221c505eba6454 CRs-fixed: 865207 --- target/inc/wmi_tlv_defs.h | 3 ++- target/inc/wmi_unified.h | 8 ++++++-- target/inc/wmi_version.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/target/inc/wmi_tlv_defs.h b/target/inc/wmi_tlv_defs.h index dcda8409f33f..533476121de8 100644 --- a/target/inc/wmi_tlv_defs.h +++ b/target/inc/wmi_tlv_defs.h @@ -2252,7 +2252,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_BPF_GET_VDEV_STATS_CMDID); /* bpf offload set vdev instructions cmd */ #define WMITLV_TABLE_WMI_BPF_SET_VDEV_INSTRUCTIONS_CMDID(id, op, buf, len) \ - WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_bpf_set_vdev_instructions_cmd_fixed_param, wmi_bpf_set_vdev_instructions_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_bpf_set_vdev_instructions_cmd_fixed_param, wmi_bpf_set_vdev_instructions_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, buf_inst, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_BPF_SET_VDEV_INSTRUCTIONS_CMDID); /* bpf offload delete vdev instructions cmd */ diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 80fdf0538b52..007fd5ddfcdd 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -782,8 +782,8 @@ typedef enum { /*get batch scan result */ WMI_BATCH_SCAN_TRIGGER_RESULT_CMDID, /* OEM related cmd */ - WMI_OEM_REQ_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_OEM), /* DEPRECATED */ - WMI_OEM_REQUEST_CMDID, + WMI_OEM_REQ_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_OEM), + WMI_OEM_REQUEST_CMDID, /* UNUSED */ /** Nan Request */ WMI_NAN_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_NAN), @@ -12568,6 +12568,10 @@ typedef struct wmi_bpf_set_vdev_instructions_cmd_s { A_UINT32 total_length; A_UINT32 current_offset; A_UINT32 current_length; + /* + * The TLV follows: + * A_UINT8 buf_inst[]; //Variable length buffer for the instuctions + */ } wmi_bpf_set_vdev_instructions_cmd_fixed_param; #define BPF_FILTER_ID_ALL 0xFFFFFFFF diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index c36a6d2e16c9..7de4596c671e 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/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_ 190 +#define __WMI_REVISION_ 191 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work