From 2ce24ee7acccd68f3a8e736b67808c33f4902a46 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 5 Sep 2019 15:53:08 +0100 Subject: [PATCH] crypto/null: fix global variable multiple definitions 'null_logtype_driver' global variable is defined in a header file which was causing multiple definitions of the variable, fixed it by moving it to the .c file. Issue has been detected by '-fno-common' gcc flag. Fixes: 735b783d8c2b ("crypto/null: add dynamic logging") Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit --- drivers/crypto/null/null_crypto_pmd.c | 1 + drivers/crypto/null/null_crypto_pmd_private.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/null/null_crypto_pmd.c b/drivers/crypto/null/null_crypto_pmd.c index d5e3064f23..f11636c5f9 100644 --- a/drivers/crypto/null/null_crypto_pmd.c +++ b/drivers/crypto/null/null_crypto_pmd.c @@ -10,6 +10,7 @@ #include "null_crypto_pmd_private.h" static uint8_t cryptodev_driver_id; +int null_logtype_driver; /** verify and set session parameters */ int diff --git a/drivers/crypto/null/null_crypto_pmd_private.h b/drivers/crypto/null/null_crypto_pmd_private.h index d7bfd9cc8f..89c4345b6f 100644 --- a/drivers/crypto/null/null_crypto_pmd_private.h +++ b/drivers/crypto/null/null_crypto_pmd_private.h @@ -8,7 +8,7 @@ #define CRYPTODEV_NAME_NULL_PMD crypto_null /**< Null crypto PMD device name */ -int null_logtype_driver; +extern int null_logtype_driver; #define NULL_LOG(level, fmt, ...) \ rte_log(RTE_LOG_ ## level, null_logtype_driver, \ -- 2.20.1