diff --git a/configs/qcs40x.snoc.perf_defconfig b/configs/qcs40x.snoc.perf_defconfig
index 9b6894afd24b..17a24d7819b4 100644
--- a/configs/qcs40x.snoc.perf_defconfig
+++ b/configs/qcs40x.snoc.perf_defconfig
@@ -4,7 +4,7 @@ CONFIG_QCACLD_WLAN_LFR3 := y
 CONFIG_QCOM_TDLS := y
 CONFIG_QCACLD_FEATURE_GREEN_AP := y
 CONFIG_QCOM_VOWIFI_11R := y
-CONFIG_WLAN_FEATURE_FILS := n
+CONFIG_WLAN_FEATURE_FILS := y
 CONFIG_WLAN_FEATURE_11W := y
 CONFIG_QCOM_LTE_COEX := n
 CONFIG_WLAN_FEATURE_LPSS := n
@@ -161,12 +161,32 @@ CONFIG_WLAN_OFFLOAD_PACKETS := y
 CONFIG_WLAN_SYNC_TSF := y
 CONFIG_WLAN_SYNC_TSF_PLUS := y
 CONFIG_WLAN_SYNC_TSF_PLUS_NOIRQ := y
-CONFIG_WLAN_FEATURE_DISA := y
-CONFIG_WLAN_FEATURE_FIPS := y
+CONFIG_WLAN_FEATURE_DISA := n
+CONFIG_WLAN_FEATURE_FIPS := n
 CONFIG_WLAN_FEATURE_SAE := y
 CONFIG_GTK_OFFLOAD := y
 CONFIG_QCACLD_FEATURE_COEX_CONFIG := y
 CONFIG_QCACLD_FEATURE_MPTA_HELPER := y
+CONFIG_WMI_ROAM_SUPPORT := y
+CONFIG_WMI_STA_SUPPORT := y
+CONFIG_REG_CLIENT := y
+CONFIG_WLAN_FEATURE_DP_BUS_BANDWIDTH := y
+CONFIG_WMI_CONCURRENCY_SUPPORT := y
+CONFIG_LL_DP_SUPPORT := y
+
+ifeq ($(CONFIG_QCA_WIFI_FTM), y)
+
+ifeq ($(CONFIG_NL80211_TESTMODE), y)
+	QCA_WIFI_FTM_NL80211 :=y
+else
+	QCA_WIFI_FTM_NL80211 :=n
+endif
+	CONFIG_LINUX_QCMBR :=y
+
+else
+	QCA_WIFI_FTM_NL80211 :=n
+	CONFIG_LINUX_QCMBR :=n
+endif
 
 ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP), y)
 ifneq ($(WLAN_DISABLE_BUILD_TAG), y)
diff --git a/core/hdd/src/wlan_hdd_tsf.c b/core/hdd/src/wlan_hdd_tsf.c
index f4116f333660..7a9d01f8a3a1 100644
--- a/core/hdd/src/wlan_hdd_tsf.c
+++ b/core/hdd/src/wlan_hdd_tsf.c
@@ -430,12 +430,6 @@ static bool hdd_tsf_cap_sync_send(struct hdd_adapter *adapter)
 }
 #elif defined(WLAN_FEATURE_TSF_PLUS) && \
 	!defined(WLAN_FEATURE_TSF_PLUS_EXT_GPIO_SYNC)
-static uint32_t
-hdd_wlan_retry_tsf_cap(struct hdd_adapter *adapter)
-{
-	return 0;
-}
-
 static void
 hdd_wlan_restart_tsf_cap(struct hdd_adapter *adapter)
 {
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index 0ba282c8a667..5d5f98baf052 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -7747,7 +7747,7 @@ static int iw_get_policy_manager_ut_ops(struct hdd_context *hdd_ctx,
  *
  * Return: void
  */
-#if WLAN_DEBUG
+#ifdef WLAN_DEBUG
 static void hdd_ch_avoid_unit_cmd(struct hdd_context *hdd_ctx,
 				  int num_args, int *apps_args)
 {
diff --git a/core/mac/src/pe/include/lim_trace.h b/core/mac/src/pe/include/lim_trace.h
index df95acc8514b..80a656ac4376 100644
--- a/core/mac/src/pe/include/lim_trace.h
+++ b/core/mac/src/pe/include/lim_trace.h
@@ -32,20 +32,6 @@
 #include "lim_global.h"
 #include "mac_trace.h"
 #include "qdf_trace.h"
-#ifdef LIM_TRACE_RECORD
-
-#define LIM_TRACE_GET_SSN(data)    (((data) >> 16) & 0xff)
-#define LIM_TRACE_GET_SUBTYPE(data)    (data & 0xff)
-#define LIM_TRACE_GET_DEFRD_OR_DROPPED(data) (data & 0xc0000000)
-
-#define LIM_MSG_PROCESSED 0
-#define LIM_MSG_DEFERRED   1
-#define LIM_MSG_DROPPED     2
-
-#define LIM_TRACE_MAKE_RXMGMT(type, ssn) \
-	((ssn << 16) | (type))
-#define LIM_TRACE_MAKE_RXMSG(msg, action) \
-	((msg) | (action << 30))
 
 enum {
 	TRACE_CODE_MLM_STATE,
@@ -67,6 +53,21 @@ enum {
 	TRACE_CODE_INFO_LOG
 };
 
+#ifdef LIM_TRACE_RECORD
+
+#define LIM_TRACE_GET_SSN(data)    (((data) >> 16) & 0xff)
+#define LIM_TRACE_GET_SUBTYPE(data)    ((data) & 0xff)
+#define LIM_TRACE_GET_DEFRD_OR_DROPPED(data) ((data) & 0xc0000000)
+
+#define LIM_MSG_PROCESSED 0
+#define LIM_MSG_DEFERRED   1
+#define LIM_MSG_DROPPED     2
+
+#define LIM_TRACE_MAKE_RXMGMT(type, ssn) \
+	(((ssn) << 16) | (type))
+#define LIM_TRACE_MAKE_RXMSG(msg, action) \
+	((msg) | ((action) << 30))
+
 void lim_trace_init(struct mac_context *mac);
 uint8_t *lim_trace_get_mlm_state_string(uint32_t mlmState);
 uint8_t *lim_trace_get_sme_state_string(uint32_t smeState);
diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c
index 47619f6c576f..f8509d034ea4 100644
--- a/core/sap/src/sap_module.c
+++ b/core/sap/src/sap_module.c
@@ -1336,7 +1336,6 @@ static inline void sap_start_csa_restart(struct mac_context *mac,
  *
  * Return: string reason
  */
-#ifdef WLAN_DEBUG
 static char *sap_get_csa_reason_str(enum sap_csa_reason_code reason)
 {
 	switch (reason) {
@@ -1364,7 +1363,6 @@ static char *sap_get_csa_reason_str(enum sap_csa_reason_code reason)
 		return "UNKNOWN";
 	}
 }
-#endif
 
 QDF_STATUS wlansap_set_channel_change_with_csa(struct sap_context *sap_ctx,
 					       uint32_t target_chan_freq,
diff --git a/os_if/tdls/src/wlan_cfg80211_tdls.c b/os_if/tdls/src/wlan_cfg80211_tdls.c
index 6b270591bb73..8f4e231424bb 100644
--- a/os_if/tdls/src/wlan_cfg80211_tdls.c
+++ b/os_if/tdls/src/wlan_cfg80211_tdls.c
@@ -34,6 +34,7 @@
 #include <wlan_utility.h>
 #include <wlan_reg_services_api.h>
 #include "wlan_cfg80211_mc_cp_stats.h"
+#include "sir_api.h"
 
 
 #define TDLS_MAX_NO_OF_2_4_CHANNELS 14