From: Ferruh Yigit <ferruh.yigit@intel.com>
To: Anoob Joseph <anoobj@marvell.com>
Cc: dev@dpdk.org, stable@dpdk.org
Subject: [dpdk-stable] [PATCH 04/10] crypto/octeontx: fix global variable multiple definitions
Date: Thu, 5 Sep 2019 15:53:09 +0100 [thread overview]
Message-ID: <20190905145315.19395-5-ferruh.yigit@intel.com> (raw)
In-Reply-To: <20190905145315.19395-1-ferruh.yigit@intel.com>
'cpt_logtype' & 'otx_cryptodev_driver_id' global variables are defined
in a header file which was causing multiple definitions of the
variables, fixed it by moving them to the .c file.
Issue has been detected by '-fno-common' gcc flag.
Fixes: bfe2ae495ee2 ("crypto/octeontx: add PMD skeleton")
Cc: stable@dpdk.org
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
drivers/common/cpt/cpt_pmd_logs.h | 2 +-
drivers/crypto/octeontx/otx_cryptodev.c | 2 ++
drivers/crypto/octeontx/otx_cryptodev.h | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/common/cpt/cpt_pmd_logs.h b/drivers/common/cpt/cpt_pmd_logs.h
index 4cbec4e36..2681d1286 100644
--- a/drivers/common/cpt/cpt_pmd_logs.h
+++ b/drivers/common/cpt/cpt_pmd_logs.h
@@ -45,6 +45,6 @@
* cpt_logtype will be used for common logging. This field would be initialized
* by otx_* driver routines during PCI probe.
*/
-int cpt_logtype;
+extern int cpt_logtype;
#endif /* _CPT_PMD_LOGS_H_ */
diff --git a/drivers/crypto/octeontx/otx_cryptodev.c b/drivers/crypto/octeontx/otx_cryptodev.c
index fc64a5f30..604dc2cdb 100644
--- a/drivers/crypto/octeontx/otx_cryptodev.c
+++ b/drivers/crypto/octeontx/otx_cryptodev.c
@@ -16,6 +16,8 @@
#include "otx_cryptodev_ops.h"
static int otx_cryptodev_logtype;
+int cpt_logtype;
+uint8_t otx_cryptodev_driver_id;
static struct rte_pci_id pci_id_cpt_table[] = {
{
diff --git a/drivers/crypto/octeontx/otx_cryptodev.h b/drivers/crypto/octeontx/otx_cryptodev.h
index 6c2871d71..0b204320a 100644
--- a/drivers/crypto/octeontx/otx_cryptodev.h
+++ b/drivers/crypto/octeontx/otx_cryptodev.h
@@ -15,6 +15,6 @@
/*
* Crypto device driver ID
*/
-uint8_t otx_cryptodev_driver_id;
+extern uint8_t otx_cryptodev_driver_id;
#endif /* _OTX_CRYPTODEV_H_ */
--
2.21.0
next prev parent reply other threads:[~2019-09-05 14:53 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190905145315.19395-1-ferruh.yigit@intel.com>
2019-09-05 14:53 ` [dpdk-stable] [PATCH 01/10] bus/fslmc: " Ferruh Yigit
2019-09-10 16:36 ` Sachin Saxena
2019-09-05 14:53 ` [dpdk-stable] [PATCH 02/10] net/igb: " Ferruh Yigit
2019-09-05 14:53 ` [dpdk-stable] [PATCH 03/10] crypto/null: " Ferruh Yigit
2019-09-05 14:53 ` Ferruh Yigit [this message]
2019-09-26 11:20 ` [dpdk-stable] [EXT] [PATCH 04/10] crypto/octeontx: " Anoob Joseph
2019-09-26 18:03 ` Ferruh Yigit
2019-09-05 14:53 ` [dpdk-stable] [PATCH 05/10] crypto/dpaa2_sec: " Ferruh Yigit
2019-09-10 16:53 ` [dpdk-stable] [dpdk-dev] " Sachin Saxena
2019-10-24 14:53 ` [dpdk-stable] " David Marchand
2019-10-24 14:55 ` Ferruh Yigit
2019-10-24 16:56 ` David Marchand
2019-10-25 10:25 ` Ferruh Yigit
2019-09-05 14:53 ` [dpdk-stable] [PATCH 06/10] crypto/virtio: " Ferruh Yigit
2019-09-05 14:53 ` [dpdk-stable] [PATCH 07/10] compress/octeontx: " Ferruh Yigit
2019-09-05 16:00 ` [dpdk-stable] [EXT] " Ashish Gupta
2019-09-05 14:53 ` [dpdk-stable] [PATCH 08/10] app/testpmd: " Ferruh Yigit
2019-10-12 12:36 ` Thomas Monjalon
2019-09-05 14:53 ` [dpdk-stable] [PATCH 09/10] app/test-pipeline: " Ferruh Yigit
2019-09-05 15:01 ` Dumitrescu, Cristian
2019-09-05 15:19 ` Ferruh Yigit
2019-09-05 14:53 ` [dpdk-stable] [PATCH 10/10] test: " Ferruh Yigit
2019-09-05 15:45 ` Honnappa Nagarahalli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190905145315.19395-5-ferruh.yigit@intel.com \
--to=ferruh.yigit@intel.com \
--cc=anoobj@marvell.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).