vxlan: Fixed checksum caclculation offset

[vpp.git] / src / vnet / interface_output.h

diff --git a/src/vnet/interface_output.h b/src/vnet/interface_output.h
index f1fa4d8..4b082b3 100644 (file)
--- a/src/vnet/interface_output.h
+++ b/src/vnet/interface_output.h
@@ -41,18 +41,54 @@
 #define __INTERFACE_INLINES_H__
 
 #include <vnet/vnet.h>
+#include <vnet/gso/hdr_offset_parser.h>
 
 static_always_inline void
-calc_checksums (vlib_main_t * vm, vlib_buffer_t * b)
+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,
+                           int is_ip4, int is_ip6)
 {
   ip4_header_t *ip4;
   ip6_header_t *ip6;
   tcp_header_t *th;
   udp_header_t *uh;
 
-  int is_ip4 = (b->flags & VNET_BUFFER_F_IS_IP4) != 0;
-  int is_ip6 = (b->flags & VNET_BUFFER_F_IS_IP6) != 0;
-
   ASSERT (!(is_ip4 && is_ip6));
 
   ip4 = (ip4_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset);
@@ -62,34 +98,11 @@ calc_checksums (vlib_main_t * vm, vlib_buffer_t * b)
 
   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);
     }
-  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);
     }
 
   b->flags &= ~VNET_BUFFER_F_OFFLOAD_TCP_CKSUM;