From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 661E319464 for ; Mon, 9 Oct 2023 13:13:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="RZLCn6e1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE552C433C7; Mon, 9 Oct 2023 13:13:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1696857202; bh=Fwhy3Rs/JdAY9GmGIzPhfU5Gks9mvFmZtl0Gf0h/il4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RZLCn6e1NWfHOxwwMl8zLasNi+jv0A7ubYPIvvXXS92x8XLLuxPtLIouZqq7Jwbax UFAOIF3zkvgDWIwsAccqlCA1obx+CrK7VXKqoYQGa30NGsXKoHytpRDKHTTkpBfbzb of8h9oyFPGir4bHAro4VYZpGcqD1BNlyPgkuri6M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Haiyang Zhang , Simon Horman , Shradha Gupta , Paolo Abeni , Sasha Levin Subject: [PATCH 6.5 131/163] net: mana: Fix the tso_bytes calculation Date: Mon, 9 Oct 2023 15:01:35 +0200 Message-ID: <20231009130127.659991056@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231009130124.021290599@linuxfoundation.org> References: <20231009130124.021290599@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.5-stable review patch. If anyone has any objections, please let me know. ------------------ From: Haiyang Zhang 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 Reviewed-by: Simon Horman Reviewed-by: Shradha Gupta Signed-off-by: Paolo Abeni Stable-dep-of: a43e8e9ffa0d ("net: mana: Fix oversized sge0 for GSO packets") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- 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);