samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Replace CONVERGED_TDLS_ENABLE feature flag

Browse Source 
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
parent 207671e9bd
commit 2de587987d
9 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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_OS_IF_INC) \
-I$(WLAN_ROOT)/$(TDLS_TARGET_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_OBJS := $(TDLS_DIR)/core/src/wlan_tdls_main.o \
$(TDLS_DIR)/core/src/wlan_tdls_cmds_process.o \ $(TDLS_DIR)/core/src/wlan_tdls_cmds_process.o \
$(TDLS_DIR)/core/src/wlan_tdls_peer.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_WLAN_POLICY_MGR_ENABLE) += -DWLAN_POLICY_MGR_ENABLE
cppflags-$(CONFIG_SUPPORT_11AX) += -DSUPPORT_11AX cppflags-$(CONFIG_SUPPORT_11AX) += -DSUPPORT_11AX
cppflags-$(CONFIG_HDD_INIT_WITH_RTNL_LOCK) += -DCONFIG_HDD_INIT_WITH_RTNL_LOCK 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_WLAN_CONV_SPECTRAL_ENABLE) += -DWLAN_CONV_SPECTRAL_ENABLE
cppflags-$(CONFIG_WMI_CMD_STRINGS) += -DWMI_CMD_STRINGS cppflags-$(CONFIG_WMI_CMD_STRINGS) += -DWMI_CMD_STRINGS
cppflags-$(CONFIG_FEATURE_MONITOR_MODE_SUPPORT) += -DFEATURE_MONITOR_MODE_SUPPORT cppflags-$(CONFIG_FEATURE_MONITOR_MODE_SUPPORT) += -DFEATURE_MONITOR_MODE_SUPPORT

2
components/cfg/cfg_all.h
View File

@@ -29,7 +29,7 @@
#define CFG_P2P_ALL #define CFG_P2P_ALL
#endif #endif
#ifdef CONVERGED_TDLS_ENABLE #ifdef FEATURE_WLAN_TDLS
#include "wlan_tdls_cfg.h" #include "wlan_tdls_cfg.h"
#else #else
#define CFG_TDLS_ALL #define CFG_TDLS_ALL

4
components/tdls/dispatcher/inc/wlan_tdls_ucfg_api.h
View File

@@ -32,7 +32,7 @@
#include <wlan_objmgr_pdev_obj.h> #include <wlan_objmgr_pdev_obj.h>
#include <wlan_objmgr_vdev_obj.h> #include <wlan_objmgr_vdev_obj.h>
#ifdef CONVERGED_TDLS_ENABLE #ifdef FEATURE_WLAN_TDLS
/** /**
* ucfg_tdls_init() - TDLS module initialization API * ucfg_tdls_init() - TDLS module initialization API
@@ -313,5 +313,5 @@ QDF_STATUS ucfg_tdls_teardown_links(struct wlan_objmgr_vdev *vdev)
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }
#endif /* CONVERGED_TDLS_ENABLE */ #endif /* FEATURE_WLAN_TDLS */
#endif #endif

1
configs/default_defconfig
View File

@@ -621,7 +621,6 @@ CONFIG_CONVERGED_P2P_ENABLE := y
CONFIG_WLAN_POLICY_MGR_ENABLE := y CONFIG_WLAN_POLICY_MGR_ENABLE := y
CONFIG_SUPPORT_11AX := y CONFIG_SUPPORT_11AX := y
CONFIG_HDD_INIT_WITH_RTNL_LOCK := y CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
CONFIG_CONVERGED_TDLS_ENABLE := y
CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y
CONFIG_WLAN_SPECTRAL_ENABLE := y CONFIG_WLAN_SPECTRAL_ENABLE := y
CONFIG_WMI_CMD_STRINGS := y CONFIG_WMI_CMD_STRINGS := y

1
configs/genoa.common
View File

@@ -37,7 +37,6 @@ CONFIG_WLAN_PMO_ENABLE := y
CONFIG_CONVERGED_P2P_ENABLE := y CONFIG_CONVERGED_P2P_ENABLE := y
CONFIG_WLAN_POLICY_MGR_ENABLE := y CONFIG_WLAN_POLICY_MGR_ENABLE := y
CONFIG_HDD_INIT_WITH_RTNL_LOCK := y CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
CONFIG_CONVERGED_TDLS_ENABLE := y
CONFIG_WLAN_FEATURE_TWT := n CONFIG_WLAN_FEATURE_TWT := n
CONFIG_WMI_CMD_STRINGS := y CONFIG_WMI_CMD_STRINGS := y
CONFIG_SOFTAP_CHANNEL_RANGE := y CONFIG_SOFTAP_CHANNEL_RANGE := y

1
configs/qca6174_defconfig
View File

@@ -583,7 +583,6 @@ CONFIG_CONVERGED_P2P_ENABLE := y
CONFIG_WLAN_POLICY_MGR_ENABLE := y CONFIG_WLAN_POLICY_MGR_ENABLE := y
CONFIG_SUPPORT_11AX := y CONFIG_SUPPORT_11AX := y
CONFIG_HDD_INIT_WITH_RTNL_LOCK := y CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
CONFIG_CONVERGED_TDLS_ENABLE := y
CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y
CONFIG_WLAN_SPECTRAL_ENABLE := y CONFIG_WLAN_SPECTRAL_ENABLE := y
CONFIG_WMI_CMD_STRINGS := y CONFIG_WMI_CMD_STRINGS := y

1
configs/qca6390_defconfig
View File

@@ -602,7 +602,6 @@ CONFIG_CONVERGED_P2P_ENABLE := y
CONFIG_WLAN_POLICY_MGR_ENABLE := y CONFIG_WLAN_POLICY_MGR_ENABLE := y
CONFIG_SUPPORT_11AX := y CONFIG_SUPPORT_11AX := y
CONFIG_HDD_INIT_WITH_RTNL_LOCK := y CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
CONFIG_CONVERGED_TDLS_ENABLE := y
CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y
CONFIG_WLAN_SPECTRAL_ENABLE := y CONFIG_WLAN_SPECTRAL_ENABLE := y
CONFIG_WMI_CMD_STRINGS := y CONFIG_WMI_CMD_STRINGS := y

2
core/hdd/src/wlan_hdd_main.c
View File

@@ -1256,7 +1256,7 @@ void hdd_update_macaddr(struct hdd_context *hdd_ctx,
} }
} }
#ifdef CONVERGED_TDLS_ENABLE #ifdef FEATURE_WLAN_TDLS
static int hdd_update_tdls_config(struct hdd_context *hdd_ctx) static int hdd_update_tdls_config(struct hdd_context *hdd_ctx)
{ {
struct wlan_objmgr_psoc *psoc = hdd_ctx->psoc; struct wlan_objmgr_psoc *psoc = hdd_ctx->psoc;

6
os_if/tdls/inc/wlan_cfg80211_tdls.h
View File

@@ -33,7 +33,7 @@
#include <qdf_types.h> #include <qdf_types.h>
#include <wlan_tdls_ucfg_api.h> #include <wlan_tdls_ucfg_api.h>
#ifdef CONVERGED_TDLS_ENABLE #ifdef FEATURE_WLAN_TDLS
#define TDLS_VDEV_MAGIC 0x54444c53 /* "TDLS" */ #define TDLS_VDEV_MAGIC 0x54444c53 /* "TDLS" */
@@ -270,7 +270,7 @@ void hdd_notify_sta_disconnect(uint8_t session_id,
*/ */
void hdd_notify_teardown_tdls_links(struct wlan_objmgr_vdev *vdev); void hdd_notify_teardown_tdls_links(struct wlan_objmgr_vdev *vdev);
#else /* CONVERGED_TDLS_ENABLE */ #else /* FEATURE_WLAN_TDLS */
static inline static inline
QDF_STATUS wlan_cfg80211_tdls_priv_init(struct vdev_osif_priv *osif_priv) QDF_STATUS wlan_cfg80211_tdls_priv_init(struct vdev_osif_priv *osif_priv)
{ {
@@ -316,5 +316,5 @@ void hdd_notify_teardown_tdls_links(struct wlan_objmgr_vdev *vdev)
{ {
} }
#endif /* CONVERGED_TDLS_ENABLE */ #endif /* FEATURE_WLAN_TDLS */
#endif /* _WLAN_CFG80211_TDLS_H_ */ #endif /* _WLAN_CFG80211_TDLS_H_ */