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 C440943345 for ; Thu, 16 Nov 2023 14:24:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD15640E40; Thu, 16 Nov 2023 14:24:54 +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 C071A40DDC 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=1700141092; 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=isstYnNbG8avKF9fHXO8B/fVPSpSDv93tgKX+odiUTs=; b=TIqqhdKUENS11TV7K+PM/lYOD8U1wOJnQzu/pJAYh+IgDzpM1hFowwAr3M+rM6965kjKkG AbKNrmVjiwSI895da3HZk85UKuyOqvjHQOy9dWifod1f5JTkH4E8OhDk+V4EnlWZfJveLd JXVAjJ2Gy9iKBhI2tRDL2HxLCvn/2d0= 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-689-AmTiIAtUM22GlqDXBUVKew-1; Thu, 16 Nov 2023 08:24:47 -0500 X-MC-Unique: AmTiIAtUM22GlqDXBUVKew-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 0261B85A5BD; Thu, 16 Nov 2023 13:24:47 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B1532166B27; Thu, 16 Nov 2023 13:24:46 +0000 (UTC) From: Kevin Traynor To: Radu Nicolau Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix Tx offload mask' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:17 +0000 Message-ID: <20231116132348.557257-35-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/820e8fc77008d2f4b422e301c60f952b96fab663 Thanks. Kevin --- >From 820e8fc77008d2f4b422e301c60f952b96fab663 Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Tue, 24 Oct 2023 10:13:28 +0100 Subject: [PATCH] net/iavf: fix Tx offload mask [ upstream commit 3295697286accac24e1014fa3c0320a0c597bc1e ] IAVF_TX_OFFLOAD_MASK definition contained RTE_ETH_TX_OFFLOAD_SECURITY instead of RTE_MBUF_F_TX_SEC_OFFLOAD. Fixes: 6bc987ecb860 ("net/iavf: support IPsec inline crypto") Signed-off-by: Radu Nicolau Acked-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h index db665a6468..c428082080 100644 --- a/drivers/net/iavf/iavf_rxtx.h +++ b/drivers/net/iavf/iavf_rxtx.h @@ -73,5 +73,5 @@ RTE_MBUF_F_TX_L4_MASK | \ RTE_MBUF_F_TX_TCP_SEG | \ - RTE_ETH_TX_OFFLOAD_SECURITY) + RTE_MBUF_F_TX_SEC_OFFLOAD) #define IAVF_TX_OFFLOAD_NOTSUP_MASK \ -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.406451001 +0000 +++ 0035-net-iavf-fix-Tx-offload-mask.patch 2023-11-16 13:21:52.489946489 +0000 @@ -1 +1 @@ -From 3295697286accac24e1014fa3c0320a0c597bc1e Mon Sep 17 00:00:00 2001 +From 820e8fc77008d2f4b422e301c60f952b96fab663 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3295697286accac24e1014fa3c0320a0c597bc1e ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index d3324e0e6e..f432f9d956 100644 +index db665a6468..c428082080 100644 @@ -23,3 +24,3 @@ -@@ -99,5 +99,5 @@ - RTE_MBUF_F_TX_OUTER_IP_CKSUM | \ - RTE_MBUF_F_TX_OUTER_UDP_CKSUM | \ +@@ -73,5 +73,5 @@ + RTE_MBUF_F_TX_L4_MASK | \ + RTE_MBUF_F_TX_TCP_SEG | \