From 452eb98beccb9e17b66bd9200d2c06ff9ae7a437 Mon Sep 17 00:00:00 2001
From: spuligil <spuligil@codeaurora.org>
Date: Tue, 31 Oct 2017 09:01:51 -0700
Subject: [PATCH] fw-api: CL 3655983 - update fw common interface files

Rename WMI_REQUEST_VDEV_EXTD_STAT to WMI_REQUEST_BCN_STAT
Rename the recently-added WMI_REQUEST_VDEV_EXTD_STAT flag to
WMI_REQUEST_BCN_STAT, for the sake of hosts that support both
the Rome/Helium/Lithium wlanfw_cmn.1.0.0 and the Beeliner
wlanfw_cmn.2.0 target interfaces within a single host driver
binary.(The Beeliner wlanfw_cmn.2.0 already has a
WMI_REQUEST_VDEV_EXTD_STAT def, which has a different value,
and thus conflicts with the newly-added wlanfw_cmn.1.0.0
WMI_REQUEST_VDEV_EXTD_STAT def.)
This renaming of an existing flag is backwards-incompatible,
but is acceptable in this case, due to confirmation that the
flag in question is not in use in any target or host code.

Change-Id: Ic1b5b160fc02534b7239c19447182c69caddc83f
CRs-Fixed: 1107600
---
 fw/wmi_unified.h | 10 +++++-----
 fw/wmi_version.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h
index f7da4fa915..63d4618b59 100644
--- a/fw/wmi_unified.h
+++ b/fw/wmi_unified.h
@@ -5220,7 +5220,7 @@ typedef enum {
     WMI_REQUEST_RSSI_PER_CHAIN_STAT = 0x100,
     WMI_REQUEST_CONGESTION_STAT = 0x200,
     WMI_REQUEST_PEER_EXTD_STAT = 0x400,
-    WMI_REQUEST_VDEV_EXTD_STAT = 0x800,
+    WMI_REQUEST_BCN_STAT       = 0x800,
 } wmi_stats_id;
 
 /*
@@ -5832,8 +5832,8 @@ typedef struct {
     /** number of MIB stats event structures (wmi_mib_stats) */
     A_UINT32 num_mib_stats;
     A_UINT32 pdev_id; /** pdev_id for identifying the MAC.  See macros starting with WMI_PDEV_ID_ for values. In non-DBDC case host should set it to 0. */
-    /** number of extended vdev stats event structures (wmi_vdev_extd_stats) */
-    A_UINT32 num_vdev_extd_stats;
+    /** number of beacon stats event structures (wmi_bcn_stats) */
+    A_UINT32 num_bcn_stats;
 
 /* This TLV is followed by another TLV of array of bytes
  *   A_UINT8 data[];
@@ -5844,7 +5844,7 @@ typedef struct {
  *   num_bcnflt_stats * size_of()
  *   num_chan_stats * size of(struct wmi_chan_stats)
  *   num_mib_stats * size of(struct wmi_mib_stats)
- *   num_vdev_extd_stats * size of(struct wmi_vdev_extd_stats)
+ *   num_bcn_stats * size of(struct wmi_bcn_stats)
  */
 /* If WMI_REQUEST_PEER_EXTD_STAT is set in stats_id,
  * the data[] array also contains num_peer_stats * size of wmi_peer_extd_stats
@@ -6458,7 +6458,7 @@ typedef struct {
     A_UINT32 vdev_id;
     A_UINT32 tx_bcn_succ_cnt; /* Total number of beacon frame transmitted successfully */
     A_UINT32 tx_bcn_outage_cnt; /* Total number of failed beacons */
-} wmi_vdev_extd_stats;
+} wmi_bcn_stats;
 
 /**
  *  peer statistics.
diff --git a/fw/wmi_version.h b/fw/wmi_version.h
index 9865c5c818..21012bb590 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_ 457
+#define __WMI_REVISION_ 458
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work