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>

diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c
index aa73eb6..b0f247e 100644 (file)
--- 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 a268697..55f63b3 100644 (file)
--- 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 17e7761..2ec1664 100755 (executable)
--- 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 79e3e69..97442e1 100644 (file)
--- 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