gso: remove vxlan header include file dependency

[vpp.git] / src / vnet / gso / hdr_offset_parser.h

diff --git a/src/vnet/gso/hdr_offset_parser.h b/src/vnet/gso/hdr_offset_parser.h
index 8fa5cad..08037f5 100644 (file)
--- a/src/vnet/gso/hdr_offset_parser.h
+++ b/src/vnet/gso/hdr_offset_parser.h
@@ -19,10 +19,12 @@
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/ip/ip4_packet.h>
 #include <vnet/ip/ip6_packet.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/udp/udp_packet.h>
+#include <vnet/tcp/tcp_packet.h>
 #include <vnet/vnet.h>
-#include <vnet/vxlan/vxlan_packet.h>
+
+#define VXLAN_HEADER_SIZE 8
 
 #define foreach_gho_flag        \
   _( 0, IP4)                    \
@@ -82,7 +84,6 @@ format_generic_header_offset (u8 * s, va_list * args)
 {
   generic_header_offset_t *gho = va_arg (*args, generic_header_offset_t *);
 
-  s = format (s, "\n\t");
   if (gho->gho_flags & GHO_F_TUNNEL)
     {
       if (gho->gho_flags & GHO_F_VXLAN_TUNNEL)
@@ -156,8 +157,6 @@ vnet_geneve_inner_header_parser_inline (vlib_buffer_t * b0,
   /* not supported yet */
   if ((gho->gho_flags & GHO_F_GENEVE_TUNNEL) == 0)
     return;
-
-  ASSERT (0);
 }
 
 static_always_inline void
@@ -167,8 +166,6 @@ vnet_gre_inner_header_parser_inline (vlib_buffer_t * b0,
   /* not supported yet */
   if ((gho->gho_flags & GHO_F_GRE_TUNNEL) == 0)
     return;
-
-  ASSERT (0);
 }
 
 static_always_inline void
@@ -441,7 +438,7 @@ vnet_generic_outer_header_parser_inline (vlib_buffer_t * b0,
       if (UDP_DST_PORT_vxlan == clib_net_to_host_u16 (udp->dst_port))
        {
          gho->gho_flags |= GHO_F_VXLAN_TUNNEL;
-         gho->hdr_sz += sizeof (vxlan_header_t);
+         gho->hdr_sz += VXLAN_HEADER_SIZE;
        }
       else if (UDP_DST_PORT_geneve == clib_net_to_host_u16 (udp->dst_port))
        {