diff --git a/Kbuild b/Kbuild index 546c750e4b66..916015ae1465 100644 --- a/Kbuild +++ b/Kbuild @@ -1126,9 +1126,7 @@ ifeq ($(BUILD_DIAG_VERSION), 1) INCS += $(HOST_DIAG_LOG_INC) endif -ifeq ($(CONFIG_WLAN_CONVERGED_INTERFACE), y) INCS += $(UMAC_DISP_INC) -endif OBJS := $(HDD_OBJS) \ $(EPPING_OBJS) \ @@ -1169,9 +1167,7 @@ ifeq ($(BUILD_DIAG_VERSION), 1) OBJS += $(HOST_DIAG_LOG_OBJS) endif -ifeq ($(CONFIG_WLAN_CONVERGED_INTERFACE), y) OBJS += $(UMAC_DISP_OBJS) -endif OBJS += $(DP_OBJS) \ $(WCFG_OBJS) @@ -1450,10 +1446,6 @@ ifeq ($(CONFIG_WLAN_FEATURE_DSRC), y) CDEFINES += -DWLAN_FEATURE_DSRC endif -ifeq ($(CONFIG_WLAN_CONVERGED_INTERFACE), y) -CDEFINES += -DWLAN_CONVERGED_INTERFACE -endif - #Enable USB specific APIS ifeq ($(CONFIG_HIF_USB), 1) CDEFINES += -DHIF_USB \ diff --git a/Kconfig b/Kconfig index aa359f9a7a52..379880839f5d 100644 --- a/Kconfig +++ b/Kconfig @@ -132,8 +132,4 @@ config WLAN_FEATURE_DISA bool "Enable DISA certification feature" default n -config WLAN_CONVERGED_INTERFACE - bool "Enable WLAN UMAC converged interface" - default n - endif # QCA_CLD_WLAN diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 60fefea2e641..d10170798afc 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -79,11 +79,9 @@ #include "cdp_txrx_ipa.h" #include "cdp_txrx_misc.h" #include "wma_nan_datapath.h" - -#ifdef WLAN_CONVERGED_INTERFACE #include "wlan_lmac_if_def.h" #include "wlan_lmac_if_api.h" -#endif + #define WMA_LOG_COMPLETION_TIMER 10000 /* 10 seconds */ @@ -1805,7 +1803,6 @@ static void wma_register_debug_callback(void) qdf_register_debug_callback(QDF_MODULE_ID_WMA, &wma_state_info_dump); } -#ifdef WLAN_CONVERGED_INTERFACE /** * wma_register_tx_ops_handler() - register tx_ops of southbound * @tx_ops: tx_ops pointer in southbound @@ -1869,10 +1866,6 @@ static void wma_target_if_close(tp_wma_handle wma_handle) wlan_lmac_if_close(psoc); } -#else -static void wma_target_if_open(tp_wma_handle wma_handle) {}; -static void wma_target_if_close(tp_wma_handle wma_handle) {}; -#endif /** * wma_open() - Allocate wma context and initialize it.