[dpdk-stable] patch 'crypto/kasumi: fix extern declaration' has been queued to stable release 19.11.3

luca.boccassi at gmail.com luca.boccassi at gmail.com
Tue May 19 15:05:12 CEST 2020


Hi,

FYI, your patch has been queued to stable release 19.11.3

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/21/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.

Thanks.

Luca Boccassi

---
>From b1684830892f12d0696c3cdebd19ef1df149a712 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/kasumi_pmd_private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/kasumi/kasumi_pmd_private.h b/drivers/crypto/kasumi/kasumi_pmd_private.h
index fda696804e..f0b83f2272 100644
--- a/drivers/crypto/kasumi/kasumi_pmd_private.h
+++ b/drivers/crypto/kasumi/kasumi_pmd_private.h
@@ -72,6 +72,6 @@ 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 /* _KASUMI_PMD_PRIVATE_H_ */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:51.747066072 +0100
+++ 0177-crypto-kasumi-fix-extern-declaration.patch	2020-05-19 14:04:44.520653884 +0100
@@ -1,8 +1,10 @@
-From 6a6b5d5616c976eb306cbdbcf9241aba08d2516e Mon Sep 17 00:00:00 2001
+From b1684830892f12d0696c3cdebd19ef1df149a712 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):
@@ -12,7 +14,6 @@
 Fix by making rte_kasumi_pmd_ops extern in the header file.
 
 Fixes: 2773c86d061a ("crypto/kasumi: add driver for KASUMI library")
-Cc: stable at dpdk.org
 
 Signed-off-by: Kevin Traynor <ktraynor at redhat.com>
 Acked-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
@@ -21,10 +22,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/crypto/kasumi/kasumi_pmd_private.h b/drivers/crypto/kasumi/kasumi_pmd_private.h
-index b7f1c428b4..abedcd616d 100644
+index fda696804e..f0b83f2272 100644
 --- a/drivers/crypto/kasumi/kasumi_pmd_private.h
 +++ b/drivers/crypto/kasumi/kasumi_pmd_private.h
-@@ -76,6 +76,6 @@ kasumi_set_session_parameters(MB_MGR *mgr, struct kasumi_session *sess,
+@@ -72,6 +72,6 @@ kasumi_set_session_parameters(struct kasumi_session *sess,
  
  
  /** device specific operations function pointer structure */


More information about the stable mailing list