From ca33590b6af032bff57d9cc70455660466a654b2 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 19 Feb 2018 11:16:57 +0000 Subject: New upstream version 18.02 Change-Id: I89ed24cb2a49b78fe5be6970b99dd46c1499fcc3 Signed-off-by: Luca Boccassi --- drivers/crypto/mrvl/Makefile | 5 +++-- drivers/crypto/mrvl/rte_mrvl_compat.h | 1 + drivers/crypto/mrvl/rte_mrvl_pmd_ops.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'drivers/crypto/mrvl') diff --git a/drivers/crypto/mrvl/Makefile b/drivers/crypto/mrvl/Makefile index 3532f7cf..bc5c2270 100644 --- a/drivers/crypto/mrvl/Makefile +++ b/drivers/crypto/mrvl/Makefile @@ -47,13 +47,14 @@ LIB = librte_pmd_mrvl_crypto.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_ARCH_DMA_ADDR_T_64BIT +CFLAGS += -DMVCONF_TYPES_PUBLIC +CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC # library version LIBABIVER := 1 # versioning export map -EXPORT_MAP := rte_mrvl_pmd_version.map +EXPORT_MAP := rte_pmd_mrvl_version.map # external library dependencies LDLIBS += -L$(LIBMUSDK_PATH)/lib -lmusdk diff --git a/drivers/crypto/mrvl/rte_mrvl_compat.h b/drivers/crypto/mrvl/rte_mrvl_compat.h index c29fa105..22cd1840 100644 --- a/drivers/crypto/mrvl/rte_mrvl_compat.h +++ b/drivers/crypto/mrvl/rte_mrvl_compat.h @@ -43,6 +43,7 @@ #ifdef container_of #undef container_of #endif +#include "env/mv_autogen_comp_flags.h" #include "drivers/mv_sam.h" #include "drivers/mv_sam_cio.h" #include "drivers/mv_sam_session.h" diff --git a/drivers/crypto/mrvl/rte_mrvl_pmd_ops.c b/drivers/crypto/mrvl/rte_mrvl_pmd_ops.c index 434cf850..a1de33ae 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. */ -- cgit 1.2.3-korg