From 260fd0882ca5faed5408e608ae3504e565e565be Mon Sep 17 00:00:00 2001 From: Guisen Yang Date: Tue, 24 Sep 2019 16:55:54 +0800 Subject: [PATCH] qcacld-3.0: Remove hif_exec from NAPI switch When NAPI is disabled, there are some failures show that certain APIs are not defined, these APIs are not NAPI related and defined in hif_exec.c. But this file will not be compiled when CONFIG_WLAN_NAPI is not defined. Remove this build constraint and encap the NAPI related APIs with CONFIG_WLAN_NAPI in file hif_exec.c. Meanwhile add the HIF_CE_DIR for USB and SDIO case, otherwise it has build error after hif_exe.c move to the common directory. Change-Id: Ie1a32f6abbe2d361e126c361a2522ae0500139e9 CRs-Fixed: 2532586 --- Kbuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Kbuild b/Kbuild index 9e577602a493..e0cbc71e7578 100644 --- a/Kbuild +++ b/Kbuild @@ -1613,23 +1613,25 @@ endif ifeq ($(CONFIG_HIF_USB), y) HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_DISPATCHER_DIR) HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_USB_DIR) +HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_CE_DIR) endif ifeq ($(CONFIG_HIF_SDIO), y) HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_DISPATCHER_DIR) HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_SDIO_DIR) HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_SDIO_NATIVE_INC_DIR) +HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_CE_DIR) endif HIF_COMMON_OBJS := $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/ath_procfs.o \ - $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/hif_main.o + $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/hif_main.o \ + $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/hif_exec.o ifneq ($(CONFIG_LITHIUM), y) HIF_COMMON_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/hif_main_legacy.o endif ifeq ($(CONFIG_WLAN_NAPI), y) -HIF_COMMON_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/hif_exec.o HIF_COMMON_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/hif_irq_affinity.o endif