qcacld-3.0: Complete the NAN component movement into CLD
NAN related OS IF, Target IF and component files have been
merged into CLD. Add Makefile changes, include correct
files, replace lmac tx/rx ops with the new ops and call
updated API's such as init/deinit.
Complete the remaining changes for moving NAN component
into CLD.
Change-Id: Idcf8816337aa49b399596ce3cdfc9cdab811d386
CRs-Fixed: 2338060
diff --git a/Kbuild b/Kbuild
index 157c696..d1a6154 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1365,19 +1365,19 @@
endif
######################### NAN #########################
-NAN_CORE_DIR := $(WLAN_COMMON_ROOT)/umac/nan/core/src
-NAN_CORE_INC := -I$(WLAN_COMMON_INC)/umac/nan/core/inc
-NAN_UCFG_DIR := $(WLAN_COMMON_ROOT)/umac/nan/dispatcher/src
-NAN_UCFG_INC := -I$(WLAN_COMMON_INC)/umac/nan/dispatcher/inc
-NAN_TGT_DIR := $(WLAN_COMMON_ROOT)/target_if/nan/src
-NAN_TGT_INC := -I$(WLAN_COMMON_INC)/target_if/nan/inc
-NAN_OS_IF_DIR := $(WLAN_COMMON_ROOT)/os_if/linux/nan/src
-NAN_OS_IF_INC := -I$(WLAN_COMMON_INC)/os_if/linux/nan/inc
+NAN_CORE_DIR := components/nan/core/src
+NAN_CORE_INC := -I$(WLAN_ROOT)/components/nan/core/inc
+NAN_UCFG_DIR := components/nan/dispatcher/src
+NAN_UCFG_INC := -I$(WLAN_ROOT)/components/nan/dispatcher/inc
+NAN_TGT_DIR := components/target_if/nan/src
+NAN_TGT_INC := -I$(WLAN_ROOT)/components/target_if/nan/inc
+
+NAN_OS_IF_DIR := os_if/nan/src
+NAN_OS_IF_INC := -I$(WLAN_ROOT)/os_if/nan/inc
ifeq ($(CONFIG_NAN_CONVERGENCE), y)
WLAN_NAN_OBJS := $(NAN_CORE_DIR)/nan_main.o \
$(NAN_CORE_DIR)/nan_api.o \
- $(NAN_CORE_DIR)/nan_utils.o \
$(NAN_UCFG_DIR)/nan_ucfg_api.o \
$(NAN_UCFG_DIR)/cfg_nan.o \
$(NAN_TGT_DIR)/target_if_nan.o \