From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 417ACC43331 for ; Mon, 11 Nov 2019 18:56:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B4A121783 for ; Mon, 11 Nov 2019 18:56:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498569; bh=ygJQPBu2LlwrjY1MmWjJIX7q1jI3QH98eAB3vXm+lQQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZeaJg7Te0j3kb4zpAsbNV2GVumRcRpvUU/U57Dzb5K6PkwES9437AwaRzLOVESBPy eDGKSwSqaviTulku9M9+5L83/mJwgzn5sbhcxGtT4hXhyOpR8AZeR5B0RfMMAK2fe0 mlaYTZAMdKjAGpZusoKjrbNB1KpWYEkLo+xbmAbY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730416AbfKKS4H (ORCPT ); Mon, 11 Nov 2019 13:56:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:54002 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729325AbfKKS4F (ORCPT ); Mon, 11 Nov 2019 13:56:05 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7830E20818; Mon, 11 Nov 2019 18:56:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498565; bh=ygJQPBu2LlwrjY1MmWjJIX7q1jI3QH98eAB3vXm+lQQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OZli4X4ht8byxEYmoaTgExDFEuCLq6YF8YDbgOosDSDShZckCfF+05EhpEwrJayDa jTfRF2hj2S3vlwtFFYdA3DbfQrQkK6VRYqQW9eYGA4WaVw59dK6gJUAAkpF6VZ43Zy p3wc9TgvWKLlsX1kuJMiKV+ibZ3gNqa1D+2uExTM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , Maxime Coquelin , yuqi jin , Shaokun Zhang , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.3 116/193] net: stmmac: Fix the problem of tso_xmit Date: Mon, 11 Nov 2019 19:28:18 +0100 Message-Id: <20191111181509.701697275@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181459.850623879@linuxfoundation.org> References: <20191111181459.850623879@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: yuqi jin [ Upstream commit 34c15202896d11e3974788daf9005a84ec45f7a2 ] When the address width of DMA is greater than 32, the packet header occupies a BD descriptor. The starting address of the data should be added to the header length. Fixes: a993db88d17d ("net: stmmac: Enable support for > 32 Bits addressing in XGMAC") Cc: Eric Dumazet Cc: Giuseppe Cavallaro Cc: Alexandre Torgue Cc: Jose Abreu Cc: "David S. Miller" Cc: Maxime Coquelin Signed-off-by: yuqi jin Signed-off-by: Shaokun Zhang Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index fe2d3029de5ea..ed0e694a08553 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2906,6 +2906,7 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) } else { stmmac_set_desc_addr(priv, first, des); tmp_pay_len = pay_len; + des += proto_hdr_len; } stmmac_tso_allocator(priv, des, tmp_pay_len, (nfrags == 0), queue); -- 2.20.1