From aa04a0ff8ee9aa7779b30e936f7fe1304c613d57 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Fri, 1 Apr 2016 12:34:24 +0200
Subject: Add option to link DPDK dynamically

Change-Id: Ie2b47f9020c8260b199d141103318a0261e16832
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 vpp/vnet/main.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'vpp/vnet')

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);
-- 
cgit 1.2.3-korg