From 4e281a48e2afd258188c9ad996c46f166d4cfd9f Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Mon, 14 Dec 2015 11:13:29 -0500 Subject: Move rpc handler where it belongs, related cleanup Change-Id: I393df100558a85fe676f4a4c8c9b546fa549ecc9 Signed-off-by: Dave Barach --- vpp/vnet/main.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'vpp') diff --git a/vpp/vnet/main.c b/vpp/vnet/main.c index fb98160515c..09adfea349e 100644 --- a/vpp/vnet/main.c +++ b/vpp/vnet/main.c @@ -65,18 +65,11 @@ vpe_main_init (vlib_main_t * vm) if ((error = vlib_call_init_function (vm, lisp_gpe_init))) return error; -#if DPDK == 0 - if ((error = vlib_call_init_function (vm, ixge_init))) - return error; - if ((error = vlib_call_init_function (vm, ixgev_init))) - return error; - if ((error = vlib_call_init_function (vm, ige_init))) - return error; - if ((error = vlib_call_init_function (vm, vice_init))) - return error; -#else +#if DPDK == 1 if ((error = vlib_call_init_function (vm, dpdk_init))) return error; + if ((error = vlib_call_init_function (vm, dpdk_thread_init))) + return error; if ((error = vlib_call_init_function (vm, vhost_user_init))) return error; if ((error = vlib_call_init_function (vm, ipsec_init))) -- cgit 1.2.3-korg