dpdk: remove support for dpdk 16.04

[vpp.git] / vnet / vnet / devices / virtio / vhost-user.c

diff --git a/vnet/vnet/devices/virtio/vhost-user.c b/vnet/vnet/devices/virtio/vhost-user.c
index 8ca8c17..fd3cd21 100644 (file)
--- a/vnet/vnet/devices/virtio/vhost-user.c
+++ b/vnet/vnet/devices/virtio/vhost-user.c
@@ -588,6 +588,7 @@ vhost_user_socket_read (unix_file_t * uf)
        }
 
       vui->vrings[msg.state.index].last_used_idx =
+       vui->vrings[msg.state.index].last_avail_idx =
        vui->vrings[msg.state.index].used->idx;
 
       /* tell driver that we don't want interrupts */
@@ -1493,8 +1494,7 @@ vhost_user_intfc_tx (vlib_main_t * vm,
        }
       buffer_len = desc_table[desc_index].len;
 
-      CLIB_PREFETCH (buffer_addr,
-                    clib_min (buffer_len, 2 * CLIB_CACHE_LINE_BYTES), STORE);
+      CLIB_PREFETCH (buffer_addr, CLIB_CACHE_LINE_BYTES, STORE);
 
       virtio_net_hdr_mrg_rxbuf_t *hdr =
        (virtio_net_hdr_mrg_rxbuf_t *) buffer_addr;
@@ -1605,9 +1605,7 @@ vhost_user_intfc_tx (vlib_main_t * vm,
                      goto done;
                    }
                  buffer_len = desc_table[desc_index].len;
-                 CLIB_PREFETCH (buffer_addr,
-                                clib_min (buffer_len,
-                                          2 * CLIB_CACHE_LINE_BYTES), STORE);
+                 CLIB_PREFETCH (buffer_addr, CLIB_CACHE_LINE_BYTES, STORE);
                }
              else
                {
@@ -2418,7 +2416,6 @@ done:
  * CLI functions
  */
 
-#if DPDK == 0
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (vhost_user_connect_command, static) = {
     .path = "create vhost-user",
@@ -2438,7 +2435,6 @@ VLIB_CLI_COMMAND (show_vhost_user_command, static) = {
     .function = show_vhost_user_command_fn,
 };
 /* *INDENT-ON* */
-#endif
 
 static clib_error_t *
 vhost_user_config (vlib_main_t * vm, unformat_input_t * input)