diff --git a/drivers/platform/msm/Kbuild b/drivers/platform/msm/Kbuild
index c382850..ab50bff 100644
--- a/drivers/platform/msm/Kbuild
+++ b/drivers/platform/msm/Kbuild
@@ -38,7 +38,7 @@
 endif
 endif
 
-ifeq ($(filter $(CONFIG_ARCH_KHAJE) $(CONFIG_ARCH_MONACO) $(CONFIG_ARCH_TRINKET), y), y)
+ifeq ($(filter $(CONFIG_ARCH_KHAJE) $(CONFIG_ARCH_MONACO) $(CONFIG_ARCH_TRINKET) $(CONFIG_ARCH_SCUBA), y), y)
 DATAIPADRVTOP = $(srctree)/../../vendor/qcom/opensource/dataipa/drivers/platform/msm
 LINUXINCLUDE    += -include $(srctree)/../../vendor/qcom/opensource/dataipa/config/dataipa_vendor_ipav4.h
 include $(srctree)/../../vendor/qcom/opensource/dataipa/config/dataipa_GKI_ipav4.conf
@@ -80,15 +80,6 @@
 endif
 endif
 
-ifeq ($(CONFIG_ARCH_SCUBA), y)
-LINUXINCLUDE    += -include $(srctree)/techpack/dataipa/config/sa410mdataipa.h
-include $(srctree)/techpack/dataipa/config/sa410mdataipa_QGKI.conf
-ifneq ($(CONFIG_LOCALVERSION), "-perf")
-include $(srctree)/techpack/dataipa/config/dataipa_debug.conf
-LINUXINCLUDE    += -include $(srctree)/techpack/dataipa/config/dataipa_debug.h
-endif
-endif
-
 ifneq (,$(filter $(CONFIG_IPA3) $(CONFIG_GSI),y m))
 LINUXINCLUDE += -I$(DATAIPADRVTOP)/gsi
 LINUXINCLUDE += -I$(DATAIPADRVTOP)/gsi/gsihal
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c b/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c
index 727cc43..68c9096 100644
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c
@@ -12202,6 +12202,12 @@
 
 	int ep_idx, num_desc = 0;
 
+
+	if (ipa3_is_mhip_offload_enabled()) {
+		IPADBG("COAL not supported in the prime\n");
+		return;
+	}
+
 	if ( close_wan
 		 &&
 		 IPA_CLIENT_IS_MAPPED_VALID(IPA_CLIENT_APPS_WAN_COAL_CONS, ep_idx)