Merge "dataipa: Added logic to avoid sending NAT table remove unless requested"
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_odl.c b/drivers/platform/msm/ipa/ipa_v3/ipa_odl.c
index 2123327..c50b3ea 100644
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_odl.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_odl.c
@@ -483,6 +483,12 @@
IPAERR("adpl pipe not configured\n");
return;
}
+
+ if(!ipa3_odl_ctx->odl_state.odl_ep_setup) {
+ IPAERR("adpl pipe setup not done\n");
+ return;
+ }
+
if (ipa3_odl_ctx->odl_state.odl_open)
ipa_odl_opened = true;
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt.c b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt.c
index f24ce9b..55286b5 100644
--- a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt.c
@@ -4711,12 +4711,12 @@
if (!IPA_IS_RULE_EQ_VALID(i))
continue;
- if (eq_bits & IPA_GET_RULE_EQ_BIT_PTRN(eq_bitfield[i])) {
+ if (eq_bits & IPA_GET_RULE_EQ_BIT_PTRN(i)) {
IPAHAL_ERR("more than eq with same bit. eq=%d\n", i);
WARN_ON(1);
return -EFAULT;
}
- eq_bits |= IPA_GET_RULE_EQ_BIT_PTRN(eq_bitfield[i]);
+ eq_bits |= IPA_GET_RULE_EQ_BIT_PTRN(i);
}
mem = &ipahal_ctx->empty_fltrt_tbl;