X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_output.h;h=198ca28256663c90939e58a2838775e76cc45993;hb=1bd2c019eba5c893d634cc496bd6d54c00020d7e;hp=f1fa4d85b5eef26e4f4c3b27a8742b13443f2831;hpb=69eeadc03f30c9fb3fe1bb7e2eeb6b04d1bcc596;p=vpp.git diff --git a/src/vnet/interface_output.h b/src/vnet/interface_output.h index f1fa4d85b5e..198ca282566 100644 --- a/src/vnet/interface_output.h +++ b/src/vnet/interface_output.h @@ -41,24 +41,37 @@ #define __INTERFACE_INLINES_H__ #include +#include static_always_inline void -calc_checksums (vlib_main_t * vm, vlib_buffer_t * b) +vnet_calc_checksums_inline (vlib_main_t * vm, vlib_buffer_t * b, + int is_ip4, int is_ip6, int with_gso) { 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); - 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 (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); + } if (is_ip4) {