diff options
| author |   Zhiyong Yang <zhiyong.yang@intel.com> | 2019-04-19 05:22:31 -0400 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-04-23 07:16:52 +0000 |
| commit | 24c5012139f5de371d548c86117518d240e82ebb (patch) | |
| tree | 6fd87ff56006556e2916057a82cc8aaded14ad45 | |
| parent | 2c1904fa8efffabfadd7f09edb4da98c2e172cd6 (diff) | |
vnet: clean up calc_checksums()
Remove the duplicated code and unnecessary operations.
Change-Id: I78005848d29d3156165627926a79015d590d61a6
Signed-off-by: Zhiyong Yang <zhiyong.yang@intel.com>
| -rw-r--r-- | src/vnet/interface_output.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c index 698c6e13097..57eea0fa95a 100644 --- a/src/vnet/interface_output.c +++ b/src/vnet/interface_output.c @@ -179,8 +179,6 @@ vnet_interface_output_trace (vlib_main_t * vm, static_always_inline void calc_checksums (vlib_main_t * vm, vlib_buffer_t * b) { - ip4_header_t *ip4; - ip6_header_t *ip6; tcp_header_t *th; udp_header_t *uh; @@ -189,13 +187,13 @@ calc_checksums (vlib_main_t * vm, vlib_buffer_t * b) 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 (is_ip4) { + ip4_header_t *ip4; + ip4 = (ip4_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset); if (b->flags & VNET_BUFFER_F_OFFLOAD_IP_CKSUM) ip4->checksum = ip4_header_checksum (ip4); @@ -204,19 +202,22 @@ calc_checksums (vlib_main_t * vm, vlib_buffer_t * b) th->checksum = 0; th->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4); } - if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM) + else if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM) uh->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4); } - if (is_ip6) + else if (is_ip6) { int bogus; + ip6_header_t *ip6; + + ip6 = (ip6_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset); 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) + else if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM) { uh->checksum = 0; uh->checksum = |