diff --git a/Kbuild b/Kbuild
index b946f02d58c2..120793441965 100644
--- a/Kbuild
+++ b/Kbuild
@@ -3178,6 +3178,8 @@ cppflags-$(CONFIG_FEATURE_WLAN_D0WOW) += -DFEATURE_WLAN_D0WOW
 
 cppflags-$(CONFIG_WLAN_FEATURE_PKT_CAPTURE) += -DWLAN_FEATURE_PKT_CAPTURE
 
+cppflags-$(CONFIG_WLAN_FEATURE_PKT_CAPTURE_V2) += -DWLAN_FEATURE_PKT_CAPTURE_V2
+
 cppflags-$(CONFIG_QCA_WIFI_NAPIER_EMULATION) += -DQCA_WIFI_NAPIER_EMULATION
 cppflags-$(CONFIG_SHADOW_V2) += -DCONFIG_SHADOW_V2
 cppflags-$(CONFIG_QCA6290_HEADERS_DEF) += -DQCA6290_HEADERS_DEF
diff --git a/configs/default_defconfig b/configs/default_defconfig
index 54177a02f146..0f435a6906ff 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -1170,6 +1170,13 @@ ifeq ($(CONFIG_ARCH_SDM660), y)
 CONFIG_WLAN_FEATURE_PKT_CAPTURE := y
 endif
 
+ifeq ($(CONFIG_CNSS_QCA6490), y)
+ifeq ($(CONFIG_ARCH_LAHAINA), y)
+CONFIG_WLAN_FEATURE_PKT_CAPTURE := y
+CONFIG_WLAN_FEATURE_PKT_CAPTURE_V2 := y
+endif
+endif
+
 #Enable RX RING buffers debug
 CONFIG_DEBUG_RX_RING_BUFFER := y
 
diff --git a/core/hdd/inc/wlan_hdd_p2p.h b/core/hdd/inc/wlan_hdd_p2p.h
index 39d80f10f8a5..397401e2814e 100644
--- a/core/hdd/inc/wlan_hdd_p2p.h
+++ b/core/hdd/inc/wlan_hdd_p2p.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2019, 2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -112,6 +112,17 @@ struct wireless_dev *wlan_hdd_add_virtual_intf(struct wiphy *wiphy,
 
 #endif
 
+/**
+ * hdd_clean_up_interface() - clean up hdd interface
+ * @hdd_ctx: pointer to hdd context
+ * @adapter: pointer to adapter
+ *
+ * This function clean up hdd interface.
+ *
+ * Return: None
+ */
+void hdd_clean_up_interface(struct hdd_context *hdd_ctx,
+			    struct hdd_adapter *adapter);
 int wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev);
 int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev);
 
diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c
index 30a1f51f7762..62f4f05aa6b6 100644
--- a/core/hdd/src/wlan_hdd_p2p.c
+++ b/core/hdd/src/wlan_hdd_p2p.c
@@ -899,8 +899,8 @@ struct wireless_dev *wlan_hdd_add_virtual_intf(struct wiphy *wiphy,
 }
 #endif
 
-static void hdd_clean_up_interface(struct hdd_context *hdd_ctx,
-				   struct hdd_adapter *adapter)
+void hdd_clean_up_interface(struct hdd_context *hdd_ctx,
+			    struct hdd_adapter *adapter)
 {
 	wlan_hdd_release_intf_addr(hdd_ctx,
 				   adapter->mac_addr.bytes);