From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 17B0F2030 for ; Wed, 13 Dec 2017 16:54:13 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Dec 2017 07:54:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,397,1508828400"; d="scan'208";a="13157455" Received: from silpixa00399464.ir.intel.com (HELO silpixa00399464.ger.corp.intel.com) ([10.237.222.157]) by fmsmga001.fm.intel.com with ESMTP; 13 Dec 2017 07:54:11 -0800 From: Pablo de Lara To: declan.doherty@intel.com, jerin.jacob@caviumnetworks.com, jck@semihalf.com, tdu@semihalf.com, dima@marvell.com, nsamsono@marvell.com, jianbo.liu@arm.org Cc: dev@dpdk.org, Pablo de Lara Date: Wed, 13 Dec 2017 15:54:08 +0000 Message-Id: <20171213155408.83253-1-pablo.de.lara.guarch@intel.com> X-Mailer: git-send-email 2.9.4 Subject: [dpdk-dev] [PATCH] cryptodev: remove duplicated device name length X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Dec 2017 15:54:14 -0000 Two macros were defined in cryptodev, to serve the same purpose: RTE_CRYPTODEV_NAME_LEN (in the config file) and RTE_CRYPTODEV_NAME_MAX_LEN (in the rte_cryptodev.h file). Since the second one is part of the external API, the first one has been removed, avoiding duplications. Signed-off-by: Pablo de Lara --- app/test-crypto-perf/cperf_options.h | 3 ++- config/common_base | 1 - drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h | 2 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 2 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h | 2 +- drivers/crypto/armv8/rte_armv8_pmd_private.h | 2 +- drivers/crypto/kasumi/rte_kasumi_pmd_private.h | 2 +- drivers/crypto/mrvl/rte_mrvl_pmd_ops.c | 2 +- drivers/crypto/null/null_crypto_pmd_private.h | 2 +- drivers/crypto/openssl/rte_openssl_pmd_private.h | 2 +- drivers/crypto/snow3g/rte_snow3g_pmd_private.h | 2 +- drivers/crypto/zuc/rte_zuc_pmd_private.h | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/test-crypto-perf/cperf_options.h b/app/test-crypto-perf/cperf_options.h index da4fb47..04b8c01 100644 --- a/app/test-crypto-perf/cperf_options.h +++ b/app/test-crypto-perf/cperf_options.h @@ -3,6 +3,7 @@ #define _CPERF_OPTIONS_ #include +#include #define CPERF_PTEST_TYPE ("ptest") #define CPERF_SILENT ("silent") @@ -102,7 +103,7 @@ struct cperf_options { uint16_t digest_sz; - char device_type[RTE_CRYPTODEV_NAME_LEN]; + char device_type[RTE_CRYPTODEV_NAME_MAX_LEN]; enum cperf_op_type op_type; char *test_file; diff --git a/config/common_base b/config/common_base index e74febe..9b856cb 100644 --- a/config/common_base +++ b/config/common_base @@ -471,7 +471,6 @@ CONFIG_RTE_PMD_PACKET_PREFETCH=y CONFIG_RTE_LIBRTE_CRYPTODEV=y CONFIG_RTE_LIBRTE_CRYPTODEV_DEBUG=n CONFIG_RTE_CRYPTO_MAX_DEVS=64 -CONFIG_RTE_CRYPTODEV_NAME_LEN=64 # # Compile PMD for ARMv8 Crypto device diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h index 1c8835b..b21b2ba 100644 --- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h +++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h @@ -84,7 +84,7 @@ struct aesni_gcm_qp { /**< Session Mempool */ uint16_t id; /**< Queue Pair Identifier */ - char name[RTE_CRYPTODEV_NAME_LEN]; + char name[RTE_CRYPTODEV_NAME_MAX_LEN]; /**< Unique Queue Pair Name */ uint8_t temp_digest[DIGEST_LENGTH_MAX]; /**< Buffer used to store the digest generated diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c index 3b3ef0c..ed87247 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c @@ -409,7 +409,7 @@ aesni_mb_pmd_qp_create_processed_ops_ring(struct aesni_mb_qp *qp, const char *str, unsigned int ring_size, int socket_id) { struct rte_ring *r; - char ring_name[RTE_CRYPTODEV_NAME_LEN]; + char ring_name[RTE_CRYPTODEV_NAME_MAX_LEN]; unsigned int n = snprintf(ring_name, sizeof(ring_name), "%s_%s", diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h index fe3bd73..8314019 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h @@ -154,7 +154,7 @@ struct aesni_mb_private { struct aesni_mb_qp { uint16_t id; /**< Queue Pair Identifier */ - char name[RTE_CRYPTODEV_NAME_LEN]; + char name[RTE_CRYPTODEV_NAME_MAX_LEN]; /**< Unique Queue Pair Name */ const struct aesni_mb_op_fns *op_fns; /**< Vector mode dependent pointer table of the multi-buffer APIs */ diff --git a/drivers/crypto/armv8/rte_armv8_pmd_private.h b/drivers/crypto/armv8/rte_armv8_pmd_private.h index fa31f0a..534945f 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd_private.h +++ b/drivers/crypto/armv8/rte_armv8_pmd_private.h @@ -148,7 +148,7 @@ struct armv8_crypto_qp { /**< Session Mempool */ struct rte_cryptodev_stats stats; /**< Queue pair statistics */ - char name[RTE_CRYPTODEV_NAME_LEN]; + char name[RTE_CRYPTODEV_NAME_MAX_LEN]; /**< Unique Queue Pair Name */ uint8_t temp_digest[DIGEST_LENGTH_MAX]; /**< Buffer used to store the digest generated diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h index 5f7044b..f48f25f 100644 --- a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h +++ b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h @@ -72,7 +72,7 @@ struct kasumi_private { struct kasumi_qp { uint16_t id; /**< Queue Pair Identifier */ - char name[RTE_CRYPTODEV_NAME_LEN]; + char name[RTE_CRYPTODEV_NAME_MAX_LEN]; /**< Unique Queue Pair Name */ struct rte_ring *processed_ops; /**< Ring for placing processed ops */ diff --git a/drivers/crypto/mrvl/rte_mrvl_pmd_ops.c b/drivers/crypto/mrvl/rte_mrvl_pmd_ops.c index 434cf85..a1de33a 100644 --- a/drivers/crypto/mrvl/rte_mrvl_pmd_ops.c +++ b/drivers/crypto/mrvl/rte_mrvl_pmd_ops.c @@ -558,7 +558,7 @@ mrvl_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, int socket_id, struct rte_mempool *session_pool) { struct mrvl_crypto_qp *qp = NULL; - char match[RTE_CRYPTODEV_NAME_LEN]; + char match[RTE_CRYPTODEV_NAME_MAX_LEN]; unsigned int n; /* Allocate the queue pair data structure. */ diff --git a/drivers/crypto/null/null_crypto_pmd_private.h b/drivers/crypto/null/null_crypto_pmd_private.h index 7c7852f..58c72ee 100644 --- a/drivers/crypto/null/null_crypto_pmd_private.h +++ b/drivers/crypto/null/null_crypto_pmd_private.h @@ -67,7 +67,7 @@ struct null_crypto_private { struct null_crypto_qp { uint16_t id; /**< Queue Pair Identifier */ - char name[RTE_CRYPTODEV_NAME_LEN]; + char name[RTE_CRYPTODEV_NAME_MAX_LEN]; /**< Unique Queue Pair Name */ struct rte_ring *processed_pkts; /**< Ring for placing process packets */ diff --git a/drivers/crypto/openssl/rte_openssl_pmd_private.h b/drivers/crypto/openssl/rte_openssl_pmd_private.h index 26bf862..999bf0b 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd_private.h +++ b/drivers/crypto/openssl/rte_openssl_pmd_private.h @@ -98,7 +98,7 @@ struct openssl_private { struct openssl_qp { uint16_t id; /**< Queue Pair Identifier */ - char name[RTE_CRYPTODEV_NAME_LEN]; + char name[RTE_CRYPTODEV_NAME_MAX_LEN]; /**< Unique Queue Pair Name */ struct rte_ring *processed_ops; /**< Ring for placing process packets */ diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd_private.h b/drivers/crypto/snow3g/rte_snow3g_pmd_private.h index 7b9729f..5f98a27 100644 --- a/drivers/crypto/snow3g/rte_snow3g_pmd_private.h +++ b/drivers/crypto/snow3g/rte_snow3g_pmd_private.h @@ -72,7 +72,7 @@ struct snow3g_private { struct snow3g_qp { uint16_t id; /**< Queue Pair Identifier */ - char name[RTE_CRYPTODEV_NAME_LEN]; + char name[RTE_CRYPTODEV_NAME_MAX_LEN]; /**< Unique Queue Pair Name */ struct rte_ring *processed_ops; /**< Ring for placing processed ops */ diff --git a/drivers/crypto/zuc/rte_zuc_pmd_private.h b/drivers/crypto/zuc/rte_zuc_pmd_private.h index a57b8cd..e70b8e6 100644 --- a/drivers/crypto/zuc/rte_zuc_pmd_private.h +++ b/drivers/crypto/zuc/rte_zuc_pmd_private.h @@ -73,7 +73,7 @@ struct zuc_private { struct zuc_qp { uint16_t id; /**< Queue Pair Identifier */ - char name[RTE_CRYPTODEV_NAME_LEN]; + char name[RTE_CRYPTODEV_NAME_MAX_LEN]; /**< Unique Queue Pair Name */ struct rte_ring *processed_ops; /**< Ring for placing processed ops */ -- 2.9.4