From 4ef2f38cb0aafac0cdfc8ae3fb5a02b1d678060d Mon Sep 17 00:00:00 2001 From: spuligil Date: Fri, 1 Nov 2019 18:00:34 -0700 Subject: [PATCH] fw-api: CL 8595725 - update fw common interface files Change-Id: I7535699c258fe4ade8ec37760af158a4effe72b3 WMI: fix WWMI -> WMI macro name typo, add vdev_id to peer_config_vlan_cmd CRs-Fixed: 2262693 --- fw/wmi_unified.h | 22 ++++++++++++---------- fw/wmi_version.h | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 058ba3591d10..0f162bf4cc47 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -28267,7 +28267,8 @@ typedef struct { #define WMI_CFR_NDPA_NDP_ALL_EN_SET(param, value) \ WMI_SET_BITS(param, WMI_CFR_NDPA_NDP_ALL_EN_BIT_POS, 1, value) -#define WWMI_CFR_NDPA_NDP_ALL_EN_GET(param) \ +#define WWMI_CFR_NDPA_NDP_ALL_EN_GET WMI_CFR_NDPA_NDP_ALL_EN_GET +#define WMI_CFR_NDPA_NDP_ALL_EN_GET(param) \ WMI_GET_BITS(param, WMI_CFR_NDPA_NDP_ALL_EN_BIT_POS, 1) #define WMI_CFR_TA_RA_TYPE_FILTER_EN_SET(param, value) \ @@ -28276,7 +28277,8 @@ typedef struct { #define WMI_CFR_TA_RA_TYPE_FILTER_EN_GET(param) \ WMI_GET_BITS(param, WMI_CFR_TA_RA_TYPE_FILTER_EN_BIT_POS, 1) -#define WWMI_CFR_ALL_PACKET_EN_SET(param, value) \ +#define WWMI_CFR_ALL_PACKET_EN_SET WMI_CFR_ALL_PACKET_EN_SET +#define WMI_CFR_ALL_PACKET_EN_SET(param, value) \ WMI_SET_BITS(param, WMI_CFR_ALL_PACKET_EN_BIT_POS, 1, value) #define WMI_CFR_ALL_PACKET_EN_GET(param) \ @@ -28443,7 +28445,7 @@ typedef struct { #define WMI_TX_STRIP_INSERT_VLAN_OUTER_SET(param, value) \ WMI_SET_BITS(param, WMI_TX_STRIP_INSERT_VLAN_OUTER_BIT_POS, 1, value) -#define WWMI_TX_STRIP_INSERT_VLAN_OUTER_GET(param) \ +#define WMI_TX_STRIP_INSERT_VLAN_OUTER_GET(param) \ WMI_GET_BITS(param, WMI_TX_STRIP_INSERT_VLAN_OUTER_BIT_POS, 1) #define WMI_RX_STRIP_VLAN_C_TAG_SET(param, value) \ @@ -28452,38 +28454,36 @@ typedef struct { #define WMI_RX_STRIP_VLAN_C_TAG_GET(param) \ WMI_GET_BITS(param, WMI_RX_STRIP_VLAN_C_TAG_BIT_POS, 1) -#define WWMI_RX_STRIP_VLAN_S_TAG_SET(param, value) \ +#define WMI_RX_STRIP_VLAN_S_TAG_SET(param, value) \ WMI_SET_BITS(param, WMI_RX_STRIP_VLAN_S_TAG_BIT_POS, 1, value) #define WMI_RX_STRIP_VLAN_S_TAG_GET(param) \ WMI_GET_BITS(param, WMI_RX_STRIP_VLAN_S_TAG_BIT_POS, 1) -#define WWMI_RX_INSERT_VLAN_C_TAG_SET(param, value) \ +#define WMI_RX_INSERT_VLAN_C_TAG_SET(param, value) \ WMI_SET_BITS(param, WMI_RX_INSERT_VLAN_C_TAG_BIT_POS, 1, value) #define WMI_RX_INSERT_VLAN_C_TAG_GET(param) \ WMI_GET_BITS(param, WMI_RX_INSERT_VLAN_C_TAG_BIT_POS, 1) -#define WWMI_RX_INSERT_VLAN_S_TAG_SET(param, value) \ +#define WMI_RX_INSERT_VLAN_S_TAG_SET(param, value) \ WMI_SET_BITS(param, WMI_RX_INSERT_VLAN_S_TAG_BIT_POS, 1, value) #define WMI_RX_INSERT_VLAN_S_TAG_GET(param) \ WMI_GET_BITS(param, WMI_RX_INSERT_VLAN_S_TAG_BIT_POS, 1) -#define WWMI_TX_INSERT_VLAN_INNER_TCI_SET(param, value) \ +#define WMI_TX_INSERT_VLAN_INNER_TCI_SET(param, value) \ WMI_SET_BITS(param, WMI_TX_INSERT_VLAN_INNER_TCI_BIT_POS, WMI_TX_INSERT_VLAN_INNER_TCI_NUM_BITS, value) #define WMI_TX_INSERT_VLAN_INNER_TCI_GET(param) \ WMI_GET_BITS(param, WMI_TX_INSERT_VLAN_INNER_TCI_BIT_POS, WMI_TX_INSERT_VLAN_INNER_TCI_NUM_BITS) -#define WWMI_TX_INSERT_VLAN_OUTER_TCI_SET(param, value) \ +#define WMI_TX_INSERT_VLAN_OUTER_TCI_SET(param, value) \ WMI_SET_BITS(param, WMI_TX_INSERT_VLAN_OUTER_TCI_BIT_POS, WMI_TX_INSERT_VLAN_OUTER_TCI_NUM_BITS, value) #define WMI_TX_INSERT_VLAN_OUTER_TCI_GET(param) \ WMI_GET_BITS(param, WMI_TX_INSERT_VLAN_OUTER_TCI_BIT_POS, WMI_TX_INSERT_VLAN_OUTER_TCI_NUM_BITS) - - typedef struct { /** TLV tag and len; tag equals * WMITLV_TAG_STRUC_wmi_peer_config_vlan_cmd_fixed_param */ @@ -28520,6 +28520,8 @@ typedef struct { * Bits 16:31 insert_vlan_outer_tci */ A_UINT32 insert_vlan_tci; + /* VDEV identifier */ + A_UINT32 vdev_id; } wmi_peer_config_vlan_cmd_fixed_param; diff --git a/fw/wmi_version.h b/fw/wmi_version.h index 75f09bffa77e..a901577a8c08 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_ 733 +#define __WMI_REVISION_ 734 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work