Add vlib_buffer_copy_indices inline function

This reverts commit 1e59f9ddbdda14591967e1d66eab8623f9ba58e4.

Change-Id: Iae1d372b887e170d28cac2fe4c61325ee5a5894a
Signed-off-by: Damjan Marion <damarion@cisco.com>

3 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/avf/input.c b/src/plugins/avf/input.c
index b784bf731c1..fc884ce39f6 100644
--- a/src/plugins/avf/input.c
+++ b/src/plugins/avf/input.c
@@ -295,7 +295,7 @@ avf_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 
       or_q1x4 |= q1x4;
       u64x4_store_unaligned (q1x4, ptd->qw1s + n_rx_packets);
-      clib_memcpy_fast (bi, rxq->bufs + next, 4 * sizeof (u32));
+      vlib_buffer_copy_indices (bi, rxq->bufs + next, 4);
 
       /* next */
       next = (next + 4) & mask;
diff --git a/src/plugins/avf/output.c b/src/plugins/avf/output.c
index 0db333be823..47803fc2729 100644
--- a/src/plugins/avf/output.c
+++ b/src/plugins/avf/output.c
@@ -66,7 +66,7 @@ avf_tx_enqueue (vlib_main_t * vm, avf_txq_t * txq, u32 * buffers,
       if (or_flags & VLIB_BUFFER_NEXT_PRESENT)
 	goto one_by_one;
 
-      clib_memcpy_fast (txq->bufs + next, buffers, sizeof (u32) * 4);
+      vlib_buffer_copy_indices (txq->bufs + next, buffers, 4);
 
       if (use_va_dma)
 	{
diff --git a/src/plugins/marvell/pp2/output.c b/src/plugins/marvell/pp2/output.c
index dbd106a5930..911b2f55a17 100644
--- a/src/plugins/marvell/pp2/output.c
+++ b/src/plugins/marvell/pp2/output.c
@@ -101,7 +101,7 @@ mrvl_pp2_interface_tx (vlib_main_t * vm,
       buffers = vlib_frame_vector_args (frame);
       u16 n_copy = clib_min (outq->size - slot, n_sent);
 
-      clib_memcpy_fast (outq->buffers + slot, buffers, n_copy * sizeof (u32));
+      vlib_buffer_copy_indices (outq->buffers + slot, buffers, n_copy);
       if (PREDICT_FALSE (n_copy < n_sent))
 	clib_memcpy_fast (outq->buffers, buffers + n_copy,
 			  (n_sent - n_copy) * sizeof (u32));