From fe06cb6c54fe5ada299ebba40a382bee37c919f2 Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Tue, 30 Jan 2018 21:27:47 +0530 Subject: [PATCH] eal: fix default mempool ops If '--mbuf-pool-ops' is not passed to EAL as command line argument then rte_eal_mbuf_default_mempool_ops will return NULL. Instead check if internal_config.user_mbuf_pool_ops_name is NULL and return compile time RTE_MBUF_DEFAULT_MEMPOOL_OPS. Fixes: 8b0f7f43413 ("mbuf: maintain user and compile time mempool ops name") Signed-off-by: Pavan Nikhilesh --- lib/librte_eal/bsdapp/eal/eal.c | 3 +++ lib/librte_eal/linuxapp/eal/eal.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index ba1811a000..07b229fc72 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -115,6 +115,9 @@ int rte_cycles_vmware_tsc_map; const char * rte_eal_mbuf_default_mempool_ops(void) { + if (internal_config.user_mbuf_pool_ops_name == NULL) + return RTE_MBUF_DEFAULT_MEMPOOL_OPS; + return internal_config.user_mbuf_pool_ops_name; } diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index 66f7585a32..ddcdb6e1fd 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -125,6 +125,9 @@ int rte_cycles_vmware_tsc_map; const char * rte_eal_mbuf_default_mempool_ops(void) { + if (internal_config.user_mbuf_pool_ops_name == NULL) + return RTE_MBUF_DEFAULT_MEMPOOL_OPS; + return internal_config.user_mbuf_pool_ops_name; } -- 2.20.1