From 66513f20835c85c7ca304dc6f1345b5d809149b3 Mon Sep 17 00:00:00 2001
From: Mahesh Kumar Kalikot Veetil <mkalikot@codeaurora.org>
Date: Fri, 6 Jan 2017 13:58:36 -0800
Subject: [PATCH] qcacmn: Fix a compilation error on QDF mem stats

Correct a dependency between MEMORY_DEBUG and WLAN_DEBUFS. QDF memory
stats is expected to be enabled only when MEMORY_DEBUG feature is
there.

Change-Id: Id14b5ccfa532660b24087f9456f99b1d41f5420c
CRs-Fixed: 1108556
---
 qdf/linux/src/qdf_mem.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/qdf/linux/src/qdf_mem.c b/qdf/linux/src/qdf_mem.c
index 8e8ad9cbb3..a364ffb1cc 100644
--- a/qdf/linux/src/qdf_mem.c
+++ b/qdf/linux/src/qdf_mem.c
@@ -96,7 +96,7 @@ u_int8_t prealloc_disabled = 1;
 qdf_declare_param(prealloc_disabled, byte);
 EXPORT_SYMBOL(prealloc_disabled);
 
-#ifdef WLAN_DEBUGFS
+#if defined WLAN_DEBUGFS && defined MEMORY_DEBUG
 
 /**
  * struct __qdf_mem_stat - qdf memory statistics
@@ -474,19 +474,24 @@ static void qdf_mem_debugfs_exit(void)
 	qdf_mem_debugfs_root = NULL;
 }
 
-#else /* WLAN_DEBUGFS */
+#else /* WLAN_DEBUGFS && MEMORY_DEBUG */
 
 static inline void qdf_mem_kmalloc_inc(qdf_size_t size) {}
 static inline void qdf_mem_dma_inc(qdf_size_t size) {}
 static inline void qdf_mem_kmalloc_dec(qdf_size_t size) {}
 static inline void qdf_mem_dma_dec(qdf_size_t size) {}
+
+#ifdef MEMORY_DEBUG
+
 static QDF_STATUS qdf_mem_debugfs_init(void)
 {
 	return QDF_STATUS_E_NOSUPPORT;
 }
 static void qdf_mem_debugfs_exit(void) {}
 
-#endif /* WLAN_DEBUGFS */
+#endif
+
+#endif /* WLAN_DEBUGFS && MEMORY_DEBUG */
 
 /**
  * __qdf_mempool_init() - Create and initialize memory pool