X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_output.h;h=27aadc6c5fdac3e8a275384cb1b162066deb3c49;hb=40ee2003b;hp=198ca28256663c90939e58a2838775e76cc45993;hpb=1bd2c019eba5c893d634cc496bd6d54c00020d7e;p=vpp.git

diff --git a/src/vnet/interface_output.h b/src/vnet/interface_output.h
index 198ca282566..27aadc6c5fd 100644
--- a/src/vnet/interface_output.h
+++ b/src/vnet/interface_output.h
@@ -41,73 +41,72 @@
 #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, u32 oflags)
+{
+  if (oflags & VNET_BUFFER_OFFLOAD_F_IP_CKSUM)
+    ip4->checksum = ip4_header_checksum (ip4);
+  if (oflags & VNET_BUFFER_OFFLOAD_F_TCP_CKSUM)
+    {
+      th->checksum = 0;
+      th->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4);
+    }
+  if (oflags & VNET_BUFFER_OFFLOAD_F_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, u32 oflags)
+{
+  int bogus;
+  if (oflags & VNET_BUFFER_OFFLOAD_F_TCP_CKSUM)
+    {
+      th->checksum = 0;
+      th->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b, ip6, &bogus);
+    }
+  if (oflags & VNET_BUFFER_OFFLOAD_F_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,
-			    int is_ip4, int is_ip6, int with_gso)
+			    int is_ip4, int is_ip6)
 {
   ip4_header_t *ip4;
   ip6_header_t *ip6;
   tcp_header_t *th;
   udp_header_t *uh;
+  u32 oflags = vnet_buffer2 (b)->oflags;
 
   ASSERT (!(is_ip4 && is_ip6));
 
-  if (with_gso)
-    {
-      gso_header_offset_t gho;
-      gho = vnet_gso_header_offset_parser (b, is_ip6);
-      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);
-    }
-  else
-    {
-      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);
-    }
+  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)
-	{
-	  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);
-	}
+      vnet_calc_ip4_checksums (vm, b, ip4, th, uh, oflags);
     }
-  if (is_ip6)
+  else 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);
-	}
+      vnet_calc_ip6_checksums (vm, b, ip6, th, uh, oflags);
     }
 
-  b->flags &= ~VNET_BUFFER_F_OFFLOAD_TCP_CKSUM;
-  b->flags &= ~VNET_BUFFER_F_OFFLOAD_UDP_CKSUM;
-  b->flags &= ~VNET_BUFFER_F_OFFLOAD_IP_CKSUM;
+  vnet_buffer_offload_flags_clear (b, (VNET_BUFFER_OFFLOAD_F_IP_CKSUM |
+				       VNET_BUFFER_OFFLOAD_F_UDP_CKSUM |
+				       VNET_BUFFER_OFFLOAD_F_TCP_CKSUM));
 }
 
 #endif