X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Fnsh-gre%2Fnsh_gre.h;h=abe115580cb0842dc96ccfa9c5a8351535b1d3c6;hb=fdff1e6ed540f2a04792fb64e04b0c7862dc2b8c;hp=580942f0f19a2a6ca7459563756057cfdb59892b;hpb=8f15e922f7f32c1beca5baa9a1a7f187ff5bdc4f;p=vpp.git

diff --git a/vnet/vnet/nsh-gre/nsh_gre.h b/vnet/vnet/nsh-gre/nsh_gre.h
index 580942f0f19..abe115580cb 100644
--- a/vnet/vnet/nsh-gre/nsh_gre.h
+++ b/vnet/vnet/nsh-gre/nsh_gre.h
@@ -17,7 +17,7 @@
 
 #include <vnet/vnet.h>
 #include <vnet/gre/gre.h>
-#include <vnet/nsh-gre/nsh_gre_packet.h>
+#include <vnet/nsh/nsh_packet.h>
 #include <vnet/ip/ip4_packet.h>
 
 typedef CLIB_PACKED (struct {
@@ -46,15 +46,8 @@ typedef struct {
   u32 sw_if_index;
 
   /* NSH header fields in HOST byte order */
-  u8 ver_o_c;
-  u8 length;
-  u8 md_type;
-  u8 next_protocol;
-  u32 spi_si;
-    
-  /* Context headers, always present, in HOST byte order */
-  u32 c1, c2, c3, c4;
-  u32 * tlvs;
+  nsh_header_t nsh_hdr;
+
 } nsh_gre_tunnel_t;
 
 #define foreach_nsh_gre_input_next              \
@@ -64,15 +57,15 @@ typedef struct {
   _ (ETHERNET_INPUT, "ethernet-input")
 
 typedef enum {
-#define _(s,n) NSH_INPUT_NEXT_##s,
+#define _(s,n) NSH_GRE_INPUT_NEXT_##s,
   foreach_nsh_gre_input_next
 #undef _
-  NSH_INPUT_N_NEXT,
+  NSH_GRE_INPUT_N_NEXT,
 } nsh_gre_input_next_t;
 
 typedef enum {
 #define nsh_gre_error(n,s) NSH_GRE_ERROR_##n,
-#include <vnet/nsh-gre/nsh_gre_error.def>
+#include <vnet/nsh/nsh_error.def>
 #undef nsh_gre_error
   NSH_GRE_N_ERROR,
 } nsh_gre_input_error_t;
@@ -108,13 +101,7 @@ typedef struct {
   u32 encap_fib_index;
   u32 decap_fib_index;
   u32 decap_next_index;
-  u8 ver_o_c;
-  u8 length;
-  u8 md_type;
-  u8 next_protocol;
-  u32 spi_si;
-  u32 c1, c2, c3, c4;
-  u32 * tlvs;
+  nsh_header_t nsh_hdr;
 } vnet_nsh_gre_add_del_tunnel_args_t;
 
 int vnet_nsh_gre_add_del_tunnel (vnet_nsh_gre_add_del_tunnel_args_t *a,