misc: minimize dependencies on udp.h

[vpp.git] / src / plugins / nsh / nsh-md2-ioam / md2_ioam_transit.c

diff --git a/src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c b/src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c
index 9ea5447..876e003 100644 (file)
--- a/src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c
+++ b/src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c
@@ -16,10 +16,9 @@
 #include <vppinfra/hash.h>
 #include <vnet/vnet.h>
 #include <vnet/ip/ip.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/ethernet/ethernet.h>
-#include <vnet/lisp-gpe/lisp_gpe.h>
-#include <vnet/lisp-gpe/lisp_gpe_packet.h>
+#include <lisp/lisp-gpe/lisp_gpe_packet.h>
 #include <nsh/nsh.h>
 #include <nsh/nsh_packet.h>
 #include <nsh/nsh-md2-ioam/nsh_md2_ioam.h>
@@ -59,7 +58,6 @@ VNET_FEATURE_INIT (nsh_md2_ioam_encap_transit, static) =
 {
   .arc_name = "ip4-output",
   .node_name = "nsh-md2-ioam-encap-transit",
-  .runs_before = VNET_FEATURES ("adj-midchain-tx"),
 };
 /* *INDENT-ON* */
 
@@ -128,7 +126,7 @@ nsh_md2_ioam_encap_transit (vlib_main_t * vm,
                      uword *t = NULL;
                      nsh_md2_ioam_main_t *hm = &nsh_md2_ioam_main;
                      fib_prefix_t key4;
-                     memset (&key4, 0, sizeof (key4));
+                     clib_memset (&key4, 0, sizeof (key4));
                      key4.fp_proto = FIB_PROTOCOL_IP4;
                      key4.fp_addr.ip4.as_u32 = ip0->dst_address.as_u32;
                      t = hash_get_mem (hm->dst_by_ip4, &key4);