nat: use correct data types for memory sizes

[vpp.git] / src / plugins / dpdk / main.c

diff --git a/src/plugins/dpdk/main.c b/src/plugins/dpdk/main.c
index 72dffca..a1ea9e3 100644 (file)
--- a/src/plugins/dpdk/main.c
+++ b/src/plugins/dpdk/main.c
@@ -85,16 +85,18 @@ static clib_error_t * dpdk_main_init (vlib_main_t * vm)
   dm->vlib_main = vm;
   dm->vnet_main = vnet_get_main ();
 
-  if ((error = vlib_call_init_function (vm, dpdk_init)))
-    return error;
-
   /* register custom delay function */
   rte_delay_us_callback_register (rte_delay_us_override_cb);
 
   return error;
 }
 
-VLIB_INIT_FUNCTION (dpdk_main_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (dpdk_main_init) =
+{
+    .runs_after = VLIB_INITS("dpdk_init"),
+};
+/* *INDENT-ON* */
 
 
 clib_error_t *
@@ -125,6 +127,7 @@ dpdk_early_init (vlib_main_t *vm)
 check_hugetlb:
   alloc.flags = CLIB_MEM_VM_F_SHARED | CLIB_MEM_VM_F_HUGETLB | CLIB_MEM_VM_F_HUGETLB_PREALLOC;
   alloc.size = 1;
+  alloc.name = "dpdk_early_init";
 
   if ((err = clib_mem_vm_ext_alloc (&alloc)))
     {
@@ -132,7 +135,7 @@ check_hugetlb:
       goto error;
     }
   else
-    clib_mem_vm_free (alloc.addr, 1 << alloc.log2_page_size);
+    clib_mem_vm_ext_free (&alloc);
 
   goto done;