patch 'cryptodev: fix C++ include' has been queued to stable release 24.11.2
Kevin Traynor
ktraynor at redhat.com
Thu Feb 13 10:58:02 CET 2025
Hi,
FYI, your patch has been queued to stable release 24.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 02/17/25. 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/5d53e2600183649b4274e45c2ba421342a6c25e7
Thanks.
Kevin
---
>From 5d53e2600183649b4274e45c2ba421342a6c25e7 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Thu, 19 Dec 2024 14:30:50 +0100
Subject: [PATCH] cryptodev: fix C++ include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[ upstream commit 24d4d29b5f553e0bae42702b246ae97a812e8f45 ]
Some cryptodev functions were not included in an extern "C" block.
There are 2 blocks, the second one being fast path inline functions,
preceded with an include of the required rte_cryptodev_core.h file.
Fixes: 719834a6849e ("use C linkage where appropriate in headers")
Reported-by: Zhigang Hu <zhigang.hu at intel.com>
Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Reviewed-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Mattias Rönnblom <mattias.ronnblom at ericsson.com>
---
.mailmap | 1 +
lib/cryptodev/rte_cryptodev.h | 12 ++++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/.mailmap b/.mailmap
index 37e2087ec1..bd4b6778ec 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1799,4 +1799,5 @@ Zhenning Xiao <zhenning.xiao at intel.com>
Zhe Tao <zhe.tao at intel.com>
Zhichao Zeng <zhichaox.zeng at intel.com>
+Zhigang Hu <zhigang.hu at intel.com>
Zhigang Lu <zlu at ezchip.com>
Zhiguang He <hezhiguang3 at huawei.com>
diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h
index c64d2f83a0..071ff3dbdf 100644
--- a/lib/cryptodev/rte_cryptodev.h
+++ b/lib/cryptodev/rte_cryptodev.h
@@ -23,4 +23,8 @@
#include "rte_cryptodev_trace_fp.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**
* @internal Logtype used for cryptodev related messages.
@@ -1929,9 +1933,14 @@ int rte_cryptodev_remove_deq_callback(uint8_t dev_id,
struct rte_cryptodev_cb *cb);
-#include <rte_cryptodev_core.h>
+#ifdef __cplusplus
+}
+#endif
+
+#include "rte_cryptodev_core.h"
#ifdef __cplusplus
extern "C" {
#endif
+
/**
*
@@ -2126,5 +2135,4 @@ out:
}
-
#ifdef __cplusplus
}
--
2.48.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-02-12 17:29:38.374167993 +0000
+++ 0035-cryptodev-fix-C-include.patch 2025-02-12 17:29:34.309945685 +0000
@@ -1 +1 @@
-From 24d4d29b5f553e0bae42702b246ae97a812e8f45 Mon Sep 17 00:00:00 2001
+From 5d53e2600183649b4274e45c2ba421342a6c25e7 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 24d4d29b5f553e0bae42702b246ae97a812e8f45 ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -27 +28 @@
-index e428ed3dec..76f65e5114 100644
+index 37e2087ec1..bd4b6778ec 100644
@@ -30 +31 @@
-@@ -1801,4 +1801,5 @@ Zhenning Xiao <zhenning.xiao at intel.com>
+@@ -1799,4 +1799,5 @@ Zhenning Xiao <zhenning.xiao at intel.com>
More information about the stable
mailing list