X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Funix%2Ftapcli.c;h=b4df8e84fe4cede02074249e30a702dd891b1e2a;hb=671e60e65635b8d030bf303c88411192c747b59e;hp=d183c3a9ea86ca338142fd9a385aacae2be82094;hpb=b7b929931a07fbb27b43d5cd105f366c3e29807e;p=vpp.git diff --git a/src/vnet/unix/tapcli.c b/src/vnet/unix/tapcli.c index d183c3a9ea8..b4df8e84fe4 100644 --- a/src/vnet/unix/tapcli.c +++ b/src/vnet/unix/tapcli.c @@ -170,7 +170,7 @@ static tapcli_main_t tapcli_main; static uword tapcli_tx (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { - u32 *buffers = vlib_frame_args (frame); + u32 *buffers = vlib_frame_vector_args (frame); uword n_packets = frame->n_vectors; tapcli_main_t *tm = &tapcli_main; tapcli_interface_t *ti; @@ -297,11 +297,8 @@ tapcli_rx_iface (vlib_main_t * vm, { uword len = vec_len (tm->threads[thread_index].rx_buffers); _vec_len (tm->threads[thread_index].rx_buffers) += - vlib_buffer_alloc_from_free_list (vm, - &tm->threads[thread_index]. - rx_buffers[len], - VLIB_FRAME_SIZE - len, - VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX); + vlib_buffer_alloc (vm, &tm->threads[thread_index].rx_buffers[len], + VLIB_FRAME_SIZE - len); if (PREDICT_FALSE (vec_len (tm->threads[thread_index].rx_buffers) < tm->mtu_buffers)) @@ -603,7 +600,7 @@ static void tapcli_nopunt_frame (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { - u32 *buffers = vlib_frame_args (frame); + u32 *buffers = vlib_frame_vector_args (frame); uword n_packets = frame->n_vectors; vlib_buffer_free (vm, buffers, n_packets); vlib_frame_free (vm, node, frame); @@ -746,13 +743,11 @@ tapcli_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags) { uword is_admin_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0; u32 hw_flags; - u32 speed_duplex = VNET_HW_INTERFACE_FLAG_FULL_DUPLEX - | VNET_HW_INTERFACE_FLAG_SPEED_1G; if (is_admin_up) - hw_flags = VNET_HW_INTERFACE_FLAG_LINK_UP | speed_duplex; + hw_flags = VNET_HW_INTERFACE_FLAG_LINK_UP; else - hw_flags = speed_duplex; + hw_flags = 0; vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags); return 0;