diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2015-12-14 17:36:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@projectrotterdam.info> | 2015-12-14 17:36:44 +0000 |
| commit | 64f98e91b669ecda59fcb587e095d0fb6b3dc48d (patch) | |
| tree | 73771e86a59fd087c5b88ee4f9df37841664af0d /vpp | |
| parent | ee4e9ec5b3d94c580329ee8fa98304055be052fe (diff) | |
| parent | 4e281a48e2afd258188c9ad996c46f166d4cfd9f (diff) | |
Merge "Move rpc handler where it belongs, related cleanup"
Diffstat (limited to 'vpp')
| -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))) |