commit 20f9e7b406d1750cf192ca848496e5f7b3967d4f
author Yi Tseng <yi@opennetworking.org> Thu May 24 23:27:39 2018 +0800
committer Yi Tseng <yi@opennetworking.org> Tue May 29 17:29:57 2018 +0800
tree 15447113efd841fbfe71dd083bfeb9dbb432c479
parent 4df657b4e79e83e42d8a012cb673c38b35ef20de

[ONOS-7285][ONOS-7263] VLAN support by fabric.p4

Change-Id: I9ea460bca2698eb74f0d4988830a1e7cc7bc2768

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 8205196..93e887e 100644
--- a/pipelines/fabric/src/main/resources/fabric.p4
+++ b/pipelines/fabric/src/main/resources/fabric.p4
@@ -39,7 +39,6 @@
     Forwarding() forwarding;
     Next() next;
     PortCountersControl() port_counters_control;
-    EgressNextControl() egress_next;
 
     apply {
         packet_io_ingress.apply(hdr, fabric_metadata, standard_metadata);
@@ -55,7 +54,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);
+
     }
 }
 
@@ -63,7 +62,10 @@
                       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);
 #ifdef WITH_SPGW
         spgw_egress.apply(hdr.ipv4, hdr.gtpu_ipv4, hdr.gtpu_udp, hdr.gtpu,