commit aed53c40426f8ba9fb027e9af495855fbc4657fb
author Linux Build Service Account <lnxbuild@localhost> Mon Jun 15 21:20:56 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jun 15 21:20:56 2015 -0700
tree a869e5e8bfdf0498a2430bb28984a8fadc9949b8
parent 7d83ed1124f406544b40a2a3e19c2a376a8fc8f7
parent aa624e6d3a011d4cb66259f61e5c46c45fddf6b9

Merge "IPACM: Enable meta-data in ICMP/ICMPv6 filtering rule on DL path"

ipacm/src/IPACM_Wan.cpp

diff --git a/ipacm/src/IPACM_Wan.cpp b/ipacm/src/IPACM_Wan.cpp
index 11b3ed3..51f9bc3 100644
--- a/ipacm/src/IPACM_Wan.cpp
+++ b/ipacm/src/IPACM_Wan.cpp
@@ -2905,8 +2905,7 @@
 		memcpy(&flt_rule_entry.rule.attrib,
 					 &rx_prop->rx[0].attrib,
 					 sizeof(flt_rule_entry.rule.attrib));
-		/* remove meta data mask */
-		flt_rule_entry.rule.attrib.attrib_mask &= ~((uint32_t)IPA_FLT_META_DATA);
+		/* Multiple PDNs may exist so keep meta-data */
 		flt_rule_entry.rule.attrib.attrib_mask |= IPA_FLT_PROTOCOL;
 		flt_rule_entry.rule.attrib.u.v4.protocol = (uint8_t)IPACM_FIREWALL_IPPROTO_ICMP;
 
@@ -3022,8 +3021,7 @@
 		memcpy(&flt_rule_entry.rule.attrib,
 					 &rx_prop->rx[1].attrib,
 					 sizeof(flt_rule_entry.rule.attrib));
-		/* remove meta data mask */
-		flt_rule_entry.rule.attrib.attrib_mask &= ~((uint32_t)IPA_FLT_META_DATA);
+		/* Multiple PDNs may exist so keep meta-data */
 		flt_rule_entry.rule.attrib.attrib_mask |= IPA_FLT_NEXT_HDR;
 		flt_rule_entry.rule.attrib.u.v6.next_hdr = (uint8_t)IPACM_FIREWALL_IPPROTO_ICMP6;