From fb0a7e5c26532503b58ac32d9e9c3429bb8ee6a1 Mon Sep 17 00:00:00 2001
From: Nandha Kishore Easwaran <nandhaki@codeaurora.org>
Date: Fri, 3 Feb 2017 21:18:49 +0530
Subject: [PATCH] qcacmn: Change return type of get_vdev_rx_decap_type

Change the return type of get_vdev_rx_decap_type to htt_cmn_pkt_type
which is defined inside the cdp_if layer.

Change-Id: Ie931952e3618f8e52a5b8839648a0516132ede1f
CRs-fixed: 1075597
---
 dp/inc/cdp_txrx_ctrl.h | 10 +++++-----
 dp/inc/cdp_txrx_ops.h  |  2 +-
 dp/wifi3.0/dp_types.h  |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dp/inc/cdp_txrx_ctrl.h b/dp/inc/cdp_txrx_ctrl.h
index 3df626a4d5..5c72c72a04 100644
--- a/dp/inc/cdp_txrx_ctrl.h
+++ b/dp/inc/cdp_txrx_ctrl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -107,7 +107,7 @@ cdp_set_drop_unenc(ol_txrx_soc_handle soc,
  *  This will be used to populate the HTT desc packet type field during Tx
  *
  * @param vdev - the data virtual device object
- * @param val - the Tx encap type (htt_pkt_type)
+ * @param val - the Tx encap type (htt_cmn_pkt_type)
  * @return - void
  */
 static inline void
@@ -126,7 +126,7 @@ cdp_set_tx_encap_type(ol_txrx_soc_handle soc,
  *  decap all Rx packets into, for all peers under the VDEV.
  *
  * @param vdev - the data virtual device object
- * @param val - the Rx decap mode (htt_pkt_type)
+ * @param val - the Rx decap mode (htt_cmn_pkt_type)
  * @return - void
  */
 static inline void
@@ -143,9 +143,9 @@ cdp_set_vdev_rx_decap_type(ol_txrx_soc_handle soc,
  * @brief get the Rx decapsulation type of the VDEV
  *
  * @param vdev - the data virtual device object
- * @return - the Rx decap type (htt_pkt_type)
+ * @return - the Rx decap type (htt_cmn_pkt_type)
  */
-static inline enum htt_pkt_type
+static inline enum htt_cmn_pkt_type
 cdp_get_vdev_rx_decap_type(ol_txrx_soc_handle soc, void *vdev)
 {
 	if (soc->ops->ctrl_ops->txrx_get_vdev_rx_decap_type)
diff --git a/dp/inc/cdp_txrx_ops.h b/dp/inc/cdp_txrx_ops.h
index f6b2095a3b..ee0cd757a7 100644
--- a/dp/inc/cdp_txrx_ops.h
+++ b/dp/inc/cdp_txrx_ops.h
@@ -257,7 +257,7 @@ struct cdp_ctrl_ops {
 	 * @param vdev - the data virtual device object
 	 * @return - the Rx decap type
 	 */
-	enum htt_pkt_type
+	enum htt_cmn_pkt_type
 		(*txrx_get_vdev_rx_decap_type)(void *vdev);
 
 	/* Is this similar to ol_txrx_peer_state_update() in MCL */
diff --git a/dp/wifi3.0/dp_types.h b/dp/wifi3.0/dp_types.h
index e041005ec9..6dccf7dbaa 100644
--- a/dp/wifi3.0/dp_types.h
+++ b/dp/wifi3.0/dp_types.h
@@ -25,6 +25,7 @@
 #include <qdf_atomic.h>
 #include <qdf_util.h>
 #include <queue.h>
+#include <htt_common.h>
 
 #include <cdp_txrx_cmn.h>
 #ifndef CONFIG_WIN