From dad267ec7d4da8266f2f482407420535c7215c99 Mon Sep 17 00:00:00 2001
From: Mukul Sharma <mukul@codeaurora.org>
Date: Sat, 4 Feb 2017 13:25:34 +0530
Subject: [PATCH] qcacld-3.0: Add global_lmac_if support for components

Add global_lmac_if support for components.

Change-Id: I914447dccb1e005e25378d69ace02f06b9b5112b
CRs-Fixed: 2002384
---
 Kbuild                  | 14 ++++++++++++--
 core/wma/src/wma_main.c | 14 +++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Kbuild b/Kbuild
index 7956b74ef23e..b8c4b1dc300a 100644
--- a/Kbuild
+++ b/Kbuild
@@ -824,6 +824,14 @@ TARGET_IF_INC := -I$(WLAN_COMMON_INC)/target_if/core/inc \
 TARGET_IF_OBJ := $(TARGET_IF_DIR)/core/src/target_if_main.o \
 		$(TARGET_IF_DIR)/init_deinit/src/service_ready_event_handler.o
 
+########### GLOBAL_LMAC_IF ##########
+GLOBAL_LMAC_IF_DIR := $(WLAN_COMMON_ROOT)/global_lmac_if
+
+GLOBAL_LMAC_IF_INC := -I$(WLAN_COMMON_INC)/global_lmac_if/inc \
+                      -I$(WLAN_COMMON_INC)/global_lmac_if/src
+
+GLOBAL_LMAC_IF_OBJ := $(GLOBAL_LMAC_IF_DIR)/src/wlan_global_lmac_if.o
+
 ########### WMI ###########
 WMI_ROOT_DIR := wmi
 
@@ -1155,7 +1163,8 @@ INCS :=		$(HDD_INC) \
 		$(QDF_INC) \
 		$(CDS_INC) \
 		$(DFS_INC) \
-		$(TARGET_IF_INC)
+		$(TARGET_IF_INC) \
+		$(GLOBAL_LMAC_IF_INC)
 
 INCS +=		$(WMA_INC) \
 		$(UAPI_INC) \
@@ -1223,7 +1232,8 @@ OBJS +=		$(WMA_OBJS) \
 OBJS +=		$(HIF_OBJS) \
 		$(BMI_OBJS) \
 		$(HTT_OBJS) \
-		$(TARGET_IF_OBJ)
+		$(TARGET_IF_OBJ) \
+		$(GLOBAL_LMAC_IF_OBJ)
 
 ifeq ($(CONFIG_LITHIUM), y)
 OBJS += 	$(HAL_OBJS)
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index 9032cc27061f..ddc646e4019b 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -83,7 +83,7 @@
 #include "wlan_lmac_if_def.h"
 #include "wlan_lmac_if_api.h"
 #include "target_if.h"
-
+#include "wlan_global_lmac_if_api.h"
 
 #include <cdp_txrx_handle.h>
 #define WMA_LOG_COMPLETION_TIMER 10000 /* 10 seconds */
@@ -1835,12 +1835,12 @@ static void wma_target_if_open(tp_wma_handle wma_handle)
 	if (!psoc)
 		return;
 
-	wlan_lmac_if_assign_tx_registration_cb(WLAN_DEV_OL,
-					       wma_register_tx_ops_handler);
+	wlan_global_lmac_if_set_txops_registration_cb(WLAN_DEV_OL,
+					target_if_register_tx_ops);
+	wlan_lmac_if_set_umac_txops_registration_cb(
+		wma_register_tx_ops_handler);
+	wlan_global_lmac_if_open(psoc);
 
-	wlan_lmac_if_open(psoc);
-
-	/* Register WMI event handler */
 }
 
 /**
@@ -1856,7 +1856,7 @@ static void wma_target_if_close(tp_wma_handle wma_handle)
 	if (!psoc)
 		return;
 
-	wlan_lmac_if_close(psoc);
+	wlan_global_lmac_if_close(psoc);
 }
 
 /**