summaryrefslogtreecommitdiffstats
path: root/vpp/vnet
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2016-04-01 12:34:24 +0200
committerDamjan Marion <damarion@cisco.com>2016-04-01 16:38:33 +0200
commitaa04a0ff8ee9aa7779b30e936f7fe1304c613d57 (patch)
tree6df3e0c635db20a4569ad651e9cfdfb4be76b086 /vpp/vnet
parent102ec52bc41c630f011884250e0f20ea49ac6d33 (diff)
Add option to link DPDK dynamically
Change-Id: Ie2b47f9020c8260b199d141103318a0261e16832 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vpp/vnet')
-rw-r--r--vpp/vnet/main.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/vpp/vnet/main.c b/vpp/vnet/main.c
index 03139c00..4659440f 100644
--- a/vpp/vnet/main.c
+++ b/vpp/vnet/main.c
@@ -19,6 +19,10 @@
#include <api/vpe_msg_enum.h>
+#if DPDK
+#include <vnet/devices/dpdk/dpdk.h>
+#endif
+
/** \mainpage Virtual Packet Edge Documentation
* \section intro_sec Introduction
*
@@ -197,7 +201,11 @@ defaulted:
if (clib_mem_init (0, main_heap_size)) {
vm->init_functions_called = hash_create (0, /* value bytes */ 0);
vpe_main_init(vm);
-#if ! DPDK
+#if DPDK
+#if !DPDK_SHARED_LIB
+ dpdk_pmd_constructor_init();
+#endif
+#else
unix_physmem_init(vm, 0 /* fail_if_physical_memory_not_present */);
#endif
vlib_set_get_handoff_structure_cb (&vnet_get_handoff_structure);