diff --git a/dp/inc/cdp_txrx_stats_struct.h b/dp/inc/cdp_txrx_stats_struct.h
index 66f94ffff7..7f72301fff 100644
--- a/dp/inc/cdp_txrx_stats_struct.h
+++ b/dp/inc/cdp_txrx_stats_struct.h
@@ -1269,7 +1269,7 @@ struct cdp_pdev_stats {
 	struct cdp_tid_stats tid_stats;
 };
 
-#ifndef CONFIG_MCL
+#ifdef QCA_ENH_V3_STATS_SUPPORT
 /*
  * Enumeration of PDEV Configuration parameter
  */
diff --git a/dp/wifi3.0/dp_internal.h b/dp/wifi3.0/dp_internal.h
index 9fabf18210..7d12461394 100644
--- a/dp/wifi3.0/dp_internal.h
+++ b/dp/wifi3.0/dp_internal.h
@@ -91,7 +91,7 @@
 
 #ifdef WLAN_TX_PKT_CAPTURE_ENH
 extern uint8_t
-dp_cpu_ring_map[DP_NSS_CPU_RING_MAP_MAX][WLAN_CFG_INT_NUM_CONTEXTS];
+dp_cpu_ring_map[DP_NSS_CPU_RING_MAP_MAX][WLAN_CFG_INT_NUM_CONTEXTS_MAX];
 #endif
 
 #if DP_PRINT_ENABLE
diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c
index f6f44aafd7..a96a0d8e79 100644
--- a/dp/wifi3.0/dp_main.c
+++ b/dp/wifi3.0/dp_main.c
@@ -89,6 +89,14 @@ QDF_COMPILE_TIME_ASSERT(hif_event_history_size,
 			(HIF_EVENT_HIST_MAX & (HIF_EVENT_HIST_MAX - 1)) == 0);
 #endif /* WLAN_FEATURE_DP_EVENT_HISTORY */
 
+/*
+ * If WLAN_CFG_INT_NUM_CONTEXTS is changed,
+ * WLAN_CFG_INT_NUM_CONTEXTS_MAX should also be updated
+ */
+QDF_COMPILE_TIME_ASSERT(wlan_cfg_num_int_ctxs,
+			WLAN_CFG_INT_NUM_CONTEXTS_MAX >=
+			WLAN_CFG_INT_NUM_CONTEXTS);
+
 #ifdef WLAN_RX_PKT_CAPTURE_ENH
 #include "dp_rx_mon_feature.h"
 #else
@@ -216,37 +224,17 @@ static uint8_t default_pcp_tid_map[PCP_TID_MAP_MAX] = {
 /**
  * @brief Cpu to tx ring map
  */
-#ifdef CONFIG_WIN
-#ifdef WLAN_TX_PKT_CAPTURE_ENH
 uint8_t
-dp_cpu_ring_map[DP_NSS_CPU_RING_MAP_MAX][WLAN_CFG_INT_NUM_CONTEXTS] = {
+dp_cpu_ring_map[DP_NSS_CPU_RING_MAP_MAX][WLAN_CFG_INT_NUM_CONTEXTS_MAX] = {
 	{0x0, 0x1, 0x2, 0x0, 0x0, 0x1, 0x2, 0x0, 0x0, 0x1, 0x2},
 	{0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1},
 	{0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0},
 	{0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2},
 	{0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3},
+#ifdef WLAN_TX_PKT_CAPTURE_ENH
 	{0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1}
-};
-#else
-static uint8_t
-dp_cpu_ring_map[DP_NSS_CPU_RING_MAP_MAX][WLAN_CFG_INT_NUM_CONTEXTS] = {
-	{0x0, 0x1, 0x2, 0x0, 0x0, 0x1, 0x2, 0x0, 0x0, 0x1, 0x2},
-	{0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1},
-	{0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0},
-	{0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2},
-	{0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3}
-};
 #endif
-#else
-static uint8_t
-dp_cpu_ring_map[DP_NSS_CPU_RING_MAP_MAX][WLAN_CFG_INT_NUM_CONTEXTS] = {
-	{0x0, 0x1, 0x2, 0x0, 0x0, 0x1, 0x2},
-	{0x1, 0x2, 0x1, 0x2, 0x1, 0x2, 0x1},
-	{0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x0},
-	{0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2},
-	{0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3}
 };
-#endif
 
 /**
  * @brief Select the type of statistics
diff --git a/hal/wifi3.0/hal_srng.c b/hal/wifi3.0/hal_srng.c
index 7e2bcf4287..a49f4fdddb 100644
--- a/hal/wifi3.0/hal_srng.c
+++ b/hal/wifi3.0/hal_srng.c
@@ -244,19 +244,19 @@ static void hal_target_based_configure(struct hal_soc *hal)
 		hal_qca6390_attach(hal);
 	break;
 #endif
-#if defined(QCA_WIFI_QCA8074) && defined(CONFIG_WIN)
+#if defined(QCA_WIFI_QCA8074) && defined(WIFI_TARGET_TYPE_3_0)
 	case TARGET_TYPE_QCA8074:
 		hal_qca8074_attach(hal);
 	break;
 #endif
 
-#if defined(QCA_WIFI_QCA8074V2) && defined(CONFIG_WIN)
+#if defined(QCA_WIFI_QCA8074V2)
 	case TARGET_TYPE_QCA8074V2:
 		hal_qca8074v2_attach(hal);
 	break;
 #endif
 
-#if defined(QCA_WIFI_QCA6018) && defined(CONFIG_WIN)
+#if defined(QCA_WIFI_QCA6018)
 	case TARGET_TYPE_QCA6018:
 		hal_qca8074v2_attach(hal);
 	break;
diff --git a/wlan_cfg/wlan_cfg.h b/wlan_cfg/wlan_cfg.h
index 4c575631e9..b7e717b86f 100644
--- a/wlan_cfg/wlan_cfg.h
+++ b/wlan_cfg/wlan_cfg.h
@@ -45,6 +45,8 @@
 #define NUM_RXDMA_RINGS_PER_PDEV 1
 #endif
 
+#define WLAN_CFG_INT_NUM_CONTEXTS_MAX 11
+
 /* Tx configuration */
 #define MAX_LINK_DESC_BANKS 8
 #define MAX_TXDESC_POOLS 4