X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fgtpu%2Fgtpu.c;h=89868d9b615a082260f9b57555f9129932819969;hb=refs%2Fchanges%2F07%2F9207%2F2;hp=c91612efeea66f22adf0880ae093ad7c659a9258;hpb=ccd4a6588c6f486f7616286b054a5ac123f5c502;p=vpp.git

diff --git a/src/plugins/gtpu/gtpu.c b/src/plugins/gtpu/gtpu.c
old mode 100644
new mode 100755
index c91612efeea..89868d9b615
--- a/src/plugins/gtpu/gtpu.c
+++ b/src/plugins/gtpu/gtpu.c
@@ -34,6 +34,20 @@
 
 gtpu_main_t gtpu_main;
 
+/* *INDENT-OFF* */
+VNET_FEATURE_INIT (ip4_gtpu_bypass, static) = {
+  .arc_name = "ip4-unicast",
+  .node_name = "ip4-gtpu-bypass",
+  .runs_before = VNET_FEATURES ("ip4-lookup"),
+};
+
+VNET_FEATURE_INIT (ip6_gtpu_bypass, static) = {
+  .arc_name = "ip6-unicast",
+  .node_name = "ip6-gtpu-bypass",
+  .runs_before = VNET_FEATURES ("ip6-lookup"),
+};
+/* *INDENT-on* */
+
 static u8 *
 format_decap_next (u8 * s, va_list * args)
 {
@@ -125,6 +139,7 @@ VNET_HW_INTERFACE_CLASS (gtpu_hw_class) =
   .name = "GTPU",
   .format_header = format_gtpu_header_with_length,
   .build_rewrite = default_build_rewrite,
+  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
 };
 /* *INDENT-ON* */
 
@@ -520,7 +535,7 @@ int vnet_gtpu_add_del_tunnel
 	      fib_node_index_t mfei;
 	      adj_index_t ai;
 	      fib_route_path_t path = {
-		.frp_proto = fp,
+		.frp_proto = fib_proto_to_dpo (fp),
 		.frp_addr = zero_addr,
 		.frp_sw_if_index = 0xffffffff,
 		.frp_fib_index = ~0,