qcacld-3.0: Replace CONVERGED_TDLS_ENABLE feature flag

The CONVERGED_TDLS_ENABLE feature flag was originally introduced when
the TDLS feature was being componentized so that one could select
either the legacy implementation or the componentized implementation.
That componentization activity has concluded and the legacy
implementation no longer exists. To align with the current usage
switch to exclusively using the FEATURE_WLAN_TDLS feature flag since
that more accurately describes the code being protected.

Change-Id: I2cdb4c6ddba22c5b1d29e87403e5e1c87ce5cbfe
CRs-Fixed: 2395728
This commit is contained in:
Jeff Johnson 2019-02-08 07:49:17 -08:00 • committed by nshrivas
commit 2de587987d
9 changed files with 8 additions and 13 deletions

3
Kbuild
View file

@ -1029,7 +1029,7 @@ TDLS_INC := -I$(WLAN_ROOT)/$(TDLS_DIR)/dispatcher/inc \
-I$(WLAN_ROOT)/$(TDLS_OS_IF_INC) \
-I$(WLAN_ROOT)/$(TDLS_TARGET_IF_INC)
ifeq ($(CONFIG_CONVERGED_TDLS_ENABLE), y)
ifeq ($(CONFIG_QCOM_TDLS), y)
TDLS_OBJS := $(TDLS_DIR)/core/src/wlan_tdls_main.o \
$(TDLS_DIR)/core/src/wlan_tdls_cmds_process.o \
$(TDLS_DIR)/core/src/wlan_tdls_peer.o \
@ -1934,7 +1934,6 @@ cppflags-$(CONFIG_CONVERGED_P2P_ENABLE) += -DCONVERGED_P2P_ENABLE
cppflags-$(CONFIG_WLAN_POLICY_MGR_ENABLE) += -DWLAN_POLICY_MGR_ENABLE
cppflags-$(CONFIG_SUPPORT_11AX) += -DSUPPORT_11AX
cppflags-$(CONFIG_HDD_INIT_WITH_RTNL_LOCK) += -DCONFIG_HDD_INIT_WITH_RTNL_LOCK
cppflags-$(CONFIG_CONVERGED_TDLS_ENABLE) += -DCONVERGED_TDLS_ENABLE
cppflags-$(CONFIG_WLAN_CONV_SPECTRAL_ENABLE) += -DWLAN_CONV_SPECTRAL_ENABLE
cppflags-$(CONFIG_WMI_CMD_STRINGS) += -DWMI_CMD_STRINGS
cppflags-$(CONFIG_FEATURE_MONITOR_MODE_SUPPORT) += -DFEATURE_MONITOR_MODE_SUPPORT