From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A561E43345 for ; Thu, 16 Nov 2023 14:24:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9F05340DF5; Thu, 16 Nov 2023 14:24:53 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 245A240DDC for ; Thu, 16 Nov 2023 14:24:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZZvkVVuCYyXee/58HaS7q0xzZiqfE5P1WmyLWNZPrDA=; b=HenFoN/Ku70DQb7SJEm27Zfs0gbyaCOA/kUqWTzOcASmzRn6ecEahpqdBhVHlSpdm9VJUk 7PFmaEd3b3XkCc8M8hsHMjpEgJViD/RGSg2Ct/XNEqP0anoGUgD65c5k5sqVQWSXrLnsJj En2y+rfwGkTeNTKzi1uQWviwjzFXJ8s= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-581-4K3Qn0GSMc6cxDprJOKSiA-1; Thu, 16 Nov 2023 08:24:48 -0500 X-MC-Unique: 4K3Qn0GSMc6cxDprJOKSiA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0960C887181; Thu, 16 Nov 2023 13:24:48 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F92B2166B27; Thu, 16 Nov 2023 13:24:47 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Radu Nicolau , dpdk stable Subject: patch 'net/iavf: fix indent in Tx path' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:18 +0000 Message-ID: <20231116132348.557257-36-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.6 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/21/23. 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. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/9e228c5690e699894ac1beb447f9cfce662f6778 Thanks. Kevin --- >From 9e228c5690e699894ac1beb447f9cfce662f6778 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 26 Oct 2023 10:06:16 +0200 Subject: [PATCH] net/iavf: fix indent in Tx path [ upstream commit dbdbb1310ff2a39e215d28d326ba2261d174eee9 ] Fix confusing indentations. Fixes: 1e728b01120c ("net/iavf: rework Tx path") Fixes: 6bc987ecb860 ("net/iavf: support IPsec inline crypto") Signed-off-by: David Marchand Acked-by: Radu Nicolau --- drivers/net/iavf/iavf_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 7374d36499..e810d27bea 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2673,5 +2673,5 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) desc_idx = txe->next_id; txe = txn; - } + } if (nb_desc_ipsec) { @@ -2686,5 +2686,5 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) rte_pktmbuf_free_seg(txe->mbuf); txe->mbuf = NULL; - } + } iavf_fill_ipsec_desc(ipsec_desc, ipsec_md, &ipseclen); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.427309860 +0000 +++ 0036-net-iavf-fix-indent-in-Tx-path.patch 2023-11-16 13:21:52.491946494 +0000 @@ -1 +1 @@ -From dbdbb1310ff2a39e215d28d326ba2261d174eee9 Mon Sep 17 00:00:00 2001 +From 9e228c5690e699894ac1beb447f9cfce662f6778 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dbdbb1310ff2a39e215d28d326ba2261d174eee9 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 72263870a4..9890a31734 100644 +index 7374d36499..e810d27bea 100644 @@ -22 +23 @@ -@@ -2899,5 +2899,5 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) +@@ -2673,5 +2673,5 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) @@ -29 +30 @@ -@@ -2912,5 +2912,5 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) +@@ -2686,5 +2686,5 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)