From: Haiyang Zhang <haiyangz@microsoft.com>
Date: Fri, 29 Sep 2023 20:42:26 +0000 (-0700)
Subject: [PATCH 40/44] net: mana: Fix the tso_bytes calculation
X-Git-Tag: archive/raspbian/6.1.135-1+rpi1^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=302362c57fcdb050768ec7eff2f284151993f265;p=linux.git

[PATCH 40/44] net: mana: Fix the tso_bytes calculation

sizeof(struct hop_jumbo_hdr) is not part of tso_bytes, so remove
the subtraction from header size.

Cc: stable@vger.kernel.org
Fixes: bd7fc6e1957c ("net: mana: Add new MANA VF performance counters for easier troubleshooting")
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Shradha Gupta <shradhagupta@linux.microsoft.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
(cherry picked from commit 7a54de92657455210d0ca71d4176b553952c871a)
Signed-off-by: Bastian Blank <waldi@debian.org>

Gbp-Pq: Topic features/all/ethernet-microsoft
Gbp-Pq: Name 0040-net-mana-Fix-the-tso_bytes-calculation.patch
---

diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index 0abc4d619aa..e3e2a5c516f 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -262,8 +262,6 @@ netdev_tx_t mana_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 				ihs = skb_transport_offset(skb) + sizeof(struct udphdr);
 			} else {
 				ihs = skb_tcp_all_headers(skb);
-				if (ipv6_has_hopopt_jumbo(skb))
-					ihs -= sizeof(struct hop_jumbo_hdr);
 			}
 
 			u64_stats_update_begin(&tx_stats->syncp);