patches/kernel/0010-net-thunderbolt-Fix-TCPv6-GSO-checksum-calculation.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: Mika Westerberg <mika.westerberg@linux.intel.com>
   3 Date: Wed, 13 Sep 2023 08:26:47 +0300
   4 Subject: [PATCH] net: thunderbolt: Fix TCPv6 GSO checksum calculation
   5
   6 Alex reported that running ssh over IPv6 does not work with
   7 Thunderbolt/USB4 networking driver. The reason for that is that driver
   8 should call skb_is_gso() before calling skb_is_gso_v6(), and it should
   9 not return false after calculates the checksum successfully. This probably
  10 was a copy paste error from the original driver where it was done properly.
  11
  12 Reported-by: Alex Balcanquall <alex@alexbal.com>
  13 Fixes: e69b6c02b4c3 ("net: Add support for networking over Thunderbolt cable")
  14 Cc: stable@vger.kernel.org
  15 Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
  16 Reviewed-by: Eric Dumazet <edumazet@google.com>
  17 Reviewed-by: Jiri Pirko <jiri@nvidia.com>
  18 Reviewed-by: Jiri Pirko <jiri@nvidia.com>
  19 Signed-off-by: David S. Miller <davem@davemloft.net>
  20 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  21 ---
  22  drivers/net/thunderbolt/main.c | 3 +--
  23  1 file changed, 1 insertion(+), 2 deletions(-)
  24
  25 diff --git a/drivers/net/thunderbolt/main.c b/drivers/net/thunderbolt/main.c
  26 index 0c1e8970ee58..0a53ec293d04 100644
  27 --- a/drivers/net/thunderbolt/main.c
  28 +++ b/drivers/net/thunderbolt/main.c
  29 @@ -1049,12 +1049,11 @@ static bool tbnet_xmit_csum_and_map(struct tbnet *net, struct sk_buff *skb,
  30                 *tucso = ~csum_tcpudp_magic(ip_hdr(skb)->saddr,
  31                                             ip_hdr(skb)->daddr, 0,
  32                                             ip_hdr(skb)->protocol, 0);
  33 -       } else if (skb_is_gso_v6(skb)) {
  34 +       } else if (skb_is_gso(skb) && skb_is_gso_v6(skb)) {
  35                 tucso = dest + ((void *)&(tcp_hdr(skb)->check) - data);
  36                 *tucso = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
  37                                           &ipv6_hdr(skb)->daddr, 0,
  38                                           IPPROTO_TCP, 0);
  39 -               return false;
  40         } else if (protocol == htons(ETH_P_IPV6)) {
  41                 tucso = dest + skb_checksum_start_offset(skb) + skb->csum_offset;
  42                 *tucso = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,