commit b757dbc4eb5a0fa964416096a969b9bf2d993a29
author Carmelo Cascone <carmelo@opennetworking.org> Thu Jan 25 17:53:17 2018 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Sat Jan 27 05:50:23 2018 +0000
tree 9d8d3f88066b0cc06ce51f848d4f18104abbe6eb
parent ed88f2b6fee0111e39af2fe147cf6b9d853af155

Fixed double-extraction issue in spgw parser

Change-Id: I9b564322840147ab037cc07ddc1384e648b946b8

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

diff --git a/pipelines/fabric/src/main/resources/include/header.p4 b/pipelines/fabric/src/main/resources/include/header.p4
index b9f36b1..0a0814e 100644
--- a/pipelines/fabric/src/main/resources/include/header.p4
+++ b/pipelines/fabric/src/main/resources/include/header.p4
@@ -131,15 +131,17 @@
 
 struct spgw_meta_t {
     bool              do_spgw;
+    direction_t       direction;
+    bit<32>           teid;
+    bit<32>           s1u_enb_addr;
+    bit<32>           s1u_sgw_addr;
+#ifdef WITH_SPGW_PCC_GATING
     bit<16>           l4_src_port;
     bit<16>           l4_dst_port;
-    direction_t       direction;
     pcc_gate_status_t pcc_gate_status;
     sdf_rule_id_t     sdf_rule_id;
     pcc_rule_id_t     pcc_rule_id;
-    bit<32>           dl_sess_teid;
-    bit<32>           dl_sess_enb_addr;
-    bit<32>           dl_sess_s1u_addr;
+#endif // WITH_SPGW_PCC_GATING
 }
 #endif // WITH_SPGW
 
@@ -167,7 +169,9 @@
     gtpu_t gtpu;
 #endif // WITH_SPGW
     ipv4_t ipv4;
+#ifdef WITH_IPV6
     ipv6_t ipv6;
+#endif // WITH_IPV6
     arp_t arp;
     tcp_t tcp;
     udp_t udp;