From 6a9a784f347f63790706f7bcd2d212d59daaf91c Mon Sep 17 00:00:00 2001 From: c_manjee Date: Wed, 11 Jan 2017 15:17:26 +0530 Subject: qcacld-3.0: CL 2776384 - update fw common interface files wmi changes for ANQP randomization Change-Id: I49e59125320ce5f079b8dc6c86d4b43775829238 CRs-Fixed: 865207 --- target/inc/wmi_tlv_defs.h | 12 ++++++++++++ target/inc/wmi_unified.h | 22 ++++++++++++++++++++++ target/inc/wmi_version.h | 2 +- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/target/inc/wmi_tlv_defs.h b/target/inc/wmi_tlv_defs.h index a11b3b37d9cb..f257716945c6 100644 --- a/target/inc/wmi_tlv_defs.h +++ b/target/inc/wmi_tlv_defs.h @@ -782,6 +782,8 @@ typedef enum { WMITLV_TAG_STRUC_wmi_radio_chan_stats, WMITLV_TAG_STRUC_wmi_radio_chan_stats_event_fixed_param, WMITLV_TAG_STRUC_wmi_roam_per_config_fixed_param, + WMITLV_TAG_STRUC_wmi_vdev_add_mac_addr_to_rx_filter_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_vdev_add_mac_addr_to_rx_filter_status_event_fixed_param, } WMITLV_TAG_ID; /* @@ -1098,6 +1100,7 @@ typedef enum { OP(WMI_11D_SCAN_STOP_CMDID) \ OP(WMI_REQUEST_RADIO_CHAN_STATS_CMDID) \ OP(WMI_ROAM_PER_CONFIG_CMDID) \ + OP(WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_CMDID) \ /* add new CMD_LIST elements above this line */ /* @@ -1269,6 +1272,7 @@ typedef enum { OP(WMI_REG_CHAN_LIST_CC_EVENTID) \ OP(WMI_11D_NEW_COUNTRY_EVENTID) \ OP(WMI_RADIO_CHAN_STATS_EVENTID) \ + OP(WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_STATUS_EVENTID) \ /* add new EVT_LIST elements above this line */ /* TLV definitions of WMI commands */ @@ -3148,6 +3152,10 @@ WMITLV_CREATE_PARAM_STRUC(WMI_11D_SCAN_STOP_CMDID); #define WMITLV_TABLE_WMI_REQUEST_RADIO_CHAN_STATS_CMDID(id, op, buf, len) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_request_radio_chan_stats_cmd_fixed_param, wmi_request_radio_chan_stats_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_REQUEST_RADIO_CHAN_STATS_CMDID); +/* mac randomization cmd */ +#define WMITLV_TABLE_WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_vdev_add_mac_addr_to_rx_filter_cmd_fixed_param, wmi_vdev_add_mac_addr_to_rx_filter_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_CMDID); /************************** TLV definitions of WMI events *******************************/ @@ -4206,6 +4214,10 @@ WMITLV_CREATE_PARAM_STRUC(WMI_RADIO_CHAN_STATS_EVENTID); #define WMITLV_TABLE_WMI_PKGID_EVENTID(id, op, buf, len) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pkgid_event_fixed_param, wmi_pkgid_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_PKGID_EVENTID); +/* mac randomization event */ +#define WMITLV_TABLE_WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_STATUS_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_vdev_add_mac_addr_to_rx_filter_status_event_fixed_param, wmi_vdev_add_mac_addr_to_rx_filter_status_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) + WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_STATUS_EVENTID); #ifdef __cplusplus diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 950e7fc65254..607fdb11d330 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -418,6 +418,8 @@ typedef enum { /* DISA feature: Encrypt-decrypt data request */ WMI_VDEV_ENCRYPT_DECRYPT_DATA_REQ_CMDID, + /** Command to enable mac randomizaton **/ + WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_CMDID, /* peer specific commands */ @@ -1150,6 +1152,8 @@ typedef enum { * 802.11 DISA frame */ WMI_VDEV_ENCRYPT_DECRYPT_DATA_RESP_EVENTID, + /** event to report mac randomization success **/ + WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_STATUS_EVENTID, /* peer specific events */ /** FW reauet to kick out the station for reasons like inactivity,lack of response ..etc */ @@ -18714,6 +18718,7 @@ static INLINE A_UINT8 *wmi_id_to_name(A_UINT32 wmi_command) WMI_RETURN_STRING(WMI_REQUEST_PEER_STATS_INFO_CMDID); WMI_RETURN_STRING(WMI_REQUEST_RADIO_CHAN_STATS_CMDID); WMI_RETURN_STRING(WMI_ROAM_PER_CONFIG_CMDID); + WMI_RETURN_STRING(WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_CMDID); } return "Invalid WMI cmd"; @@ -18882,6 +18887,22 @@ typedef struct { */ A_UINT32 value; } wmi_pkgid_event_fixed_param; +typedef struct { + A_UINT32 tlv_header; /* TLV tag and len; tag equals +WMITLV_TAG_STRUC_wmi_vdev_add_mac_addr_to_rx_filter_cmd_fixed_params */ + A_UINT32 vdev_id; /* vdev id whose mac to be randomized */ + /* enable is set to 1 if mac randomization to be enabled */ + A_UINT32 enable; + /* randomization mac address if randomization is enabled */ + wmi_mac_addr mac_addr; +} wmi_vdev_add_mac_addr_to_rx_filter_cmd_fixed_param; + +typedef struct { + A_UINT32 tlv_header; /* TLV tag and len; tag equals +WMITLV_TAG_STRUC_wmi_vdev_add_mac_addr_to_rx_filter_event_fixed_params */ + A_UINT32 vdev_id; /* vdev of id whose mac address was randomized */ + A_UINT32 status; /* status is 1 if success and 0 if failed */ +} wmi_vdev_add_mac_addr_to_rx_filter_status_event_fixed_param; /* ADD NEW DEFS HERE */ @@ -18895,6 +18916,7 @@ typedef struct { /* NOTE: Make sure these data structures are identical to those 9235 * defined in sirApi.h */ + typedef struct { /** Arbitration Inter-Frame Spacing. Range: 2-15 */ A_UINT32 aifsn; diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index fa4be574f5cb..e3d4c2cc5160 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_ 331 +#define __WMI_REVISION_ 332 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3