1 files changed, 62 insertions, 33 deletions

diff --git a/src/vnet/interface_output.h b/src/vnet/interface_output.h
index 198ca282566..ef7aaa8999e 100644
--- a/src/vnet/interface_output.h
+++ b/src/vnet/interface_output.h
@@ -41,7 +41,44 @@
 #define __INTERFACE_INLINES_H__
 
 #include <vnet/vnet.h>
-#include <vnet/gso/gso.h>
+#include <vnet/gso/hdr_offset_parser.h>
+
+static_always_inline void
+vnet_calc_ip4_checksums (vlib_main_t * vm, vlib_buffer_t * b,
+			 ip4_header_t * ip4, tcp_header_t * th,
+			 udp_header_t * uh)
+{
+  if (b->flags & VNET_BUFFER_F_OFFLOAD_IP_CKSUM)
+    ip4->checksum = ip4_header_checksum (ip4);
+  if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM)
+    {
+      th->checksum = 0;
+      th->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4);
+    }
+  if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM)
+    {
+      uh->checksum = 0;
+      uh->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4);
+    }
+}
+
+static_always_inline void
+vnet_calc_ip6_checksums (vlib_main_t * vm, vlib_buffer_t * b,
+			 ip6_header_t * ip6, tcp_header_t * th,
+			 udp_header_t * uh)
+{
+  int bogus;
+  if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM)
+    {
+      th->checksum = 0;
+      th->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b, ip6, &bogus);
+    }
+  if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM)
+    {
+      uh->checksum = 0;
+      uh->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b, ip6, &bogus);
+    }
+}
 
 static_always_inline void
 vnet_calc_checksums_inline (vlib_main_t * vm, vlib_buffer_t * b,
@@ -52,59 +89,51 @@ vnet_calc_checksums_inline (vlib_main_t * vm, vlib_buffer_t * b,
   tcp_header_t *th;
   udp_header_t *uh;
 
-  ASSERT (!(is_ip4 && is_ip6));
-
   if (with_gso)
     {
-      gso_header_offset_t gho;
-      gho = vnet_gso_header_offset_parser (b, is_ip6);
+      generic_header_offset_t gho = { 0 };
+      vnet_generic_header_offset_parser (b, &gho);
+
+      ASSERT (gho.gho_flags ^ (GHO_F_IP4 | GHO_F_IP6));
+
+      vnet_get_inner_header (b, &gho);
+
       ip4 = (ip4_header_t *)
 	(vlib_buffer_get_current (b) + gho.l3_hdr_offset);
       ip6 = (ip6_header_t *)
 	(vlib_buffer_get_current (b) + gho.l3_hdr_offset);
       th = (tcp_header_t *) (vlib_buffer_get_current (b) + gho.l4_hdr_offset);
       uh = (udp_header_t *) (vlib_buffer_get_current (b) + gho.l4_hdr_offset);
+
+      if (gho.gho_flags & GHO_F_IP4)
+	{
+	  vnet_calc_ip4_checksums (vm, b, ip4, th, uh);
+	}
+      else if (gho.gho_flags & GHO_F_IP6)
+	{
+	  vnet_calc_ip6_checksums (vm, b, ip6, th, uh);
+	}
+
+      vnet_get_outer_header (b, &gho);
     }
   else
     {
+      ASSERT (!(is_ip4 && is_ip6));
+
       ip4 = (ip4_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset);
       ip6 = (ip6_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset);
       th = (tcp_header_t *) (b->data + vnet_buffer (b)->l4_hdr_offset);
       uh = (udp_header_t *) (b->data + vnet_buffer (b)->l4_hdr_offset);
-    }
 
-  if (is_ip4)
-    {
-      if (b->flags & VNET_BUFFER_F_OFFLOAD_IP_CKSUM)
-	ip4->checksum = ip4_header_checksum (ip4);
-      if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM)
+      if (is_ip4)
 	{
-	  th->checksum = 0;
-	  th->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4);
+	  vnet_calc_ip4_checksums (vm, b, ip4, th, uh);
 	}
-      if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM)
+      if (is_ip6)
 	{
-	  uh->checksum = 0;
-	  uh->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4);
+	  vnet_calc_ip6_checksums (vm, b, ip6, th, uh);
 	}
     }
-  if (is_ip6)
-    {
-      int bogus;
-      if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM)
-	{
-	  th->checksum = 0;
-	  th->checksum =
-	    ip6_tcp_udp_icmp_compute_checksum (vm, b, ip6, &bogus);
-	}
-      if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM)
-	{
-	  uh->checksum = 0;
-	  uh->checksum =
-	    ip6_tcp_udp_icmp_compute_checksum (vm, b, ip6, &bogus);
-	}
-    }
-
   b->flags &= ~VNET_BUFFER_F_OFFLOAD_TCP_CKSUM;
   b->flags &= ~VNET_BUFFER_F_OFFLOAD_UDP_CKSUM;
   b->flags &= ~VNET_BUFFER_F_OFFLOAD_IP_CKSUM;