From 7503f363336be18ae47a2d553d7d8850810e0634 Mon Sep 17 00:00:00 2001
From: Wu Gao <wugao@codeaurora.org>
Date: Thu, 17 May 2018 16:14:00 +0800
Subject: [PATCH] qcacmn: pmo feature flag disable

In case PMO feature flag disable, add this change. Change
WLAN_PMO_ENABLE  to WLAN_POWER_MANAGEMENT_OFFLOAD.

Change-Id: I875e568dcb239da1b86d1a76cb8cbc925bb13cde
CRs-Fixed: 2243948
---
 core/src/wlan_p2p_main.c           | 8 +++++---
 core/src/wlan_p2p_off_chan_tx.c    | 1 +
 dispatcher/src/wlan_p2p_ucfg_api.c | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/src/wlan_p2p_main.c b/core/src/wlan_p2p_main.c
index d7944cf084ad..db7c91351502 100644
--- a/core/src/wlan_p2p_main.c
+++ b/core/src/wlan_p2p_main.c
@@ -34,7 +34,7 @@
 #include "wlan_p2p_roc.h"
 #include "wlan_p2p_off_chan_tx.h"
 
-#ifdef WLAN_PMO_ENABLE
+#ifdef WLAN_POWER_MANAGEMENT_OFFLOAD
 #include <wlan_pmo_obj_mgmt_api.h>
 #endif
 
@@ -537,7 +537,7 @@ static void wlan_p2p_init_connection_status(
 }
 #endif /* WLAN_FEATURE_P2P_DEBUG */
 
-#ifdef WLAN_PMO_ENABLE
+#ifdef WLAN_POWER_MANAGEMENT_OFFLOAD
 
 /**
  * p2p_suspend_handler() - suspend handler of P2P
@@ -655,12 +655,14 @@ static inline QDF_STATUS p2p_unregister_pmo_handler(void)
 #else
 static inline QDF_STATUS p2p_register_pmo_handler(void)
 {
+	return QDF_STATUS_SUCCESS;
 }
 
 static inline QDF_STATUS p2p_unregister_pmo_handler(void)
 {
+	return QDF_STATUS_SUCCESS;
 }
-#endif /* End of WLAN_PMO_ENABLE */
+#endif /* End of WLAN_POWER_MANAGEMENT_OFFLOAD */
 
 QDF_STATUS p2p_component_init(void)
 {
diff --git a/core/src/wlan_p2p_off_chan_tx.c b/core/src/wlan_p2p_off_chan_tx.c
index d8fc89eec7b6..c74c3a0f93f0 100644
--- a/core/src/wlan_p2p_off_chan_tx.c
+++ b/core/src/wlan_p2p_off_chan_tx.c
@@ -23,6 +23,7 @@
 #include <wmi_unified_api.h>
 #include <wlan_mgmt_txrx_utils_api.h>
 #include <wlan_objmgr_psoc_obj.h>
+#include <wlan_objmgr_peer_obj.h>
 #include <wlan_utility.h>
 #include "wlan_p2p_public_struct.h"
 #include "wlan_p2p_tgt_api.h"
diff --git a/dispatcher/src/wlan_p2p_ucfg_api.c b/dispatcher/src/wlan_p2p_ucfg_api.c
index 1956b13e9bb1..162daf91b3f6 100644
--- a/dispatcher/src/wlan_p2p_ucfg_api.c
+++ b/dispatcher/src/wlan_p2p_ucfg_api.c
@@ -22,6 +22,7 @@
 
 #include <wmi_unified_api.h>
 #include <wlan_objmgr_psoc_obj.h>
+#include <wlan_objmgr_vdev_obj.h>
 #include <scheduler_api.h>
 #include "wlan_p2p_public_struct.h"
 #include "wlan_p2p_ucfg_api.h"