diff --git a/hif/src/hif_napi.c b/hif/src/hif_napi.c
index 499c7fc726..36f6a4ce5e 100644
--- a/hif/src/hif_napi.c
+++ b/hif/src/hif_napi.c
@@ -1559,14 +1559,15 @@ int hif_napi_cpu_blacklist(struct qca_napi_data *napid,
 		}
 		break;
 	case BLACKLIST_OFF:
-		if (ref_count)
+		if (ref_count) {
 			ref_count--;
-		rc = 0;
-		if (ref_count == 0) {
-			rc = hif_napi_core_ctl_set_boost(false);
-			NAPI_DEBUG("boost_off() returns %d - refcnt=%d",
-				   rc, ref_count);
-			hif_napi_bl_irq(napid, false);
+			rc = 0;
+			if (ref_count == 0) {
+				rc = hif_napi_core_ctl_set_boost(false);
+				NAPI_DEBUG("boost_off() returns %d - refcnt=%d",
+					   rc, ref_count);
+				hif_napi_bl_irq(napid, false);
+			}
 		}
 		break;
 	default:
diff --git a/qdf/inc/qdf_nbuf.h b/qdf/inc/qdf_nbuf.h
index cef0e0f14b..37aa4e3faa 100644
--- a/qdf/inc/qdf_nbuf.h
+++ b/qdf/inc/qdf_nbuf.h
@@ -212,9 +212,11 @@ struct mon_rx_status {
 #define ARP_REQUEST			(1)
 #define ARP_RESPONSE		(2)
 
-/* IPV4 Related Mask */
+/* IPV4 header fields offset values */
 #define IPV4_PKT_LEN_OFFSET           16
 #define IPV4_TCP_SEQ_NUM_OFFSET       38
+#define IPV4_SRC_ADDR_OFFSET          26
+#define IPV4_DST_ADDR_OFFSET          30
 #define IPV4_SRC_PORT_OFFSET          34
 #define IPV4_DST_PORT_OFFSET          36
 
@@ -224,9 +226,14 @@ struct mon_rx_status {
 #define ICMP_REQUEST                  0x08
 #define ICMP_RESPONSE                 0x00
 
-/* IPV6 Related Mask */
+#define IPV6_ADDR_STR "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:"\
+			"%02x%02x:%02x%02x"
+
+/* IPV6 header fields offset values */
 #define IPV6_PKT_LEN_OFFSET           18
 #define IPV6_TCP_SEQ_NUM_OFFSET       58
+#define IPV6_SRC_ADDR_OFFSET          22
+#define IPV6_DST_ADDR_OFFSET          38
 #define IPV6_SRC_PORT_OFFSET          54
 #define IPV6_DST_PORT_OFFSET          56
 
diff --git a/wlan_cfg/wlan_cfg.c b/wlan_cfg/wlan_cfg.c
index 6009e0573c..4375434726 100644
--- a/wlan_cfg/wlan_cfg.c
+++ b/wlan_cfg/wlan_cfg.c
@@ -38,8 +38,6 @@
 #define RXDMA_MONITOR_DEST_RING_SIZE 2048
 #define RXDMA_MONITOR_STATUS_RING_SIZE 2048
 
-#define WLAN_CFG_NUM_TX_DESC  1024
-#define WLAN_CFG_NUM_TX_EXT_DESC 1024
 
 #ifdef TX_PER_PDEV_DESC_POOL
 #define WLAN_CFG_NUM_TX_DESC_POOL 	MAX_PDEV_CNT
@@ -97,10 +95,14 @@
 #define WLAN_CFG_PER_PDEV_RX_RING 0
 #define NUM_RXDMA_RINGS_PER_PDEV 2
 #define WLAN_LRO_ENABLE 1
+#define WLAN_CFG_NUM_TX_DESC  1024
+#define WLAN_CFG_NUM_TX_EXT_DESC 1024
 #else
 #define WLAN_CFG_PER_PDEV_RX_RING 1
 #define NUM_RXDMA_RINGS_PER_PDEV 1
 #define WLAN_LRO_ENABLE 0
+#define WLAN_CFG_NUM_TX_DESC  (16 << 10)
+#define WLAN_CFG_NUM_TX_EXT_DESC (8 << 10)
 #endif
 
 #ifdef WLAN_RX_HASH