vxlan: Fixed checksum caclculation offset

[vpp.git] / src / vnet / pg / input.c

diff --git a/src/vnet/pg/input.c b/src/vnet/pg/input.c
index 8ba3b36..483add0 100644 (file)
--- a/src/vnet/pg/input.c
+++ b/src/vnet/pg/input.c
@@ -1530,10 +1530,9 @@ pg_input_trace (pg_main_t * pg,
 }
 
 static_always_inline void
-fill_gso_buffer_flags (vlib_main_t * vm, u32 * buffers, u32 n_buffers,
-                      u32 packet_data_size)
+fill_buffer_offload_flags (vlib_main_t * vm, u32 * buffers, u32 n_buffers,
+                          int gso_enabled, u32 gso_size)
 {
-
   for (int i = 0; i < n_buffers; i++)
     {
       vlib_buffer_t *b0 = vlib_get_buffer (vm, buffers[i]);
@@ -1586,16 +1585,21 @@ fill_gso_buffer_flags (vlib_main_t * vm, u32 * buffers, u32 n_buffers,
             VNET_BUFFER_F_L3_HDR_OFFSET_VALID |
             VNET_BUFFER_F_L4_HDR_OFFSET_VALID);
        }
+
       if (l4_proto == IP_PROTOCOL_TCP)
        {
-         b0->flags |= (VNET_BUFFER_F_OFFLOAD_TCP_CKSUM | VNET_BUFFER_F_GSO);
+         b0->flags |= VNET_BUFFER_F_OFFLOAD_TCP_CKSUM;
          tcp_header_t *tcp = (tcp_header_t *) (vlib_buffer_get_current (b0) +
                                                vnet_buffer
                                                (b0)->l4_hdr_offset);
-         l4_hdr_sz = tcp_header_bytes (tcp);
          tcp->checksum = 0;
-         vnet_buffer2 (b0)->gso_l4_hdr_sz = l4_hdr_sz;
-         vnet_buffer2 (b0)->gso_size = packet_data_size;
+         if (gso_enabled)
+           {
+             b0->flags |= VNET_BUFFER_F_GSO;
+             l4_hdr_sz = tcp_header_bytes (tcp);
+             vnet_buffer2 (b0)->gso_l4_hdr_sz = l4_hdr_sz;
+             vnet_buffer2 (b0)->gso_size = gso_size;
+           }
        }
       else if (l4_proto == IP_PROTOCOL_UDP)
        {
@@ -1603,7 +1607,6 @@ fill_gso_buffer_flags (vlib_main_t * vm, u32 * buffers, u32 n_buffers,
          udp_header_t *udp = (udp_header_t *) (vlib_buffer_get_current (b0) +
                                                vnet_buffer
                                                (b0)->l4_hdr_offset);
-         vnet_buffer2 (b0)->gso_l4_hdr_sz = sizeof (*udp);
          udp->checksum = 0;
        }
     }
@@ -1700,8 +1703,14 @@ pg_generate_packets (vlib_node_runtime_t * node,
            vnet_buffer (b)->feature_arc_index = feature_arc_index;
          }
 
-      if (pi->gso_enabled)
-       fill_gso_buffer_flags (vm, to_next, n_this_frame, pi->gso_size);
+      if (pi->gso_enabled ||
+         (s->buffer_flags & (VNET_BUFFER_F_OFFLOAD_TCP_CKSUM |
+                             VNET_BUFFER_F_OFFLOAD_UDP_CKSUM |
+                             VNET_BUFFER_F_OFFLOAD_IP_CKSUM)))
+       {
+         fill_buffer_offload_flags (vm, to_next, n_this_frame,
+                                    pi->gso_enabled, pi->gso_size);
+       }
 
       n_trace = vlib_get_trace_count (vm, node);
       if (n_trace > 0)