From a3d5986a35743a3ca1020155bed8267b5246d155 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Sat, 10 Nov 2018 10:23:00 +0100 Subject: vlib rename vlib_frame_args(...) to vlib_frame_scalar_args(..) Typically we have scalar_size == 0, so it doesn't matter but vlib_frame_args was providing pointer to scalar frame data, not vector data. To avoid future confusion function is renamed to vlib_frame_scalar_args(...) Change-Id: I48b75523b46d487feea24f3f3cb10c528dde516f Signed-off-by: Damjan Marion --- src/plugins/avf/output.c | 2 +- src/plugins/marvell/pp2/output.c | 6 +++--- src/plugins/memif/device.c | 6 +++--- src/plugins/vmxnet3/output.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/avf/output.c b/src/plugins/avf/output.c index 72892d16dff..e4b4228c71d 100644 --- a/src/plugins/avf/output.c +++ b/src/plugins/avf/output.c @@ -45,7 +45,7 @@ VNET_DEVICE_CLASS_TX_FN (avf_device_class) (vlib_main_t * vm, u8 qid = thread_index; avf_txq_t *txq = vec_elt_at_index (ad->txqs, qid % ad->num_queue_pairs); avf_tx_desc_t *d0, *d1, *d2, *d3; - u32 *buffers = vlib_frame_args (frame); + u32 *buffers = vlib_frame_vector_args (frame); u32 bi0, bi1, bi2, bi3; u16 n_left, n_left_to_send, n_in_batch; vlib_buffer_t *b0, *b1, *b2, *b3; diff --git a/src/plugins/marvell/pp2/output.c b/src/plugins/marvell/pp2/output.c index 468440c23a6..18969a458e2 100644 --- a/src/plugins/marvell/pp2/output.c +++ b/src/plugins/marvell/pp2/output.c @@ -39,7 +39,7 @@ mrvl_pp2_interface_tx (vlib_main_t * vm, vec_elt_at_index (ppm->per_thread_data, thread_index); u8 qid = thread_index; mrvl_pp2_outq_t *outq = vec_elt_at_index (ppif->outqs, qid); - u32 *buffers = vlib_frame_args (frame); + u32 *buffers = vlib_frame_vector_args (frame); u16 n_desc = frame->n_vectors, n_left = n_desc, n_sent = n_desc, n_done; struct pp2_ppio_desc *d; u16 mask = outq->size - 1; @@ -87,7 +87,7 @@ mrvl_pp2_interface_tx (vlib_main_t * vm, /* free unsent buffers */ if (PREDICT_FALSE (n_sent != n_desc)) { - vlib_buffer_free (vm, vlib_frame_args (frame) + n_sent, + vlib_buffer_free (vm, vlib_frame_vector_args (frame) + n_sent, frame->n_vectors - n_sent); vlib_error_count (vm, node->node_index, MRVL_PP2_TX_ERROR_NO_FREE_SLOTS, frame->n_vectors - n_sent); @@ -98,7 +98,7 @@ mrvl_pp2_interface_tx (vlib_main_t * vm, if (n_sent) { u16 slot = outq->head & mask; - buffers = vlib_frame_args (frame); + buffers = vlib_frame_vector_args (frame); u16 n_copy = clib_min (outq->size - slot, n_sent); clib_memcpy (outq->buffers + slot, buffers, n_copy * sizeof (u32)); diff --git a/src/plugins/memif/device.c b/src/plugins/memif/device.c index a05ab87a864..9e4cd69b75f 100644 --- a/src/plugins/memif/device.c +++ b/src/plugins/memif/device.c @@ -103,7 +103,7 @@ memif_interface_tx_inline (vlib_main_t * vm, vlib_node_runtime_t * node, memif_per_thread_data_t * ptd) { memif_ring_t *ring; - u32 *buffers = vlib_frame_args (frame); + u32 *buffers = vlib_frame_vector_args (frame); u32 n_left = frame->n_vectors; u32 n_copy_op; u16 ring_size, mask, slot, free_slots; @@ -287,7 +287,7 @@ no_free_slots: mq->int_count++; } - vlib_buffer_free (vm, vlib_frame_args (frame), frame->n_vectors); + vlib_buffer_free (vm, vlib_frame_vector_args (frame), frame->n_vectors); return frame->n_vectors; } @@ -299,7 +299,7 @@ memif_interface_tx_zc_inline (vlib_main_t * vm, vlib_node_runtime_t * node, memif_per_thread_data_t * ptd) { memif_ring_t *ring = mq->ring; - u32 *buffers = vlib_frame_args (frame); + u32 *buffers = vlib_frame_vector_args (frame); u32 n_left = frame->n_vectors; u16 slot, free_slots, n_free; u16 ring_size = 1 << mq->log2_ring_size; diff --git a/src/plugins/vmxnet3/output.c b/src/plugins/vmxnet3/output.c index 2886c31edf7..2a6418dfa44 100644 --- a/src/plugins/vmxnet3/output.c +++ b/src/plugins/vmxnet3/output.c @@ -100,7 +100,7 @@ VNET_DEVICE_CLASS_TX_FN (vmxnet3_device_class) (vlib_main_t * vm, vmxnet3_main_t *vmxm = &vmxnet3_main; vnet_interface_output_runtime_t *rd = (void *) node->runtime_data; vmxnet3_device_t *vd = pool_elt_at_index (vmxm->devices, rd->dev_instance); - u32 *buffers = vlib_frame_args (frame); + u32 *buffers = vlib_frame_vector_args (frame); u32 bi0; vlib_buffer_t *b0; vmxnet3_tx_desc *txd = 0; -- cgit 1.2.3-korg