commit 3a5731e32d549f0c78f273a94b7602c69f7cefaf
author Yi Tseng <yi@opennetworking.org> Mon Jan 22 11:38:58 2018 -0800
committer Yi Tseng <yi@opennetworking.org> Mon Jan 22 11:43:32 2018 -0800
tree a1e9b15ab111ce7233ea95266645b9e784c76fcd
parent 75ee45ef7e1f1d7c84cd8409bd74c6f5a323bd84

Minor refactoring for fabric.p4

Change-Id: I8c5bac678ead88bda42a0b49ea19d7c968bcc305

pipelines/fabric/src/main/resources/fabric.p4

diff --git a/pipelines/fabric/src/main/resources/fabric.p4 b/pipelines/fabric/src/main/resources/fabric.p4
index d27ed87..84997ec 100644
--- a/pipelines/fabric/src/main/resources/fabric.p4
+++ b/pipelines/fabric/src/main/resources/fabric.p4
@@ -35,6 +35,7 @@
     Forwarding() forwarding;
     Next() next;
     PortCountersControl() port_counters_control;
+    EgressNextControl() egress_next;
 
     apply {
         packet_io_ingress.apply(hdr, fabric_metadata, standard_metadata);
@@ -42,6 +43,7 @@
         forwarding.apply(hdr, fabric_metadata, standard_metadata);
         next.apply(hdr, fabric_metadata, standard_metadata);
         port_counters_control.apply(hdr, fabric_metadata, standard_metadata);
+        egress_next.apply(hdr, fabric_metadata, standard_metadata);
     }
 }
 
@@ -49,9 +51,7 @@
                       inout fabric_metadata_t fabric_metadata,
                       inout standard_metadata_t standard_metadata) {
     PacketIoEgress() pkt_io_egress;
-    EgressNextControl() egress_next;
     apply {
-        egress_next.apply(hdr, fabric_metadata, standard_metadata);
         pkt_io_egress.apply(hdr, fabric_metadata, standard_metadata);
     }
 }