From 8e8d8f1e82bfc4b5336befb8830109fb615a618b Mon Sep 17 00:00:00 2001
From: Venkata Sharath Chandra Manchala <vmanchal@codeaurora.org>
Date: Fri, 13 Jan 2017 00:00:58 -0800
Subject: [PATCH] qcacmn: Fix for compilation issues in REO management

Added suitable typecasting for qdf_set_bit and
qdf_clear_bit functions

Change-Id: I90fc0f441a6eae8dfdea43705373fced81b26b48
CRs-Fixed: 1105853
---
 dp/wifi3.0/dp_peer.c   | 4 +++-
 dp/wifi3.0/dp_rx_err.c | 4 ++++
 hal/wifi3.0/hal_reo.c  | 7 ++++---
 hal/wifi3.0/hal_reo.h  | 1 +
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c
index f709c9039a4d..e1b711d8a6be 100644
--- a/dp/wifi3.0/dp_peer.c
+++ b/dp/wifi3.0/dp_peer.c
@@ -24,7 +24,9 @@
 #include "dp_peer.h"
 #include <hal_api.h>
 #include <hal_reo.h>
-
+#ifdef CONFIG_MCL
+#include <cds_ieee80211_common.h>
+#endif
 /* Temporary definitions to be moved to wlan_cfg */
 static inline uint32_t wlan_cfg_max_peer_id(void *wlan_cfg_ctx)
 {
diff --git a/dp/wifi3.0/dp_rx_err.c b/dp/wifi3.0/dp_rx_err.c
index 8322bb33847f..f719f06a4e67 100644
--- a/dp/wifi3.0/dp_rx_err.c
+++ b/dp/wifi3.0/dp_rx_err.c
@@ -23,7 +23,11 @@
 #include "hal_api.h"
 #include "qdf_trace.h"
 #include "qdf_nbuf.h"
+#ifdef CONFIG_MCL
+#include <cds_ieee80211_common.h>
+#else
 #include <ieee80211.h>
+#endif
 
 /**
  * dp_rx_cookie_2_link_desc_va() - Converts cookie to a virtual address of
diff --git a/hal/wifi3.0/hal_reo.c b/hal/wifi3.0/hal_reo.c
index e1e9aa10323a..3c68b693db26 100644
--- a/hal/wifi3.0/hal_reo.c
+++ b/hal/wifi3.0/hal_reo.c
@@ -217,7 +217,7 @@ inline int hal_reo_cmd_unblock_cache(void *reo_ring, struct hal_soc *soc,
 
 {
 	uint32_t *reo_desc, val;
-	uint8_t index;
+	uint8_t index = 0;
 
 	hal_srng_access_start(soc, reo_ring);
 
@@ -709,7 +709,7 @@ inline void hal_reo_flush_cache_status(uint32_t *reo_desc, struct hal_soc *soc,
 					BLOCK_ERROR_DETAILS,
 					val);
 	if (!st->block_error)
-		qdf_set_bit(soc->index, &soc->reo_res_bitmap);
+		qdf_set_bit(soc->index, (unsigned long *)&soc->reo_res_bitmap);
 
 	/* cache flush status */
 	val = reo_desc[HAL_OFFSET_DW(REO_FLUSH_CACHE_STATUS_2,
@@ -764,7 +764,8 @@ inline void hal_reo_unblock_cache_status(uint32_t *reo_desc,
 					 val);
 
 	if (!st->error && (st->unblock_type == UNBLOCK_RES_INDEX))
-		qdf_clear_bit(soc->index, &soc->reo_res_bitmap);
+		qdf_clear_bit(soc->index,
+			     (unsigned long *)&soc->reo_res_bitmap);
 }
 
 inline void hal_reo_flush_timeout_list_status(
diff --git a/hal/wifi3.0/hal_reo.h b/hal/wifi3.0/hal_reo.h
index 1d80c1cf138c..b34f55f27a7f 100644
--- a/hal/wifi3.0/hal_reo.h
+++ b/hal/wifi3.0/hal_reo.h
@@ -19,6 +19,7 @@
 #ifndef _HAL_REO_H_
 #define _HAL_REO_H_
 
+#include <qdf_types.h>
 /* HW headers */
 #include <reo_descriptor_threshold_reached_status.h>
 #include <reo_flush_queue.h>