diff options
| author |   Chris Luke <chrisy@flirble.org> | 2017-07-07 14:57:07 -0400 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2017-07-13 19:24:43 +0000 |
| commit | a2522f6fd57eb93f57dfcc27c59862d4cc32879a (patch) | |
| tree | 4a453c443d93814a5a44e808e28076eb491129ea | |
| parent | e2d40b81585bceaf30b8547554aab24d60e7d396 (diff) | |
dpdk: fix dpdk_buffer_pool_create name
- vnet_buffer_pool_create should probably be named
dpdk_buffer_pool_create since that is what it does.
- Its prototype should also be in a DPDK plugin header, not in
vlib/buffer_funcs.h, since the implementation is in the plugin
and nobody else should be calling it.
Change-Id: I7ba259afa4b888bc94f3ad257305e286b41e7370
Signed-off-by: Chris Luke <chrisy@flirble.org>
| -rw-r--r-- | src/plugins/dpdk/buffer.c | 2 | ||||
| -rw-r--r-- | src/plugins/dpdk/device/dpdk.h | 3 | ||||
| -rwxr-xr-x | src/plugins/dpdk/device/init.c | 4 | ||||
| -rw-r--r-- | src/vlib/buffer_funcs.h | 3 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c index aa73eb6c008..b0f247e1573 100644 --- a/src/plugins/dpdk/buffer.c +++ b/src/plugins/dpdk/buffer.c @@ -427,7 +427,7 @@ dpdk_packet_template_init (vlib_main_t * vm, } clib_error_t * -vlib_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs, +dpdk_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs, unsigned socket_id) { dpdk_main_t *dm = &dpdk_main; diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index a2686978ea5..55f63b37307 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -453,6 +453,9 @@ uword admin_up_down_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f); +clib_error_t *dpdk_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs, + unsigned socket_id); + #endif /* __included_dpdk_h__ */ /* diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index 17e77618d62..2ec1664b18d 100755 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -1210,13 +1210,13 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) rte_dump_physmem_layout (stdout); /* main thread 1st */ - error = vlib_buffer_pool_create (vm, conf->num_mbufs, rte_socket_id ()); + error = dpdk_buffer_pool_create (vm, conf->num_mbufs, rte_socket_id ()); if (error) return error; for (i = 0; i < RTE_MAX_LCORE; i++) { - error = vlib_buffer_pool_create (vm, conf->num_mbufs, + error = dpdk_buffer_pool_create (vm, conf->num_mbufs, rte_lcore_to_socket_id (i)); if (error) return error; diff --git a/src/vlib/buffer_funcs.h b/src/vlib/buffer_funcs.h index 79e3e69c919..97442e12239 100644 --- a/src/vlib/buffer_funcs.h +++ b/src/vlib/buffer_funcs.h @@ -237,9 +237,6 @@ vlib_buffer_set_known_state (vlib_main_t * vm, u8 *vlib_validate_buffer (vlib_main_t * vm, u32 buffer_index, uword follow_chain); -clib_error_t *vlib_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs, - unsigned socket_id); - /** \brief Allocate buffers into supplied array @param vm - (vlib_main_t *) vlib main data structure pointer |