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 <pablo.de.lara.guarch@intel.com>
Acked-by: Tomasz Duszynski <tdu@semihalf.com>

diff --git a/app/test-crypto-perf/cperf_options.h b/app/test-crypto-perf/cperf_options.h
index b0c9f446d749a0932d98937fa100f72fbbb58855..54a3ad5c08f7ce955285c8259a49561a02365190 100644 (file)
--- a/app/test-crypto-perf/cperf_options.h
+++ b/app/test-crypto-perf/cperf_options.h
@@ -3,6 +3,7 @@
 #define _CPERF_OPTIONS_
 
 #include <rte_crypto.h>
+#include <rte_cryptodev.h>
 
 #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 14434608891aadfb23b89b05e60ace7a87dee285..bbf535b9502f81d4f019e9005e61e735100cbb17 100644 (file)
--- 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 b121a1f10fc3673784c479f19ad4d5f280999dcf..3d60583b015f95c140f4151a6d4f3d48b0c8433f 100644 (file)
--- 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 2de0f4e430d1cc7e1315b7efa1d33099d7716731..9d685a09f5b9608ff8854f7fb1193a92e58b6bfa 100644 (file)
--- 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 7d4250e8cc3770e221f9019a225c5bb92e0b1aef..948e091ce0e067f7a3e90a3bdfd9bde2786fdbb7 100644 (file)
--- 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 5debe3326a1640f4737b923f089c8da97efa1990..b8966e934d041212554bd6b74a1c1581d788dd7a 100644 (file)
--- 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 97577dc79513713ad3c2acfdbd38fcbcd053d1e7..a397bee65136ab1aa68feb79ecaf3775798b3dd1 100644 (file)
--- 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 434cf8509dd3f76e9bc57f625a340419f0d02fd6..a1de33aed9dddb9d9d1708b3a785e4774ffc7e57 100644 (file)
--- 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 9b37aab4087c27e91f2eb77615371613c5e58e14..0fd133625b0452bea3a0832eae615de253ddfabb 100644 (file)
--- 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 0f2d61e33cda3c804821a07457a4b2004bdb4bc9..bc8dc7cdc2dbff6816c2a283727c1fb97828744a 100644 (file)
--- 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 c4f018fcc5791636296c97cb627f57d03fd16d30..eea900e0ad3ce4f08cff46c2030f5ab5761f894c 100644 (file)
--- 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 5d1253b92396fa82ece5113a1349ba7e20c73e18..b83c4a0473371e76dae9ba7ddc9f70db9514c6d2 100644 (file)
--- 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 */