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 187D1A034E for ; Mon, 21 Feb 2022 16:37:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 114224114E; Mon, 21 Feb 2022 16:37:36 +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 398484114B for ; Mon, 21 Feb 2022 16:37:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457854; 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=aFiHFYn+8dG7uvk70DsmcVCZCogjP63cT4eQAcjoukM=; b=MbLFPdisGFvgq6LOc64bK7H16rRBAzv156lRoifXoJO/zTaG/pF6Gx+7vs4nwU2Mb3/nQJ vNevQhKVRmlz3iRaQImR+KQpMi2Wpe97CUi8SUPQzr9eUqTZ9z0dkyQYPALw0mFlKmehIP 6Wj3Jl83mRzdhay0moA7Vwzvi2UjU+Y= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-7-kYyk_2jpOTSWQ9biICkVPA-1; Mon, 21 Feb 2022 10:37:31 -0500 X-MC-Unique: kYyk_2jpOTSWQ9biICkVPA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AECBA180FD64; Mon, 21 Feb 2022 15:37:30 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D4087E133; Mon, 21 Feb 2022 15:37:29 +0000 (UTC) From: Kevin Traynor To: Anoob Joseph Cc: Akhil Goyal , dpdk stable Subject: patch 'common/cnxk: fix reset of fields' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:27 +0000 Message-Id: <20220221153625.152324-18-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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.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 02/26/22. 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/de6b483f380cb3667a786d17b9cb50c7279dc35a Thanks. Kevin --- >From de6b483f380cb3667a786d17b9cb50c7279dc35a Mon Sep 17 00:00:00 2001 From: Anoob Joseph Date: Fri, 17 Dec 2021 14:49:46 +0530 Subject: [PATCH] common/cnxk: fix reset of fields [ upstream commit f7d904e065c3e82e6892d6b7ed765168c591f6f4 ] Copy DF/DSCP fields would get set based on ipsec_xform in the code preceding this. Setting it again would cause the options to be reset. Fixes: 78d03027f2cc ("common/cnxk: add IPsec common code") Signed-off-by: Anoob Joseph Acked-by: Akhil Goyal --- drivers/common/cnxk/cnxk_security.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/common/cnxk/cnxk_security.c b/drivers/common/cnxk/cnxk_security.c index 30562b46e3..787138b059 100644 --- a/drivers/common/cnxk/cnxk_security.c +++ b/drivers/common/cnxk/cnxk_security.c @@ -445,8 +445,4 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa, } - /* Default options of DSCP and Flow label/DF */ - sa->w2.s.dscp_src = ROC_IE_OT_SA_COPY_FROM_SA; - sa->w2.s.ipv4_df_src_or_ipv6_flw_lbl_src = ROC_IE_OT_SA_COPY_FROM_SA; - skip_tunnel_info: /* ESN */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:45.063479137 +0000 +++ 0018-common-cnxk-fix-reset-of-fields.patch 2022-02-21 15:22:44.043704017 +0000 @@ -1 +1 @@ -From f7d904e065c3e82e6892d6b7ed765168c591f6f4 Mon Sep 17 00:00:00 2001 +From de6b483f380cb3667a786d17b9cb50c7279dc35a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f7d904e065c3e82e6892d6b7ed765168c591f6f4 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org