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/vnet/devices/af_packet/device.c | 4 ++-- src/vnet/devices/netmap/device.c | 4 ++-- src/vnet/devices/pipe/pipe.c | 2 +- src/vnet/devices/virtio/device.c | 2 +- src/vnet/devices/virtio/vhost_user_output.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/vnet/devices') diff --git a/src/vnet/devices/af_packet/device.c b/src/vnet/devices/af_packet/device.c index b8c7501710e..811642ec7b9 100644 --- a/src/vnet/devices/af_packet/device.c +++ b/src/vnet/devices/af_packet/device.c @@ -81,7 +81,7 @@ af_packet_interface_tx (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { af_packet_main_t *apm = &af_packet_main; - u32 *buffers = vlib_frame_args (frame); + u32 *buffers = vlib_frame_vector_args (frame); u32 n_left = frame->n_vectors; u32 n_sent = 0; vnet_interface_output_runtime_t *rd = (void *) node->runtime_data; @@ -168,7 +168,7 @@ af_packet_interface_tx (vlib_main_t * vm, vlib_error_count (vm, node->node_index, AF_PACKET_TX_ERROR_TXRING_OVERRUN, n_left); - 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; } diff --git a/src/vnet/devices/netmap/device.c b/src/vnet/devices/netmap/device.c index e39888f4bf7..409a52f1005 100644 --- a/src/vnet/devices/netmap/device.c +++ b/src/vnet/devices/netmap/device.c @@ -98,7 +98,7 @@ netmap_interface_tx (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { netmap_main_t *nm = &netmap_main; - u32 *buffers = vlib_frame_args (frame); + u32 *buffers = vlib_frame_vector_args (frame); u32 n_left = frame->n_vectors; f64 const time_constant = 1e3; vnet_interface_output_runtime_t *rd = (void *) node->runtime_data; @@ -169,7 +169,7 @@ netmap_interface_tx (vlib_main_t * vm, frame->n_vectors ? NETMAP_TX_ERROR_PENDING_MSGS : NETMAP_TX_ERROR_NO_FREE_SLOTS), n_left); - 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; } diff --git a/src/vnet/devices/pipe/pipe.c b/src/vnet/devices/pipe/pipe.c index 8b30f4705d6..f45c08863a3 100644 --- a/src/vnet/devices/pipe/pipe.c +++ b/src/vnet/devices/pipe/pipe.c @@ -140,7 +140,7 @@ pipe_tx (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) pipe_t *pipe; n_left_from = frame->n_vectors; - from = vlib_frame_args (frame); + from = vlib_frame_vector_args (frame); while (n_left_from > 0) { diff --git a/src/vnet/devices/virtio/device.c b/src/vnet/devices/virtio/device.c index 69aca65bcef..2b2c853f3ba 100644 --- a/src/vnet/devices/virtio/device.c +++ b/src/vnet/devices/virtio/device.c @@ -180,7 +180,7 @@ virtio_interface_tx_inline (vlib_main_t * vm, vlib_node_runtime_t * node, u16 used, next, avail; u16 sz = vring->size; u16 mask = sz - 1; - u32 *buffers = vlib_frame_args (frame); + u32 *buffers = vlib_frame_vector_args (frame); clib_spinlock_lock_if_init (&vif->lockp); diff --git a/src/vnet/devices/virtio/vhost_user_output.c b/src/vnet/devices/virtio/vhost_user_output.c index 9b6c01704bf..dff129e763e 100644 --- a/src/vnet/devices/virtio/vhost_user_output.c +++ b/src/vnet/devices/virtio/vhost_user_output.c @@ -230,7 +230,7 @@ VNET_DEVICE_CLASS_TX_FN (vhost_user_device_class) (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); u32 n_left = frame->n_vectors; vhost_user_main_t *vum = &vhost_user_main; vnet_interface_output_runtime_t *rd = (void *) node->runtime_data; @@ -555,7 +555,7 @@ done3: thread_index, vui->sw_if_index, n_left); } - 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; } -- cgit 1.2.3-korg