ipsec: infra for selecting backends

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

diff --git a/src/plugins/dpdk/main.c b/src/plugins/dpdk/main.c
index 2c80ff5..d22b671 100644 (file)
--- a/src/plugins/dpdk/main.c
+++ b/src/plugins/dpdk/main.c
@@ -58,7 +58,8 @@ rte_delay_us_override (unsigned us)
          /* Only suspend for the admin_down_process */
          vlib_process_t *proc = vlib_get_current_process (vm);
          if (!(proc->flags & VLIB_PROCESS_IS_RUNNING) ||
-             (proc->node_runtime.function != admin_up_down_process))
+             (proc->node_runtime.node_index !=
+              admin_up_down_process_node.index))
            return 0;
 
          f64 delay = 1e-6 * us;
@@ -124,6 +125,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)))
     {
@@ -131,7 +133,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;