From d1be1977878e1f276f9b2a3ff701ce7da2b5cafb Mon Sep 17 00:00:00 2001 From: Pablo de Lara Date: Wed, 13 Dec 2017 15:54:08 +0000 Subject: [PATCH] cryptodev: remove duplicated device name length 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 Acked-by: Tomasz Duszynski --- 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 b0c9f446d7..54a3ad5c08 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") @@ -104,7 +105,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 1443460889..bbf535b950 100644 --- a/config/common_base +++ b/config/common_base @@ -468,7 +468,6 @@ CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=n 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 b121a1f10f..3d60583b01 100644 --- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h +++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h @@ -56,7 +56,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 2de0f4e430..9d685a09f5 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c @@ -410,7 +410,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 7d4250e8cc..948e091ce0 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h @@ -130,7 +130,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 5debe3326a..b8966e934d 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd_private.h +++ b/drivers/crypto/armv8/rte_armv8_pmd_private.h @@ -120,7 +120,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 97577dc795..a397bee651 100644 --- a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h +++ b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h @@ -44,7 +44,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 434cf8509d..a1de33aed9 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 9b37aab408..0fd133625b 100644 --- a/drivers/crypto/null/null_crypto_pmd_private.h +++ b/drivers/crypto/null/null_crypto_pmd_private.h @@ -39,7 +39,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 0f2d61e33c..bc8dc7cdc2 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd_private.h +++ b/drivers/crypto/openssl/rte_openssl_pmd_private.h @@ -70,7 +70,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 c4f018fcc5..eea900e0ad 100644 --- a/drivers/crypto/snow3g/rte_snow3g_pmd_private.h +++ b/drivers/crypto/snow3g/rte_snow3g_pmd_private.h @@ -44,7 +44,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 5d1253b923..b83c4a0473 100644 --- a/drivers/crypto/zuc/rte_zuc_pmd_private.h +++ b/drivers/crypto/zuc/rte_zuc_pmd_private.h @@ -45,7 +45,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.20.1