From acd3a070da25235c157af0da6a2f7af44a920a87 Mon Sep 17 00:00:00 2001
From: Vevek Venkatesan <vevekv@codeaurora.org>
Date: Tue, 25 Jun 2019 19:01:19 +0530
Subject: [PATCH] qcacmn: enable DP AP Bridge when SAP mode turned on

Enable DP AP Bridge when SAP mode turned on, CONFIG_MCL cleanup.

Change-Id: I96fa3c263064fe4e438c98246d02dbc50437984b
---
 dp/wifi3.0/dp_main.c |  8 ++++++++
 dp/wifi3.0/dp_rx.c   | 10 ----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c
index fb538ec349c6..1e7e26ab0082 100644
--- a/dp/wifi3.0/dp_main.c
+++ b/dp/wifi3.0/dp_main.c
@@ -4684,6 +4684,14 @@ static struct cdp_vdev *dp_vdev_attach_wifi3(struct cdp_pdev *txrx_pdev,
 	qdf_spin_unlock_bh(&pdev->vdev_list_lock);
 	pdev->vdev_count++;
 
+	if (wlan_op_mode_sta != vdev->opmode)
+		vdev->ap_bridge_enabled = true;
+	else
+		vdev->ap_bridge_enabled = false;
+	QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO,
+		  "%s: wlan_cfg_ap_bridge_enabled %d",
+		  __func__, vdev->ap_bridge_enabled);
+
 	dp_tx_vdev_attach(vdev);
 
 	if (pdev->vdev_count == 1)
diff --git a/dp/wifi3.0/dp_rx.c b/dp/wifi3.0/dp_rx.c
index 37b9b4e4c988..86617ec71191 100644
--- a/dp/wifi3.0/dp_rx.c
+++ b/dp/wifi3.0/dp_rx.c
@@ -40,20 +40,10 @@
 #define DP_RX_TID_SAVE(_nbuf, _tid)
 #endif
 
-#ifdef CONFIG_MCL
-static inline bool dp_rx_check_ap_bridge(struct dp_vdev *vdev)
-{
-	if (vdev->opmode != wlan_op_mode_sta)
-		return true;
-	else
-		return false;
-}
-#else
 static inline bool dp_rx_check_ap_bridge(struct dp_vdev *vdev)
 {
 	return vdev->ap_bridge_enabled;
 }
-#endif
 
 /*
  * dp_rx_dump_info_and_assert() - dump RX Ring info and Rx Desc info