diff options
| author |   Dave Barach <dave@barachs.net> | 2015-12-14 11:13:29 -0500 |
|---|---|---|
| committer | Dave Barach <dave@barachs.net> | 2015-12-14 11:16:02 -0500 |
| commit | 4e281a48e2afd258188c9ad996c46f166d4cfd9f (patch) | |
| tree | 4abdf46defcf566c98ead3e075ce80e490a2da2e /vpp/vnet/main.c | |
| parent | cd9752ce4f27dcad68ae085b519654ad5b10731a (diff) | |
Move rpc handler where it belongs, related cleanup
Change-Id: I393df100558a85fe676f4a4c8c9b546fa549ecc9
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'vpp/vnet/main.c')
| -rw-r--r-- | vpp/vnet/main.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/vpp/vnet/main.c b/vpp/vnet/main.c index fb981605..09adfea3 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))) |