X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fudp%2Fudp_encap.h;h=c8b42ffa92c31ed26d3d837d4f6ebf7424223fbc;hb=520cde406797eb076591797fbf9978b959e6cf17;hp=888efa8c37c0e377bd9e2114dd519de3ade7e6a1;hpb=c5df8c71cc867d8120a25e4bd6d065aa63d9011c;p=vpp.git

diff --git a/src/vnet/udp/udp_encap.h b/src/vnet/udp/udp_encap.h
index 888efa8c37c..c8b42ffa92c 100644
--- a/src/vnet/udp/udp_encap.h
+++ b/src/vnet/udp/udp_encap.h
@@ -17,7 +17,7 @@
 #define __UDP_ENCAP_H__
 
 #include <vnet/ip/ip.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_packet.h>
 #include <vnet/fib/fib_node.h>
 
 /**
@@ -68,14 +68,14 @@ typedef struct udp_encap_t_
   } __attribute__ ((packed)) ue_hdrs;
 
   /**
-   * Flags controlling fixup behaviour
+   * The DPO used to forward to the next node in the VLIB graph
    */
-  udp_encap_fixup_flags_t ue_flags;
+  dpo_id_t ue_dpo;
 
   /**
-   * The DPO used to forward to the next node in the VLIB graph
+   * Flags controlling fixup behaviour
    */
-  dpo_id_t ue_dpo;
+  udp_encap_fixup_flags_t ue_flags;
 
   /**
    * the protocol of the IP header imposed
@@ -85,7 +85,7 @@ typedef struct udp_encap_t_
   /**
    * The second cacheline contains control-plane data
    */
-    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
 
   /**
    * linkage into the FIB graph
@@ -115,6 +115,7 @@ extern index_t udp_encap_add_and_lock (fib_protocol_t proto,
 extern void udp_encap_lock (index_t uei);
 extern void udp_encap_unlock (index_t uei);
 extern u8 *format_udp_encap (u8 * s, va_list * args);
+extern u8 *format_udp_encap_fixup_flags (u8 *s, va_list *args);
 extern void udp_encap_contribute_forwarding (index_t uei,
 					     dpo_proto_t proto,
 					     dpo_id_t * dpo);