commit a14a5d3f171141fe8bc95f93ae2366aa96a073ab
author Carmelo Cascone <carmelo@opennetworking.org> Wed May 30 16:56:04 2018 -0700
committer Carmelo Cascone <carmelo@opennetworking.org> Wed May 30 16:56:04 2018 -0700
tree 6a833e457cf02385a8edb5d24e43e3bcce69dead
parent 67f8c2f8d6994d196f031c44e8cf3eb7c9fbf50f

Simplified Makefile and fixed minor issue with fabric.p4

Change-Id: I8a1dfe5a647b93f5dab133c42e7ffb3910485999

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 cb287a3..1ed6647 100644
--- a/pipelines/fabric/src/main/resources/fabric.p4
+++ b/pipelines/fabric/src/main/resources/fabric.p4
@@ -46,8 +46,10 @@
     EgressNextControl() egress_next;
 
     apply {
+#ifdef WITH_INT_TRANSIT
         fabric_metadata.int_metadata.ingress_tstamp =
             (bit<32>) standard_metadata.ingress_global_timestamp;
+#endif // WITH_INT_TRANSIT
         packet_io_ingress.apply(hdr, fabric_metadata, standard_metadata);
 #ifdef WITH_SPGW
 #ifdef WITH_SPGW_PCC_GATING