diff --git a/Kbuild b/Kbuild
index 6459bf19e2e6..7a30b7187ef6 100644
--- a/Kbuild
+++ b/Kbuild
@@ -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
diff --git a/components/cfg/cfg_all.h b/components/cfg/cfg_all.h
index 8d93faa92f7a..0570b71e9d2d 100644
--- a/components/cfg/cfg_all.h
+++ b/components/cfg/cfg_all.h
@@ -29,7 +29,7 @@
 #define CFG_P2P_ALL
 #endif
 
-#ifdef CONVERGED_TDLS_ENABLE
+#ifdef FEATURE_WLAN_TDLS
 #include "wlan_tdls_cfg.h"
 #else
 #define CFG_TDLS_ALL
diff --git a/components/tdls/dispatcher/inc/wlan_tdls_ucfg_api.h b/components/tdls/dispatcher/inc/wlan_tdls_ucfg_api.h
index ba108d798fa3..63c372374d99 100644
--- a/components/tdls/dispatcher/inc/wlan_tdls_ucfg_api.h
+++ b/components/tdls/dispatcher/inc/wlan_tdls_ucfg_api.h
@@ -32,7 +32,7 @@
 #include <wlan_objmgr_pdev_obj.h>
 #include <wlan_objmgr_vdev_obj.h>
 
-#ifdef CONVERGED_TDLS_ENABLE
+#ifdef FEATURE_WLAN_TDLS
 
 /**
  * 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;
 }
 
-#endif /* CONVERGED_TDLS_ENABLE */
+#endif /* FEATURE_WLAN_TDLS */
 #endif
diff --git a/configs/default_defconfig b/configs/default_defconfig
index a6193ab4df9c..f8642f41e487 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -621,7 +621,6 @@ CONFIG_CONVERGED_P2P_ENABLE := y
 CONFIG_WLAN_POLICY_MGR_ENABLE := y
 CONFIG_SUPPORT_11AX := y
 CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
-CONFIG_CONVERGED_TDLS_ENABLE := y
 CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y
 CONFIG_WLAN_SPECTRAL_ENABLE := y
 CONFIG_WMI_CMD_STRINGS := y
diff --git a/configs/genoa.common b/configs/genoa.common
index b98937cfb6d3..ad4d2f6a8161 100644
--- a/configs/genoa.common
+++ b/configs/genoa.common
@@ -37,7 +37,6 @@ CONFIG_WLAN_PMO_ENABLE := y
 CONFIG_CONVERGED_P2P_ENABLE := y
 CONFIG_WLAN_POLICY_MGR_ENABLE := y
 CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
-CONFIG_CONVERGED_TDLS_ENABLE := y
 CONFIG_WLAN_FEATURE_TWT := n
 CONFIG_WMI_CMD_STRINGS := y
 CONFIG_SOFTAP_CHANNEL_RANGE := y
diff --git a/configs/qca6174_defconfig b/configs/qca6174_defconfig
index c8121e06a408..57b14e468087 100644
--- a/configs/qca6174_defconfig
+++ b/configs/qca6174_defconfig
@@ -583,7 +583,6 @@ CONFIG_CONVERGED_P2P_ENABLE := y
 CONFIG_WLAN_POLICY_MGR_ENABLE := y
 CONFIG_SUPPORT_11AX := y
 CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
-CONFIG_CONVERGED_TDLS_ENABLE := y
 CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y
 CONFIG_WLAN_SPECTRAL_ENABLE := y
 CONFIG_WMI_CMD_STRINGS := y
diff --git a/configs/qca6390_defconfig b/configs/qca6390_defconfig
index a6e00cbf9f91..9bf02969a817 100644
--- a/configs/qca6390_defconfig
+++ b/configs/qca6390_defconfig
@@ -602,7 +602,6 @@ CONFIG_CONVERGED_P2P_ENABLE := y
 CONFIG_WLAN_POLICY_MGR_ENABLE := y
 CONFIG_SUPPORT_11AX := y
 CONFIG_HDD_INIT_WITH_RTNL_LOCK := y
-CONFIG_CONVERGED_TDLS_ENABLE := y
 CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y
 CONFIG_WLAN_SPECTRAL_ENABLE := y
 CONFIG_WMI_CMD_STRINGS := y
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index c79e6d9f50a5..0095634bac74 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -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)
 {
 	struct wlan_objmgr_psoc *psoc = hdd_ctx->psoc;
diff --git a/os_if/tdls/inc/wlan_cfg80211_tdls.h b/os_if/tdls/inc/wlan_cfg80211_tdls.h
index 0e12284c79c2..1f8d7f2e9529 100644
--- a/os_if/tdls/inc/wlan_cfg80211_tdls.h
+++ b/os_if/tdls/inc/wlan_cfg80211_tdls.h
@@ -33,7 +33,7 @@
 #include <qdf_types.h>
 #include <wlan_tdls_ucfg_api.h>
 
-#ifdef CONVERGED_TDLS_ENABLE
+#ifdef FEATURE_WLAN_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);
 
-#else /* CONVERGED_TDLS_ENABLE */
+#else /* FEATURE_WLAN_TDLS */
 static inline
 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_ */