From: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
Date: Tue, 4 May 2021 13:46:33 +0000 (+0200)
Subject: avf: Fix cksum offload / ipsec
X-Git-Tag: v21.10-rc0~106
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=bd376a8ce8425f45b23074398949e8055de29280;p=vpp.git

avf: Fix cksum offload / ipsec

VNET_BUFFER_F_OFFLOAD means 'check 2nd cacheline'
but we can still have TCP_CKSUM=0 & UDP_CKSUM=0

Type: fix

Change-Id: I42b5974f6d34b777aa959c06c67619a5c83c5805
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
---

diff --git a/src/plugins/avf/output.c b/src/plugins/avf/output.c
index b50a1e23c7a..decd8b5b939 100644
--- a/src/plugins/avf/output.c
+++ b/src/plugins/avf/output.c
@@ -63,9 +63,14 @@ avf_tx_prepare_cksum (vlib_buffer_t * b, u8 is_tso)
   vnet_buffer_oflags_t oflags = vnet_buffer (b)->oflags;
   u32 is_tcp = is_tso || oflags & VNET_BUFFER_OFFLOAD_F_TCP_CKSUM;
   u32 is_udp = !is_tso && oflags & VNET_BUFFER_OFFLOAD_F_UDP_CKSUM;
+
+  if (!is_tcp && !is_udp)
+    return 0;
+
   u32 is_ip4 = b->flags & VNET_BUFFER_F_IS_IP4;
   u32 is_ip6 = b->flags & VNET_BUFFER_F_IS_IP6;
-  ASSERT (!is_tcp || !is_udp);
+
+  ASSERT (!(is_tcp && is_udp));
   ASSERT (is_ip4 || is_ip6);
   i16 l2_hdr_offset = b->current_data;
   i16 l3_hdr_offset = vnet_buffer (b)->l3_hdr_offset;