From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 08175A2E8C for ; Thu, 5 Sep 2019 16:53:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D3A461EFEE; Thu, 5 Sep 2019 16:53:34 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id D66641EF5F; Thu, 5 Sep 2019 16:53:24 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Sep 2019 07:53:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,470,1559545200"; d="scan'208";a="182846349" Received: from silpixa00399752.ir.intel.com (HELO silpixa00399752.ger.corp.intel.com) ([10.237.223.78]) by fmsmga008.fm.intel.com with ESMTP; 05 Sep 2019 07:53:23 -0700 From: Ferruh Yigit To: Declan Doherty Cc: dev@dpdk.org, stable@dpdk.org Date: Thu, 5 Sep 2019 15:53:08 +0100 Message-Id: <20190905145315.19395-4-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190905145315.19395-1-ferruh.yigit@intel.com> References: <20190905145315.19395-1-ferruh.yigit@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 03/10] crypto/null: fix global variable multiple definitions X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" '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 d5e3064f2..f11636c5f 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 d7bfd9cc8..89c4345b6 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.21.0