From e93c55ec425c4c83491b0b44be2e563b9a76a753 Mon Sep 17 00:00:00 2001
From: Himanshu Agarwal <himanaga@codeaurora.org>
Date: Fri, 20 May 2016 12:18:15 +0530
Subject: [PATCH] =?UTF-8?q?qcacld-3.0:=20CL=201511668=20=E2=80=93=20update?=
 =?UTF-8?q?=20fw=20common=20interface=20files?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Propagation from qcacld-2.0 to qcacld-3.0

Fix union in WMI_MAC_PHY_CAPABILITIES
WMI changes to control transmit power for beacon frames

Change-Id: I4acd731ec8850766d4d47715ff78b813281d0b6a
CRs-Fixed: 865207
---
 target/inc/wmi_tlv_defs.h |  2 +-
 target/inc/wmi_unified.h  | 16 ++++++++++------
 target/inc/wmi_version.h  |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/target/inc/wmi_tlv_defs.h b/target/inc/wmi_tlv_defs.h
index 6da8f13895..8a3178a776 100644
--- a/target/inc/wmi_tlv_defs.h
+++ b/target/inc/wmi_tlv_defs.h
@@ -3678,7 +3678,7 @@ WMITLV_CREATE_PARAM_STRUC(WMI_INST_RSSI_STATS_EVENTID);
 #define WMITLV_TABLE_WMI_RADIO_TX_POWER_LEVEL_STATS_EVENTID(id, op, buf, len) \
 	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_tx_power_level_stats_evt_fixed_param, wmi_tx_power_level_stats_evt_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
 	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, tx_time_per_power_level, WMITLV_SIZE_VAR)
-WMITLV_CREATE_PARAM_STRUC(WMI_RADIO_TX_POWER_LEVEL_STATS_EVENTID)
+WMITLV_CREATE_PARAM_STRUC(WMI_RADIO_TX_POWER_LEVEL_STATS_EVENTID);
 
 
 #ifdef __cplusplus
diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h
index 7964273798..73d394ac35 100644
--- a/target/inc/wmi_unified.h
+++ b/target/inc/wmi_unified.h
@@ -5500,6 +5500,8 @@ typedef enum {
 	 * a bit-or mask of wmi_vdev_param_filter enum values.
 	 */
 	WMI_VDEV_PARAM_RX_FILTER,
+	/* vdev-specific mgmt tx power in dBm units (signed integer value) */
+	WMI_VDEV_PARAM_MGMT_TX_POWER,
 } WMI_VDEV_PARAM;
 
 /* vdev capabilities bit mask */
@@ -15521,12 +15523,14 @@ typedef struct {
 	A_UINT32 phy_id;
 	/* supported modulations */
 	union {
-		A_UINT32 supports_11b:1,
-			 supports_11g:1,
-			 supports_11a:1,
-			 supports_11n:1,
-			 supports_11ac:1,
-			 supports_11ax:1;
+		struct {
+			A_UINT32 supports_11b:1,
+				 supports_11g:1,
+				 supports_11a:1,
+				 supports_11n:1,
+				 supports_11ac:1,
+				 supports_11ax:1;
+		};
 		A_UINT32 supported_flags;
 	};
 	/* supported bands, enum WLAN_BAND_CAPABILITY */
diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h
index f9e27b59f7..caf43d3bd3 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_ 248
+#define __WMI_REVISION_ 250
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work