From 33087cb402c8e00e816b6a1916ef9fbe197689c3 Mon Sep 17 00:00:00 2001
From: Tushnim Bhattacharyya <tushnimb@codeaurora.org>
Date: Mon, 12 Aug 2019 15:58:40 -0700
Subject: [PATCH] qcacmn: Include wmi.h on the correct header files

Include wmi.h in wmi files.

Change-Id: I0584e58c5ae64e8ed93d024aa7943a9cdcdb07c8
CRs-Fixed: 2514753
---
 target_if/scan/src/target_if_scan.c | 4 +++-
 wmi/inc/wmi_unified_api.h           | 3 ---
 wmi/src/wmi_unified.c               | 2 --
 wmi/src/wmi_unified_apf_tlv.c       | 1 +
 wmi/src/wmi_unified_roam_tlv.c      | 1 +
 wmi/src/wmi_unified_vdev_api.c      | 1 +
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/target_if/scan/src/target_if_scan.c b/target_if/scan/src/target_if_scan.c
index c6b37a3337a9..c78129f5cc8a 100644
--- a/target_if/scan/src/target_if_scan.c
+++ b/target_if/scan/src/target_if_scan.c
@@ -28,7 +28,9 @@
 #include <wlan_objmgr_psoc_obj.h>
 #include <wlan_scan_tgt_api.h>
 #include <target_if.h>
-
+#ifdef FEATURE_WLAN_SCAN_PNO
+#include "wmi.h"
+#endif
 
 static inline struct wlan_lmac_if_scan_rx_ops *
 target_if_scan_get_rx_ops(struct wlan_objmgr_psoc *psoc)
diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h
index a7b0c9271c28..752059598cd1 100644
--- a/wmi/inc/wmi_unified_api.h
+++ b/wmi/inc/wmi_unified_api.h
@@ -25,9 +25,6 @@
 #define _WMI_UNIFIED_API_H_
 
 #include <osdep.h>
-#ifdef CONFIG_MCL
-#include "wmi.h"
-#endif
 #include "htc_api.h"
 #include "wmi_unified_param.h"
 #include "service_ready_param.h"
diff --git a/wmi/src/wmi_unified.c b/wmi/src/wmi_unified.c
index ccc685c40e98..13b9bb713464 100644
--- a/wmi/src/wmi_unified.c
+++ b/wmi/src/wmi_unified.c
@@ -305,7 +305,6 @@ error in MCL. Error is caused due to inclusion of wmi.h in wmi_unified_api.h
 which gets included here through ol_if_athvar.h. Eventually it is expected that
 wmi.h will be removed from wmi_unified_api.h after cleanup, which will need
 WMI_CMD_HDR to be defined here. */
-#ifdef CONFIG_WIN
 /* Copied from wmi.h */
 #undef MS
 #define MS(_v, _f) (((_v) & _f##_MASK) >> _f##_LSB)
@@ -349,7 +348,6 @@ typedef PREPACK struct {
 #define WMI_CMD_HDR_PLT_PRIV_MASK              0xff000000
 #define WMI_CMD_HDR_PLT_PRIV_OFFSET            0x00000000
 /* end of copy wmi.h */
-#endif /* CONFIG_WIN */
 
 #define WMI_MIN_HEAD_ROOM 64
 
diff --git a/wmi/src/wmi_unified_apf_tlv.c b/wmi/src/wmi_unified_apf_tlv.c
index b687bc088d38..4c235aeaa331 100644
--- a/wmi/src/wmi_unified_apf_tlv.c
+++ b/wmi/src/wmi_unified_apf_tlv.c
@@ -17,6 +17,7 @@
  */
 
 #include "wmi_unified_apf_tlv.h"
+#include "wmi.h"
 
 QDF_STATUS wmi_send_set_active_apf_mode_cmd_tlv(wmi_unified_t wmi_handle,
 					    uint8_t vdev_id,
diff --git a/wmi/src/wmi_unified_roam_tlv.c b/wmi/src/wmi_unified_roam_tlv.c
index 93fc30a20239..21f892d27d37 100644
--- a/wmi/src/wmi_unified_roam_tlv.c
+++ b/wmi/src/wmi_unified_roam_tlv.c
@@ -21,6 +21,7 @@
 
 #include <wmi_unified_priv.h>
 #include <wmi_unified_roam_api.h>
+#include "wmi.h"
 
 #ifdef FEATURE_LFR_SUBNET_DETECTION
 /**
diff --git a/wmi/src/wmi_unified_vdev_api.c b/wmi/src/wmi_unified_vdev_api.c
index 4586b6827b59..6c22cbc519e6 100644
--- a/wmi/src/wmi_unified_vdev_api.c
+++ b/wmi/src/wmi_unified_vdev_api.c
@@ -24,6 +24,7 @@
 #include <htc_api.h>
 #include <wmi_unified_priv.h>
 #include <wmi_unified_api.h>
+#include <wmi.h>
 #include <qdf_module.h>
 #include <qdf_list.h>
 #include <qdf_platform.h>