From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 6A4201B117 for ; Wed, 21 Nov 2018 17:05:57 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CE89B4E938; Wed, 21 Nov 2018 16:05:56 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF1B660A9C; Wed, 21 Nov 2018 16:05:55 +0000 (UTC) From: Kevin Traynor To: Vijay Srivastava Cc: Andrew Rybchenko , dpdk stable Date: Wed, 21 Nov 2018 16:03:58 +0000 Message-Id: <20181121160440.9014-8-ktraynor@redhat.com> In-Reply-To: <20181121160440.9014-1-ktraynor@redhat.com> References: <20181121160440.9014-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 21 Nov 2018 16:05:56 +0000 (UTC) Subject: [dpdk-stable] patch 'net/sfc/base: fix outer IPID field in TSO option descriptors' has been queued to stable release 18.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Nov 2018 16:05:57 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/26/18. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From 4ae0929488de6bdd27eb5039c5376fc8b6a74c9b Mon Sep 17 00:00:00 2001 From: Vijay Srivastava Date: Mon, 10 Sep 2018 10:33:09 +0100 Subject: [PATCH] net/sfc/base: fix outer IPID field in TSO option descriptors [ upstream commit b5f238171d473e670d5f569a396caacf83eaef3a ] Fixes: 912e603706c5 ("net/sfc/base: add outer IP ID parameter to TSOv2 descriptor") Signed-off-by: Vijay Srivastava Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/base/ef10_tx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/sfc/base/ef10_tx.c b/drivers/net/sfc/base/ef10_tx.c index b92cadcbf..e74d39540 100644 --- a/drivers/net/sfc/base/ef10_tx.c +++ b/drivers/net/sfc/base/ef10_tx.c @@ -640,5 +640,5 @@ ef10_tx_qdesc_tso2_create( EFSYS_ASSERT(count >= EFX_TX_FATSOV2_OPT_NDESCS); - EFX_POPULATE_QWORD_6(edp[0].ed_eq, + EFX_POPULATE_QWORD_5(edp[0].ed_eq, ESF_DZ_TX_DESC_IS_OPT, 1, ESF_DZ_TX_OPTION_TYPE, @@ -647,7 +647,6 @@ ef10_tx_qdesc_tso2_create( ESE_DZ_TX_TSO_OPTION_DESC_FATSO2A, ESF_DZ_TX_TSO_IP_ID, ipv4_id, - ESF_DZ_TX_TSO_OUTER_IPID, outer_ipv4_id, ESF_DZ_TX_TSO_TCP_SEQNO, tcp_seq); - EFX_POPULATE_QWORD_4(edp[1].ed_eq, + EFX_POPULATE_QWORD_5(edp[1].ed_eq, ESF_DZ_TX_DESC_IS_OPT, 1, ESF_DZ_TX_OPTION_TYPE, @@ -655,5 +654,6 @@ ef10_tx_qdesc_tso2_create( ESF_DZ_TX_TSO_OPTION_TYPE, ESE_DZ_TX_TSO_OPTION_DESC_FATSO2B, - ESF_DZ_TX_TSO_TCP_MSS, tcp_mss); + ESF_DZ_TX_TSO_TCP_MSS, tcp_mss, + ESF_DZ_TX_TSO_OUTER_IPID, outer_ipv4_id); } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-21 15:59:13.827281132 +0000 +++ 0008-net-sfc-base-fix-outer-IPID-field-in-TSO-option-desc.patch 2018-11-21 15:59:13.000000000 +0000 @@ -1,10 +1,11 @@ -From b5f238171d473e670d5f569a396caacf83eaef3a Mon Sep 17 00:00:00 2001 +From 4ae0929488de6bdd27eb5039c5376fc8b6a74c9b Mon Sep 17 00:00:00 2001 From: Vijay Srivastava Date: Mon, 10 Sep 2018 10:33:09 +0100 Subject: [PATCH] net/sfc/base: fix outer IPID field in TSO option descriptors +[ upstream commit b5f238171d473e670d5f569a396caacf83eaef3a ] + Fixes: 912e603706c5 ("net/sfc/base: add outer IP ID parameter to TSOv2 descriptor") -Cc: stable@dpdk.org Signed-off-by: Vijay Srivastava Signed-off-by: Andrew Rybchenko