Update P4 programs to compile with most recent p4c
Change-Id: Iced2e9af53dca2dcfd4e6a5de22a45241c264886
(cherry picked from commit 040d6d8c748b6399b74b56abde5894d254eb6383)
diff --git a/pipelines/fabric/src/main/resources/include/control/next.p4 b/pipelines/fabric/src/main/resources/include/control/next.p4
index 88e870c..82b61eb 100644
--- a/pipelines/fabric/src/main/resources/include/control/next.p4
+++ b/pipelines/fabric/src/main/resources/include/control/next.p4
@@ -305,7 +305,7 @@
apply {
if (fabric_metadata.is_multicast == _TRUE
&& standard_metadata.ingress_port == standard_metadata.egress_port) {
- mark_to_drop();
+ mark_to_drop(standard_metadata);
}
if (fabric_metadata.mpls_label == 0) {
@@ -324,16 +324,16 @@
// TTL decrement and check.
if (hdr.mpls.isValid()) {
hdr.mpls.ttl = hdr.mpls.ttl - 1;
- if (hdr.mpls.ttl == 0) mark_to_drop();
+ if (hdr.mpls.ttl == 0) mark_to_drop(standard_metadata);
} else {
if(hdr.ipv4.isValid()) {
hdr.ipv4.ttl = hdr.ipv4.ttl - 1;
- if (hdr.ipv4.ttl == 0) mark_to_drop();
+ if (hdr.ipv4.ttl == 0) mark_to_drop(standard_metadata);
}
#ifdef WITH_IPV6
else if (hdr.ipv6.isValid()) {
hdr.ipv6.hop_limit = hdr.ipv6.hop_limit - 1;
- if (hdr.ipv6.hop_limit == 0) mark_to_drop();
+ if (hdr.ipv6.hop_limit == 0) mark_to_drop(standard_metadata);
}
#endif // WITH_IPV6
}