[dpdk-stable] patch 'crypto/kasumi: fix extern declaration' has been queued to LTS release 18.11.9
Kevin Traynor
ktraynor at redhat.com
Fri Jun 5 20:24:28 CEST 2020
Hi,
FYI, your patch has been queued to LTS release 18.11.9
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/33e94066f7dc9c40ed16f5b6eca7d862251afa19
Thanks.
Kevin.
---
>From 33e94066f7dc9c40ed16f5b6eca7d862251afa19 Mon Sep 17 00:00:00 2001
From: Kevin Traynor <ktraynor at redhat.com>
Date: Wed, 6 May 2020 10:45:18 +0100
Subject: [PATCH] crypto/kasumi: fix extern declaration
[ upstream commit 6a6b5d5616c976eb306cbdbcf9241aba08d2516e ]
gcc 10 defaults to fno-common and it reports:
crypto_kasumi_rte_kasumi_pmd_ops.c.o:(.data.rel+0x0):
multiple definition of `rte_kasumi_pmd_ops';
crypto_kasumi_rte_kasumi_pmd.c.o:(.bss+0x8): first defined here
Fix by making rte_kasumi_pmd_ops extern in the header file.
Fixes: 2773c86d061a ("crypto/kasumi: add driver for KASUMI library")
Signed-off-by: Kevin Traynor <ktraynor at redhat.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
---
drivers/crypto/kasumi/rte_kasumi_pmd_private.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
index bb34a16f7c..d26a86b62c 100644
--- a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
+++ b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
@@ -71,5 +71,5 @@ kasumi_set_session_parameters(struct kasumi_session *sess,
/** device specific operations function pointer structure */
-struct rte_cryptodev_ops *rte_kasumi_pmd_ops;
+extern struct rte_cryptodev_ops *rte_kasumi_pmd_ops;
#endif /* _RTE_KASUMI_PMD_PRIVATE_H_ */
--
2.21.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-06-05 19:20:52.565156799 +0100
+++ 0031-crypto-kasumi-fix-extern-declaration.patch 2020-06-05 19:20:50.758041995 +0100
@@ -1 +1 @@
-From 6a6b5d5616c976eb306cbdbcf9241aba08d2516e Mon Sep 17 00:00:00 2001
+From 33e94066f7dc9c40ed16f5b6eca7d862251afa19 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6a6b5d5616c976eb306cbdbcf9241aba08d2516e ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
- drivers/crypto/kasumi/kasumi_pmd_private.h | 2 +-
+ drivers/crypto/kasumi/rte_kasumi_pmd_private.h | 2 +-
@@ -23,5 +24,5 @@
-diff --git a/drivers/crypto/kasumi/kasumi_pmd_private.h b/drivers/crypto/kasumi/kasumi_pmd_private.h
-index b7f1c428b4..abedcd616d 100644
---- a/drivers/crypto/kasumi/kasumi_pmd_private.h
-+++ b/drivers/crypto/kasumi/kasumi_pmd_private.h
-@@ -77,5 +77,5 @@ kasumi_set_session_parameters(MB_MGR *mgr, struct kasumi_session *sess,
+diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
+index bb34a16f7c..d26a86b62c 100644
+--- a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
++++ b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
+@@ -71,5 +71,5 @@ kasumi_set_session_parameters(struct kasumi_session *sess,
@@ -33 +34 @@
- #endif /* _KASUMI_PMD_PRIVATE_H_ */
+ #endif /* _RTE_KASUMI_PMD_PRIVATE_H_ */
More information about the stable
mailing list