diff --git a/configs/sun_consolidate_kiwi-v2_defconfig b/configs/sun_consolidate_kiwi-v2_defconfig
index f0fd708265..58e3d95807 100644
--- a/configs/sun_consolidate_kiwi-v2_defconfig
+++ b/configs/sun_consolidate_kiwi-v2_defconfig
@@ -31,3 +31,4 @@ CONFIG_WLAN_RECORD_RX_PADDR=y
 CONFIG_QDF_TEST=y
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_FEATURE_WLM_STATS=y
+CONFIG_WLAN_TRACE_HIDE_MAC_ADDRESS_DISABLE=y
diff --git a/configs/sun_gki_kiwi-v2_defconfig b/configs/sun_gki_kiwi-v2_defconfig
index 30445ec688..ffb6ba3675 100644
--- a/configs/sun_gki_kiwi-v2_defconfig
+++ b/configs/sun_gki_kiwi-v2_defconfig
@@ -46,6 +46,8 @@ CONFIG_DP_PKT_ADD_TIMESTAMP=y
 CONFIG_DP_PKT_STATS_PER_LMAC=y
 CONFIG_DP_RX_BUFFER_POOL_ALLOC_THRES=5
 CONFIG_DP_RX_BUFFER_POOL_SIZE=128
+CONFIG_DP_RX_REFILL_BUFF_POOL_SIZE=2048
+CONFIG_DP_RX_REFILL_THRD_THRESHOLD=512
 CONFIG_DP_RX_DROP_RAW_FRM=y
 CONFIG_DP_RX_PKT_NO_PEER_DELIVER=y
 CONFIG_DP_RX_SPECIAL_FRAME_NEED=y
@@ -118,6 +120,7 @@ CONFIG_HIF_PCI=y
 CONFIG_HIF_REG_WINDOW_SUPPORT=y
 CONFIG_HOST_OPCLASS=y
 CONFIG_HTT_PADDR64=y
+CONFIG_IPA_OFFLOAD=y
 CONFIG_IPA_OPT_WIFI_DP=y
 CONFIG_IPA_SET_RESET_TX_DB_PA=y
 CONFIG_KIWI_HEADERS_DEF=y
@@ -222,7 +225,6 @@ CONFIG_WLAN_DEBUGFS=y
 CONFIG_WLAN_DFS_MASTER_ENABLE=y
 CONFIG_WLAN_DFS_STATIC_MEM_ALLOC=y
 CONFIG_WLAN_DIAG_VERSION=y
-CONFIG_WLAN_DISABLE_EXPORT_SYMBOL=y
 CONFIG_WLAN_DL_MODES=y
 CONFIG_WLAN_DP_DISABLE_TCL_CMD_CRED_SRNG=y
 CONFIG_WLAN_DP_DISABLE_TCL_STATUS_SRNG=y
@@ -328,10 +330,14 @@ CONFIG_WLAN_SYSFS_TDLS_PEERS=y
 CONFIG_WLAN_SYSFS_TEMPERATURE=y
 CONFIG_WLAN_SYSFS_TX_STBC=y
 CONFIG_WLAN_SYSFS_WLAN_DBG=y
+CONFIG_WLAN_SYSFS_BITRATES=y
+CONFIG_WLAN_SYSFS_RF_TEST_MODE=y
 CONFIG_WLAN_THERMAL_CFG=y
 CONFIG_WLAN_THERMAL_MULTI_CLIENT_SUPPORT=y
 CONFIG_WLAN_TRACEPOINTS=y
+CONFIG_WLAN_TSF_AUTO_REPORT=y
 CONFIG_WLAN_TSF_UPLINK_DELAY=y
+CONFIG_WLAN_TX_LATENCY_STATS=y
 CONFIG_WLAN_TWT_CONVERGED=y
 CONFIG_WLAN_TWT_SAP_PDEV_COUNT=y
 CONFIG_WLAN_TWT_SAP_STA_COUNT=y
@@ -372,6 +378,7 @@ CONFIG_CFG80211_MLD_AP_STA_CONNECT_UPSTREAM_SUPPORT=y
 CONFIG_DP_MULTIPASS_SUPPORT=y
 CONFIG_WLAN_DP_VDEV_NO_SELF_PEER=y
 CONFIG_WLAN_FEATURE_AFFINITY_MGR=y
+CONFIG_WALT_GET_CPU_TAKEN_SUPPORT=y
 CONFIG_DP_MLO_LINK_STATS_SUPPORT=y
 CONFIG_HIF_DEBUG=y
 CONFIG_WLAN_OBJMGR_DEBUG=y
@@ -385,3 +392,4 @@ CONFIG_BUS_AUTO_SUSPEND=y
 CONFIG_CNSS_OUT_OF_TREE=y
 CONFIG_SMP=y
 CONFIG_RPS=y
+CONFIG_BCN_RATECODE_ENABLE=y
diff --git a/configs/sun_gki_peach_defconfig b/configs/sun_gki_peach_defconfig
index 35adfab81f..1d5aae632e 100644
--- a/configs/sun_gki_peach_defconfig
+++ b/configs/sun_gki_peach_defconfig
@@ -47,6 +47,8 @@ CONFIG_DP_PKT_ADD_TIMESTAMP=y
 CONFIG_DP_PKT_STATS_PER_LMAC=y
 CONFIG_DP_RX_BUFFER_POOL_ALLOC_THRES=5
 CONFIG_DP_RX_BUFFER_POOL_SIZE=128
+CONFIG_DP_RX_REFILL_BUFF_POOL_SIZE=2048
+CONFIG_DP_RX_REFILL_THRD_THRESHOLD=512
 CONFIG_DP_RX_DROP_RAW_FRM=y
 CONFIG_DP_RX_PKT_NO_PEER_DELIVER=y
 CONFIG_DP_RX_SPECIAL_FRAME_NEED=y
@@ -119,6 +121,7 @@ CONFIG_HIF_PCI=y
 CONFIG_HIF_REG_WINDOW_SUPPORT=y
 CONFIG_HOST_OPCLASS=y
 CONFIG_HTT_PADDR64=y
+CONFIG_IPA_OFFLOAD=y
 CONFIG_IPA_OPT_WIFI_DP=y
 CONFIG_IPA_SET_RESET_TX_DB_PA=y
 CONFIG_KIWI_HEADERS_DEF=y
@@ -223,7 +226,6 @@ CONFIG_WLAN_DEBUGFS=y
 CONFIG_WLAN_DFS_MASTER_ENABLE=y
 CONFIG_WLAN_DFS_STATIC_MEM_ALLOC=y
 CONFIG_WLAN_DIAG_VERSION=y
-CONFIG_WLAN_DISABLE_EXPORT_SYMBOL=y
 CONFIG_WLAN_DL_MODES=y
 CONFIG_WLAN_DP_DISABLE_TCL_CMD_CRED_SRNG=y
 CONFIG_WLAN_DP_DISABLE_TCL_STATUS_SRNG=y
@@ -329,10 +331,14 @@ CONFIG_WLAN_SYSFS_TDLS_PEERS=y
 CONFIG_WLAN_SYSFS_TEMPERATURE=y
 CONFIG_WLAN_SYSFS_TX_STBC=y
 CONFIG_WLAN_SYSFS_WLAN_DBG=y
+CONFIG_WLAN_SYSFS_BITRATES=y
+CONFIG_WLAN_SYSFS_RF_TEST_MODE=y
 CONFIG_WLAN_THERMAL_CFG=y
 CONFIG_WLAN_THERMAL_MULTI_CLIENT_SUPPORT=y
 CONFIG_WLAN_TRACEPOINTS=y
+CONFIG_WLAN_TSF_AUTO_REPORT=y
 CONFIG_WLAN_TSF_UPLINK_DELAY=y
+CONFIG_WLAN_TX_LATENCY_STATS=y
 CONFIG_WLAN_TWT_CONVERGED=y
 CONFIG_WLAN_TWT_SAP_PDEV_COUNT=y
 CONFIG_WLAN_TWT_SAP_STA_COUNT=y
@@ -370,6 +376,7 @@ CONFIG_CFG80211_MLD_AP_STA_CONNECT_UPSTREAM_SUPPORT=y
 CONFIG_DP_MULTIPASS_SUPPORT=y
 CONFIG_WLAN_DP_VDEV_NO_SELF_PEER=y
 CONFIG_WLAN_FEATURE_AFFINITY_MGR=y
+CONFIG_WALT_GET_CPU_TAKEN_SUPPORT=y
 CONFIG_DP_MLO_LINK_STATS_SUPPORT=y
 CONFIG_HIF_DEBUG=y
 CONFIG_WLAN_OBJMGR_DEBUG=y
@@ -383,3 +390,5 @@ CONFIG_BUS_AUTO_SUSPEND=y
 CONFIG_CNSS_OUT_OF_TREE=y
 CONFIG_SMP=y
 CONFIG_RPS=y
+CONFIG_BCN_RATECODE_ENABLE=y
+CONFIG_4_BYTES_TLV_TAG=y
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 60d18d7940..69a73ada22 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -18822,6 +18822,18 @@ const struct file_operations wlan_hdd_state_fops = {
 	.release = wlan_hdd_state_ctrl_param_release,
 };
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0))
+static void wlan_hdd_class_create(struct class *class_input, const char *name)
+{
+	class_input = class_create(THIS_MODULE, name);
+}
+#else
+static void wlan_hdd_class_create(struct class *class_input, const char *name)
+{
+	class_input = class_create(name);
+}
+#endif
+
 static int  wlan_hdd_state_ctrl_param_create(void)
 {
 	unsigned int wlan_hdd_state_major = 0;
@@ -18839,8 +18851,7 @@ static int  wlan_hdd_state_ctrl_param_create(void)
 		goto dev_alloc_err;
 	}
 	wlan_hdd_state_major = MAJOR(device);
-
-	class = class_create(THIS_MODULE, WLAN_CTRL_NAME);
+	wlan_hdd_class_create(class, WLAN_CTRL_NAME);
 	if (IS_ERR(class)) {
 		pr_err("wlan_hdd_state class_create error");
 		goto class_err;
diff --git a/wlan_qcacld3_modules.bzl b/wlan_qcacld3_modules.bzl
index 94bc6d3974..3ce96b1cf8 100644
--- a/wlan_qcacld3_modules.bzl
+++ b/wlan_qcacld3_modules.bzl
@@ -2200,6 +2200,15 @@ def _define_module_for_target_variant_chipset(target, variant, chipset):
         ],
         cmd = "cat $(SRCS) > $@",
     )
+    native.genrule(
+        name = "configs/{}_defconfig_generate_perf".format(tvc),
+        outs = ["configs/{}_defconfig.generated_perf".format(tvc)],
+        srcs = [
+            "configs/{}_gki_{}_defconfig".format(target, chipset),
+        ],
+        cmd = "cat $(SRCS) > $@",
+    )
+
 
     srcs = native.glob(iglobs) + _fixed_srcs