X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fudp%2Fudp_encap.h;h=648e3b59e6da7ebffd635dd2996aa59287a3447b;hb=8bea589cfe0fca1a6f560e16ca66a4cf199041a2;hp=a4cc2a2f3fef105646ea9aeb699264e0729b9fab;hpb=bdc0e6b7204ea0211d4f7881497e4306586fb9ef;p=vpp.git

diff --git a/src/vnet/udp/udp_encap.h b/src/vnet/udp/udp_encap.h
index a4cc2a2f3fe..648e3b59e6d 100644
--- a/src/vnet/udp/udp_encap.h
+++ b/src/vnet/udp/udp_encap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Copyright (c) 2016-2019 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -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