This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via 1d26a1ea71eab90d4a761246b7d76f7ffebdbfad (commit) from fbc5f7d1433bd3a9fea7c55fed6ec3336a4fef02 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 1d26a1ea71eab90d4a761246b7d76f7ffebdbfad Author: Matias Elo matias.elo@nokia.com Date: Tue Jul 16 12:17:39 2019 +0300
linux-gen: dpdk: rename mempool handler ops to avoid naming conflict
DPDK registers mempool ops named 'ops_stack' internally causing multiple definition failure when linking DPDK with '--whole-archive' flag.
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Bill Fischofer billf@me.com
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index deef0b31c..3d15c6495 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -537,7 +537,7 @@ uint32_t _odp_dpdk_pool_obj_size(pool_t *pool, uint32_t block_size) return total_size; }
-static struct rte_mempool_ops ops_stack = { +static struct rte_mempool_ops odp_pool_ops = { .name = "odp_pool", .alloc = pool_alloc, .free = pool_free, @@ -546,7 +546,7 @@ static struct rte_mempool_ops ops_stack = { .get_count = pool_get_count };
-MEMPOOL_REGISTER_OPS(ops_stack); +MEMPOOL_REGISTER_OPS(odp_pool_ops);
static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, odp_packet_t pkt_table[],
-----------------------------------------------------------------------
Summary of changes: platform/linux-generic/pktio/dpdk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive