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/bonding/device.c | 4 ++-- 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 ++-- src/vnet/ethernet/interface.c | 2 +- src/vnet/interface_output.c | 10 +++++----- src/vnet/ip/punt.c | 2 +- src/vnet/pg/output.c | 4 ++-- src/vnet/pipeline.h | 10 +++++----- src/vnet/srp/interface.c | 2 +- src/vnet/unix/tapcli.c | 4 ++-- src/vnet/unix/tuntap.c | 6 +++--- 14 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src/vnet') diff --git a/src/vnet/bonding/device.c b/src/vnet/bonding/device.c index 13ff644fd73..e7d6cdad407 100644 --- a/src/vnet/bonding/device.c +++ b/src/vnet/bonding/device.c @@ -658,7 +658,7 @@ VNET_DEVICE_CLASS_TX_FN (bond_dev_class) (vlib_main_t * vm, if (PREDICT_FALSE (bif->admin_up == 0)) { - vlib_buffer_free (vm, vlib_frame_args (frame), frame->n_vectors); + vlib_buffer_free (vm, vlib_frame_vector_args (frame), frame->n_vectors); vlib_increment_simple_counter (vnet_main.interface_main.sw_if_counters + VNET_INTERFACE_COUNTER_DROP, thread_index, bif->sw_if_index, @@ -671,7 +671,7 @@ VNET_DEVICE_CLASS_TX_FN (bond_dev_class) (vlib_main_t * vm, n_slaves = vec_len (bif->active_slaves); if (PREDICT_FALSE (n_slaves == 0)) { - vlib_buffer_free (vm, vlib_frame_args (frame), frame->n_vectors); + vlib_buffer_free (vm, vlib_frame_vector_args (frame), frame->n_vectors); vlib_increment_simple_counter (vnet_main.interface_main.sw_if_counters + VNET_INTERFACE_COUNTER_DROP, thread_index, bif->sw_if_index, 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; } diff --git a/src/vnet/ethernet/interface.c b/src/vnet/ethernet/interface.c index 2cb137c53b3..c66fa8232cf 100644 --- a/src/vnet/ethernet/interface.c +++ b/src/vnet/ethernet/interface.c @@ -405,7 +405,7 @@ simulated_ethernet_interface_tx (vlib_main_t * vm, u32 new_tx_sw_if_index = ~0; n_left_from = frame->n_vectors; - from = vlib_frame_args (frame); + from = vlib_frame_vector_args (frame); vlib_get_buffers (vm, from, bufs, n_left_from); b = bufs; diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c index f8585647c81..be4ab7d291a 100644 --- a/src/vnet/interface_output.c +++ b/src/vnet/interface_output.c @@ -99,7 +99,7 @@ vnet_interface_output_trace (vlib_main_t * vm, u32 n_left, *from; n_left = n_buffers; - from = vlib_frame_args (frame); + from = vlib_frame_vector_args (frame); while (n_left >= 4) { @@ -222,7 +222,7 @@ vnet_interface_output_node_inline (vlib_main_t * vm, if (node->flags & VLIB_NODE_FLAG_TRACE) vnet_interface_output_trace (vm, node, frame, n_buffers); - from = vlib_frame_args (frame); + from = vlib_frame_vector_args (frame); if (rt->is_deleted) return vlib_error_drop_buffers (vm, node, from, @@ -475,7 +475,7 @@ vnet_per_buffer_interface_output (vlib_main_t * vm, n_left_from = frame->n_vectors; - from = vlib_frame_args (frame); + from = vlib_frame_vector_args (frame); next_index = node->cached_next_index; while (n_left_from > 0) @@ -669,7 +669,7 @@ static u8 * validate_error_frame (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * f) { - u32 *buffers = vlib_frame_args (f); + u32 *buffers = vlib_frame_vector_args (f); vlib_buffer_t *b; u8 *msg = 0; uword i; @@ -719,7 +719,7 @@ process_drop_punt (vlib_main_t * vm, static vlib_error_t memory[VNET_ERROR_N_DISPOSITION]; static char memory_init[VNET_ERROR_N_DISPOSITION]; - buffers = vlib_frame_args (frame); + buffers = vlib_frame_vector_args (frame); first_buffer = buffers; { diff --git a/src/vnet/ip/punt.c b/src/vnet/ip/punt.c index 538a1ac610e..a6d6c08818b 100644 --- a/src/vnet/ip/punt.c +++ b/src/vnet/ip/punt.c @@ -312,7 +312,7 @@ udp46_punt_socket_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame, bool is_ip4) { - u32 *buffers = vlib_frame_args (frame); + u32 *buffers = vlib_frame_vector_args (frame); uword n_packets = frame->n_vectors; struct iovec *iovecs = 0; punt_main_t *pm = &punt_main; diff --git a/src/vnet/pg/output.c b/src/vnet/pg/output.c index 016e5b370e5..410a433621c 100644 --- a/src/vnet/pg/output.c +++ b/src/vnet/pg/output.c @@ -47,7 +47,7 @@ uword pg_output (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { pg_main_t *pg = &pg_main; - u32 *buffers = vlib_frame_args (frame); + u32 *buffers = vlib_frame_vector_args (frame); uword n_buffers = frame->n_vectors; uword n_left = n_buffers; vnet_interface_output_runtime_t *rd = (void *) node->runtime_data; @@ -80,7 +80,7 @@ pg_output (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) pcap_write (&pif->pcap_main); - vlib_buffer_free (vm, vlib_frame_args (frame), n_buffers); + vlib_buffer_free (vm, vlib_frame_vector_args (frame), n_buffers); if (PREDICT_FALSE (pif->lockp != 0)) clib_atomic_release (pif->lockp); diff --git a/src/vnet/pipeline.h b/src/vnet/pipeline.h index ec2ac0b96f3..2ac1a9ac27d 100644 --- a/src/vnet/pipeline.h +++ b/src/vnet/pipeline.h @@ -92,7 +92,7 @@ dispatch_pipeline (vlib_main_t * vm, AUX_DATA_DECL; n_left_from = frame->n_vectors; - from = vlib_frame_args (frame); + from = vlib_frame_vector_args (frame); vlib_get_buffers (vm, from, bufs, n_left_from); for (pi = 0; pi < NSTAGES - 1; pi++) @@ -134,7 +134,7 @@ dispatch_pipeline (vlib_main_t * vm, AUX_DATA_DECL; n_left_from = frame->n_vectors; - from = vlib_frame_args (frame); + from = vlib_frame_vector_args (frame); vlib_get_buffers (vm, from, bufs, n_left_from); for (pi = 0; pi < NSTAGES - 1; pi++) @@ -181,7 +181,7 @@ dispatch_pipeline (vlib_main_t * vm, AUX_DATA_DECL; n_left_from = frame->n_vectors; - from = vlib_frame_args (frame); + from = vlib_frame_vector_args (frame); vlib_get_buffers (vm, from, bufs, n_left_from); for (pi = 0; pi < NSTAGES - 1; pi++) @@ -233,7 +233,7 @@ dispatch_pipeline (vlib_main_t * vm, AUX_DATA_DECL; n_left_from = frame->n_vectors; - from = vlib_frame_args (frame); + from = vlib_frame_vector_args (frame); vlib_get_buffers (vm, from, bufs, n_left_from); for (pi = 0; pi < NSTAGES - 1; pi++) @@ -290,7 +290,7 @@ dispatch_pipeline (vlib_main_t * vm, AUX_DATA_DECL; n_left_from = frame->n_vectors; - from = vlib_frame_args (frame); + from = vlib_frame_vector_args (frame); vlib_get_buffers (vm, from, bufs, n_left_from); for (pi = 0; pi < NSTAGES - 1; pi++) diff --git a/src/vnet/srp/interface.c b/src/vnet/srp/interface.c index b418ec28229..28e519986f0 100644 --- a/src/vnet/srp/interface.c +++ b/src/vnet/srp/interface.c @@ -281,7 +281,7 @@ simulated_srp_interface_tx (vlib_main_t * vm, vlib_buffer_t * b; 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/unix/tapcli.c b/src/vnet/unix/tapcli.c index 765e857f387..83ac33f49dc 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; @@ -603,7 +603,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); diff --git a/src/vnet/unix/tuntap.c b/src/vnet/unix/tuntap.c index 5f2259269f3..d663d9698a0 100644 --- a/src/vnet/unix/tuntap.c +++ b/src/vnet/unix/tuntap.c @@ -146,7 +146,7 @@ static tuntap_main_t tuntap_main = { static uword tuntap_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; tuntap_main_t *tm = &tuntap_main; vnet_main_t *vnm = vnet_get_main (); @@ -934,7 +934,7 @@ static void tuntap_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); @@ -980,7 +980,7 @@ tuntap_intfc_tx (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { tuntap_main_t *tm = &tuntap_main; - u32 *buffers = vlib_frame_args (frame); + u32 *buffers = vlib_frame_vector_args (frame); uword n_buffers = frame->n_vectors; /* Normal interface transmit happens only on the normal interface... */ -- cgit 1.2.3-korg