6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haiyang Zhang haiyangz@microsoft.com
commit 7a54de92657455210d0ca71d4176b553952c871a upstream.
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 Stable-dep-of: a43e8e9ffa0d ("net: mana: Fix oversized sge0 for GSO packets") Signed-off-by: Sasha Levin sashal@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/net/ethernet/microsoft/mana/mana_en.c | 2 -- 1 file changed, 2 deletions(-)
--- 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_bu 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);