diff options
| author |   Damjan Marion <dmarion@me.com> | 2018-11-10 10:23:00 +0100 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2018-11-13 12:17:49 +0000 |
| commit | a3d5986a35743a3ca1020155bed8267b5246d155 (patch) | |
| tree | 45ce2a42124cab924ddd622862294e0147c54745 /src/plugins/marvell | |
| parent | b11175d797c11880d19442f178db5df526ca1256 (diff) | |
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 <damarion@cisco.com>
Diffstat (limited to 'src/plugins/marvell')
| -rw-r--r-- | src/plugins/marvell/pp2/output.c | 6 |
1 files changed, 3 insertions, 3 deletions
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)); |