diff options
| author |   Damjan Marion <damarion@cisco.com> | 2018-02-15 11:59:04 +0100 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2018-02-15 12:38:16 +0000 |
| commit | 07510dd1a812fe064c8d44dd25e6c8a598a709cf (patch) | |
| tree | c04ea244f766a4c3cd621473febfd0ef0f2d6b9c /src/plugins/dpdk/buffer.c | |
| parent | a43ccaefc3bd50c03c90f7c3bee02eac9709df56 (diff) | |
dpdk: add support for DPDK 18.02, deprecate 17.08
17.11 is still default.
Change-Id: I524d232579db8a59c717c5d760398b6b7f811d03
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/plugins/dpdk/buffer.c')
| -rw-r--r-- | src/plugins/dpdk/buffer.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c index 01ec1ac1f3c..7b17578f68d 100644 --- a/src/plugins/dpdk/buffer.c +++ b/src/plugins/dpdk/buffer.c @@ -471,11 +471,7 @@ dpdk_pool_create (vlib_main_t * vm, u8 * pool_name, u32 elt_size, i32 ret; obj_size = rte_mempool_calc_obj_size (elt_size, 0, 0); -#if RTE_VERSION < RTE_VERSION_NUM(17, 11, 0, 0) - size = rte_mempool_xmem_size (num_elts, obj_size, 21); -#else size = rte_mempool_xmem_size (num_elts, obj_size, 21, 0); -#endif error = vlib_physmem_region_alloc (vm, (i8 *) pool_name, size, numa, 0, pri); @@ -492,15 +488,9 @@ dpdk_pool_create (vlib_main_t * vm, u8 * pool_name, u32 elt_size, rte_mempool_set_ops_byname (mp, RTE_MBUF_DEFAULT_MEMPOOL_OPS, NULL); -#if RTE_VERSION < RTE_VERSION_NUM(17, 11, 0, 0) - ret = - rte_mempool_populate_phys_tab (mp, pr->mem, pr->page_table, pr->n_pages, - pr->log2_page_size, NULL, NULL); -#else ret = rte_mempool_populate_iova_tab (mp, pr->mem, pr->page_table, pr->n_pages, pr->log2_page_size, NULL, NULL); -#endif if (ret != (i32) mp->size) { rte_mempool_free (mp); |