X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fvnet%2Flisp-gpe%2Finterface.c;h=4760f44833acc3692c86b892a55fcca0cb5f3634;hb=b4874ee8d5a92017cb91ad23b0783385dd58253c;hp=19ac22e7a5632db70c4653a8cb96eed9a809caec;hpb=a9a20e7f69f4a91a4d5267ab5ce14125bdc7d6c6;p=vpp.git

diff --git a/src/vnet/lisp-gpe/interface.c b/src/vnet/lisp-gpe/interface.c
index 19ac22e7a56..4760f44833a 100644
--- a/src/vnet/lisp-gpe/interface.c
+++ b/src/vnet/lisp-gpe/interface.c
@@ -23,7 +23,7 @@
 #include <vppinfra/hash.h>
 #include <vnet/vnet.h>
 #include <vnet/ip/ip.h>
-#include <vnet/ip/udp.h>
+#include <vnet/udp/udp.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/lisp-gpe/lisp_gpe.h>
 #include <vnet/lisp-gpe/lisp_gpe_fwd_entry.h>
@@ -185,7 +185,8 @@ format_lisp_gpe_header_with_length (u8 * s, va_list * args)
 
   s = format (s, "\n  ver_res %d res %d next_protocol %d iid %d(%x)",
 	      h->ver_res, h->res, h->next_protocol,
-	      clib_net_to_host_u32 (h->iid), clib_net_to_host_u32 (h->iid));
+	      clib_net_to_host_u32 (h->iid << 8),
+	      clib_net_to_host_u32 (h->iid << 8));
   return s;
 }
 
@@ -849,7 +850,7 @@ lisp_gpe_add_del_iface_command_fn (vlib_main_t * vm, unformat_input_t * input,
 	{
 	  lisp_gpe_del_nsh_iface (&lisp_gpe_main);
 	}
-      return (NULL);
+      goto done;
     }
 
   if (vrf_is_set && bd_index_is_set)
@@ -899,22 +900,6 @@ lisp_gpe_add_del_iface_command_fn (vlib_main_t * vm, unformat_input_t * input,
 	lisp_gpe_tenant_l3_iface_unlock (vni);
     }
 
-  if (nsh_iface)
-    {
-      if (is_add)
-	{
-	  if (~0 == lisp_gpe_add_nsh_iface (&lisp_gpe_main))
-	    {
-	      error = clib_error_return (0, "NSH interface not created");
-	      goto done;
-	    }
-	  else
-	    {
-	      lisp_gpe_del_nsh_iface (&lisp_gpe_main);
-	    }
-	}
-    }
-
 done:
   unformat_free (line_input);