eth_type moved outside ethernet header in fabric.p4
Change-Id: I3ae0813c5e8aba48767d5bb235fbbcfb75954010
(cherry picked from commit 693d76f189c59579837b559975c0ba767335dfc0)
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
index 9a5f7e1..b3f3a9d 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
@@ -88,20 +88,14 @@
}
match_fields {
id: 3
- name: "is_ipv4"
- bitwidth: 1
- match_type: EXACT
+ name: "eth_type"
+ bitwidth: 16
+ match_type: TERNARY
}
match_fields {
id: 4
- name: "is_ipv6"
- bitwidth: 1
- match_type: EXACT
- }
- match_fields {
- id: 5
- name: "is_mpls"
- bitwidth: 1
+ name: "ip_eth_type"
+ bitwidth: 16
match_type: EXACT
}
action_refs {
@@ -189,7 +183,6 @@
scope: DEFAULT_ONLY
}
const_default_action_id: 16819938
- direct_resource_ids: 318811107
size: 1024
}
tables {
@@ -888,17 +881,6 @@
}
direct_counters {
preamble {
- id: 318811107
- name: "FabricIngress.forwarding.routing_v4_counter"
- alias: "routing_v4_counter"
- }
- spec {
- unit: BOTH
- }
- direct_table_id: 33562650
-}
-direct_counters {
- preamble {
id: 318801025
name: "FabricIngress.acl.acl_counter"
alias: "acl_counter"