dpdk: remove support for dpdk 16.04

[vpp.git] / vpp / vpp-api / api.c

diff --git a/vpp/vpp-api/api.c b/vpp/vpp-api/api.c
index 6ac5109..9af8dbc 100644 (file)
--- a/vpp/vpp-api/api.c
+++ b/vpp/vpp-api/api.c
@@ -4200,15 +4200,10 @@ vl_api_create_vhost_user_if_t_handler (vl_api_create_vhost_user_if_t * mp)
   vnet_main_t *vnm = vnet_get_main ();
   vlib_main_t *vm = vlib_get_main ();
 
-#if DPDK > 0 && DPDK_VHOST_USER
-  rv = dpdk_vhost_user_create_if (
-#else
-  rv = vhost_user_create_if (
-#endif
-                             vnm, vm, (char *) mp->sock_filename,
-                             mp->is_server, &sw_if_index, (u64) ~ 0,
-                             mp->renumber, ntohl (mp->custom_dev_instance),
-                             (mp->use_custom_mac) ? mp->mac_address : NULL);
+  rv = vhost_user_create_if (vnm, vm, (char *) mp->sock_filename,
+                            mp->is_server, &sw_if_index, (u64) ~ 0,
+                            mp->renumber, ntohl (mp->custom_dev_instance),
+                            (mp->use_custom_mac) ? mp->mac_address : NULL);
 
   /* *INDENT-OFF* */
   REPLY_MACRO2(VL_API_CREATE_VHOST_USER_IF_REPLY,
@@ -4228,14 +4223,9 @@ vl_api_modify_vhost_user_if_t_handler (vl_api_modify_vhost_user_if_t * mp)
   vnet_main_t *vnm = vnet_get_main ();
   vlib_main_t *vm = vlib_get_main ();
 
-#if DPDK > 0 && DPDK_VHOST_USER
-  rv = dpdk_vhost_user_modify_if (
-#else
-  rv = vhost_user_modify_if (
-#endif
-                             vnm, vm, (char *) mp->sock_filename,
-                             mp->is_server, sw_if_index, (u64) ~ 0,
-                             mp->renumber, ntohl (mp->custom_dev_instance));
+  rv = vhost_user_modify_if (vnm, vm, (char *) mp->sock_filename,
+                            mp->is_server, sw_if_index, (u64) ~ 0,
+                            mp->renumber, ntohl (mp->custom_dev_instance));
   REPLY_MACRO (VL_API_MODIFY_VHOST_USER_IF_REPLY);
 }
 
@@ -4250,11 +4240,7 @@ vl_api_delete_vhost_user_if_t_handler (vl_api_delete_vhost_user_if_t * mp)
   vnet_main_t *vnm = vnet_get_main ();
   vlib_main_t *vm = vlib_get_main ();
 
-#if DPDK > 0 && DPDK_VHOST_USER
-  rv = dpdk_vhost_user_delete_if (vnm, vm, sw_if_index);
-#else
   rv = vhost_user_delete_if (vnm, vm, sw_if_index);
-#endif
 
   REPLY_MACRO (VL_API_DELETE_VHOST_USER_IF_REPLY);
   if (!rv)
@@ -4318,11 +4304,7 @@ static void
   if (q == 0)
     return;
 
-#if DPDK > 0 && DPDK_VHOST_USER
-  rv = dpdk_vhost_user_dump_ifs (vnm, vm, &ifaces);
-#else
   rv = vhost_user_dump_ifs (vnm, vm, &ifaces);
-#endif
   if (rv)
     return;