From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id E27C3A0093
for <public@inbox.dpdk.org>; Tue, 10 May 2022 14:30:54 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id DDC7842833;
Tue, 10 May 2022 14:30:54 +0200 (CEST)
Received: from us-smtp-delivery-124.mimecast.com
(us-smtp-delivery-124.mimecast.com [170.10.133.124])
by mails.dpdk.org (Postfix) with ESMTP id 1C60F4283E
for <stable@dpdk.org>; Tue, 10 May 2022 14:30:53 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1652185852;
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=2jw8Tyjr/szrTreggtgxN0+gAMSNU2pglJ1uNzXKdUo=;
b=WFHs6ZaMxdbVZKu85fwxprv8WdFZiEYvdFiop0x5eEuK+BN5i8LhbmM+ooS3W9vKu1Z64G
poW48SMXmqTRsCRwx5MTVFhraIuZwiv2ZtvmOYkux0uZcdBOAJ7QtyUD90NHhdvrNhPAw0
C7P67Mvi3EMiVzxw2wGNPerAwLTFCXs=
Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com
[66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS
(version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
us-mta-122-h00DVe8JN9Gd3IZt563fmQ-1; Tue, 10 May 2022 08:30:51 -0400
X-MC-Unique: h00DVe8JN9Gd3IZt563fmQ-1
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com
[10.11.54.1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 37B9E185A7A4;
Tue, 10 May 2022 12:30:51 +0000 (UTC)
Received: from rh.Home (unknown [10.39.195.199])
by smtp.corp.redhat.com (Postfix) with ESMTP id F00FD40CFD06;
Tue, 10 May 2022 12:30:49 +0000 (UTC)
From: Kevin Traynor <ktraynor@redhat.com>
To: Anoob Joseph <anoobj@marvell.com>
Cc: Thomas Monjalon <thomas@monjalon.net>,
=?UTF-8?q?Morten=20Br=C3=B8rup?= <mb@smartsharesystems.com>,
dpdk stable <stable@dpdk.org>
Subject: patch 'security: fix SA lifetime comments' has been queued to stable
release 21.11.2
Date: Tue, 10 May 2022 13:30:00 +0100
Message-Id: <20220510123010.159523-23-ktraynor@redhat.com>
In-Reply-To: <20220510123010.159523-1-ktraynor@redhat.com>
References: <20220510123010.159523-1-ktraynor@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1
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-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Hi,
FYI, your patch has been queued to stable release 21.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/15/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/be6637f158eaf3b4d1843decb4b25aad940c95c1
Thanks.
Kevin
---
>From be6637f158eaf3b4d1843decb4b25aad940c95c1 Mon Sep 17 00:00:00 2001
From: Anoob Joseph <anoobj@marvell.com>
Date: Wed, 27 Apr 2022 11:31:45 +0530
Subject: [PATCH] security: fix SA lifetime comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[ upstream commit 99783e212140878153b1abfb65c10c975ca45201 ]
Fix comments to reflect the hard expiry fields.
Fixes: ad7515a39f2a ("security: add SA lifetime configuration")
Reported-by: Thomas Monjalon <thomas@monjalon.net>
Signed-off-by: Anoob Joseph <anoobj@marvell.com>
Reviewed-by: Morten Brørup <mb@smartsharesystems.com>
---
lib/security/rte_security.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h
index 1228b6c8b1..1a15e95267 100644
--- a/lib/security/rte_security.h
+++ b/lib/security/rte_security.h
@@ -302,7 +302,7 @@ struct rte_security_ipsec_lifetime {
/**< Soft expiry limit in bytes */
uint64_t packets_hard_limit;
- /**< Soft expiry limit in number of packets */
+ /**< Hard expiry limit in number of packets */
uint64_t bytes_hard_limit;
- /**< Soft expiry limit in bytes */
+ /**< Hard expiry limit in bytes */
};
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-05-10 13:24:22.210704514 +0100
+++ 0023-security-fix-SA-lifetime-comments.patch 2022-05-10 13:24:21.613646372 +0100
@@ -1 +1 @@
-From 99783e212140878153b1abfb65c10c975ca45201 Mon Sep 17 00:00:00 2001
+From be6637f158eaf3b4d1843decb4b25aad940c95c1 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 99783e212140878153b1abfb65c10c975ca45201 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 2a43cbe811..675db940eb 100644
+index 1228b6c8b1..1a15e95267 100644
@@ -25 +26 @@
-@@ -312,7 +312,7 @@ struct rte_security_ipsec_lifetime {
+@@ -302,7 +302,7 @@ struct rte_security_ipsec_lifetime {