]> git.baikalelectronics.ru Git - kernel.git/commitdiff
udp: not remove the CRC flag from dev features when need_csum is false
authorXin Long <lucien.xin@gmail.com>
Sat, 16 Jan 2021 05:59:17 +0000 (13:59 +0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 21 Jan 2021 06:14:59 +0000 (22:14 -0800)
In __skb_udp_tunnel_segment(), when it's a SCTP over VxLAN/GENEVE
packet and need_csum is false, which means the outer udp checksum
doesn't need to be computed, csum_start and csum_offset could be
used by the inner SCTP CRC CSUM for SCTP HW CRC offload.

So this patch is to not remove the CRC flag from dev features when
need_csum is false.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Link: https://lore.kernel.org/r/1e81b700642498546eaa3f298e023fd7ad394f85.1610776757.git.lucien.xin@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv4/udp_offload.c

index ff39e94781bfb825a6d24d7642424458550e6a12..1168d186cc438742a0d12d8a18f49be5abfeeef3 100644 (file)
@@ -68,8 +68,8 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb,
                                      (NETIF_F_HW_CSUM | NETIF_F_IP_CSUM))));
 
        features &= skb->dev->hw_enc_features;
-       /* CRC checksum can't be handled by HW when it's a UDP tunneling packet. */
-       features &= ~NETIF_F_SCTP_CRC;
+       if (need_csum)
+               features &= ~NETIF_F_SCTP_CRC;
 
        /* The only checksum offload we care about from here on out is the
         * outer one so strip the existing checksum feature flags and