From 33ba728fae3713f495c345460776bc286c7bdecc Mon Sep 17 00:00:00 2001
From: Vevek Venkatesan <vevekv@codeaurora.org>
Date: Thu, 6 Jun 2019 19:06:47 +0530
Subject: [PATCH] qcacmn: CONFIG_MCL cleanup in DP layer

CONFIG_MCL cleanup in DP layer.

Change-Id: Icc9947aac290496b3d1bb708639b392815b82070
CRs-Fixed: 2467193
---
 dp/inc/cdp_txrx_stats_struct.h | 3 ---
 dp/wifi3.0/dp_peer.c           | 4 ----
 dp/wifi3.0/dp_rx_defrag.h      | 4 ----
 dp/wifi3.0/dp_rx_err.c         | 3 ---
 dp/wifi3.0/dp_types.h          | 4 ++--
 5 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/dp/inc/cdp_txrx_stats_struct.h b/dp/inc/cdp_txrx_stats_struct.h
index d87b9e9e49..54aea8b1de 100644
--- a/dp/inc/cdp_txrx_stats_struct.h
+++ b/dp/inc/cdp_txrx_stats_struct.h
@@ -23,9 +23,6 @@
  */
 #ifndef _CDP_TXRX_STATS_STRUCT_H_
 #define _CDP_TXRX_STATS_STRUCT_H_
-#ifdef CONFIG_MCL
-#include <wlan_defs.h>
-#endif
 #define TXRX_STATS_LEVEL_OFF   0
 #define TXRX_STATS_LEVEL_BASIC 1
 #define TXRX_STATS_LEVEL_FULL  2
diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c
index 210a768723..6b0c0ad7cb 100644
--- a/dp/wifi3.0/dp_peer.c
+++ b/dp/wifi3.0/dp_peer.c
@@ -27,10 +27,6 @@
 #include "dp_rx.h"
 #include <hal_api.h>
 #include <hal_reo.h>
-#ifdef CONFIG_MCL
-#include <cds_ieee80211_common.h>
-#include <cds_api.h>
-#endif
 #include <cdp_txrx_handle.h>
 #include <wlan_cfg.h>
 
diff --git a/dp/wifi3.0/dp_rx_defrag.h b/dp/wifi3.0/dp_rx_defrag.h
index 0c24f88cf3..0cfc840351 100644
--- a/dp/wifi3.0/dp_rx_defrag.h
+++ b/dp/wifi3.0/dp_rx_defrag.h
@@ -21,10 +21,6 @@
 
 #include "hal_rx.h"
 
-#ifdef CONFIG_MCL
-#include <cds_ieee80211_common.h>
-#endif
-
 #define DEFRAG_IEEE80211_KEY_LEN	8
 #define DEFRAG_IEEE80211_FCS_LEN	4
 
diff --git a/dp/wifi3.0/dp_rx_err.c b/dp/wifi3.0/dp_rx_err.c
index c0e16fe6b6..aeb13a5254 100644
--- a/dp/wifi3.0/dp_rx_err.c
+++ b/dp/wifi3.0/dp_rx_err.c
@@ -24,9 +24,6 @@
 #include "hal_api.h"
 #include "qdf_trace.h"
 #include "qdf_nbuf.h"
-#ifdef CONFIG_MCL
-#include <cds_ieee80211_common.h>
-#endif
 #include "dp_rx_defrag.h"
 #ifdef FEATURE_WDS
 #include "dp_txrx_wds.h"
diff --git a/dp/wifi3.0/dp_types.h b/dp/wifi3.0/dp_types.h
index 8bab926be9..9527782de3 100644
--- a/dp/wifi3.0/dp_types.h
+++ b/dp/wifi3.0/dp_types.h
@@ -30,10 +30,10 @@
 #include <htt_common.h>
 
 #include <cdp_txrx_cmn.h>
-#ifdef CONFIG_MCL
+#ifdef DP_MOB_DEFS
 #include <cds_ieee80211_common.h>
-#include <wdi_event_api.h>    /* WDI subscriber event list */
 #endif
+#include <wdi_event_api.h>    /* WDI subscriber event list */
 
 #include "hal_hw_headers.h"
 #include <hal_tx.h>