diff options
Diffstat (limited to 'src/vnet/gso')
| -rw-r--r-- | src/vnet/gso/gro_func.h | 13 | ||||
| -rw-r--r-- | src/vnet/gso/node.c | 10 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/vnet/gso/gro_func.h b/src/vnet/gso/gro_func.h index b821a034e71..239009d680b 100644 --- a/src/vnet/gso/gro_func.h +++ b/src/vnet/gso/gro_func.h @@ -147,7 +147,7 @@ gro_validate_checksum (vlib_main_t * vm, vlib_buffer_t * b0, { u32 flags = 0; - if (b0->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM) + if (b0->flags & VNET_BUFFER_F_OFFLOAD) return VNET_BUFFER_F_L4_CHECKSUM_CORRECT; vlib_buffer_advance (b0, gho0->l3_hdr_offset); if (is_ip4) @@ -353,9 +353,9 @@ gro_fixup_header (vlib_main_t * vm, vlib_buffer_t * b0, u32 ack_number, ip4->length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0) - gho0.l3_hdr_offset); - b0->flags |= - (VNET_BUFFER_F_GSO | VNET_BUFFER_F_IS_IP4 | - VNET_BUFFER_F_OFFLOAD_TCP_CKSUM | VNET_BUFFER_F_OFFLOAD_IP_CKSUM); + b0->flags |= (VNET_BUFFER_F_GSO | VNET_BUFFER_F_IS_IP4); + vnet_buffer_offload_flags_set (b0, (VNET_BUFFER_OFFLOAD_F_TCP_CKSUM | + VNET_BUFFER_OFFLOAD_F_IP_CKSUM)); } else if (gho0.gho_flags & GHO_F_IP6) { @@ -364,9 +364,8 @@ gro_fixup_header (vlib_main_t * vm, vlib_buffer_t * b0, u32 ack_number, ip6->payload_length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0) - gho0.l4_hdr_offset); - b0->flags |= - (VNET_BUFFER_F_GSO | VNET_BUFFER_F_IS_IP6 | - VNET_BUFFER_F_OFFLOAD_TCP_CKSUM); + b0->flags |= (VNET_BUFFER_F_GSO | VNET_BUFFER_F_IS_IP6); + vnet_buffer_offload_flags_set (b0, VNET_BUFFER_OFFLOAD_F_TCP_CKSUM); } tcp_header_t *tcp0 = diff --git a/src/vnet/gso/node.c b/src/vnet/gso/node.c index d0c5ca054e6..ecbdc188ec8 100644 --- a/src/vnet/gso/node.c +++ b/src/vnet/gso/node.c @@ -143,7 +143,8 @@ tso_segment_vxlan_tunnel_headers_fixup (vlib_main_t * vm, vlib_buffer_t * b, { udp->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4); } - b->flags &= ~VNET_BUFFER_F_OFFLOAD_UDP_CKSUM; + /* FIXME: it should be OUTER_UDP_CKSUM */ + vnet_buffer_offload_flags_clear (b, VNET_BUFFER_OFFLOAD_F_UDP_CKSUM); } } @@ -281,7 +282,8 @@ tso_fixup_segmented_buf (vlib_main_t * vm, vlib_buffer_t * b0, u8 tcp_flags, tcp->checksum = 0; tcp->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b0, ip6, &bogus); - b0->flags &= ~VNET_BUFFER_F_OFFLOAD_TCP_CKSUM; + vnet_buffer_offload_flags_clear (b0, + VNET_BUFFER_OFFLOAD_F_TCP_CKSUM); } } else @@ -295,8 +297,8 @@ tso_fixup_segmented_buf (vlib_main_t * vm, vlib_buffer_t * b0, u8 tcp_flags, tcp->checksum = 0; tcp->checksum = ip4_tcp_udp_compute_checksum (vm, b0, ip4); } - b0->flags &= ~VNET_BUFFER_F_OFFLOAD_TCP_CKSUM; - b0->flags &= ~VNET_BUFFER_F_OFFLOAD_IP_CKSUM; + vnet_buffer_offload_flags_clear (b0, (VNET_BUFFER_OFFLOAD_F_IP_CKSUM | + VNET_BUFFER_OFFLOAD_F_TCP_CKSUM)); } if (!is_l2 && ((gho->gho_flags & GHO_F_TUNNEL) == 0)) |