From d0ffa26a0e2910f9b7108b0b133e2da7de278178 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Sat, 14 Oct 2023 08:41:54 +0000 Subject: feature: remove unused code Type: improvement Change-Id: If775b1d145e462346de562a3c893f302e8c7b814 Signed-off-by: Damjan Marion --- src/plugins/af_packet/node.c | 4 ++-- src/plugins/af_xdp/input.c | 2 +- src/plugins/avf/input.c | 2 +- src/plugins/dpdk/device/node.c | 2 +- src/plugins/marvell/pp2/input.c | 7 +++---- src/plugins/memif/node.c | 28 ++++++++++++++-------------- src/plugins/rdma/input.c | 2 +- src/plugins/vmxnet3/input.c | 4 ++-- 8 files changed, 25 insertions(+), 26 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/af_packet/node.c b/src/plugins/af_packet/node.c index 8612863a780..d652a2d61c4 100644 --- a/src/plugins/af_packet/node.c +++ b/src/plugins/af_packet/node.c @@ -287,7 +287,7 @@ af_packet_v3_device_input_fn (vlib_main_t *vm, vlib_node_runtime_t *node, next_index = apif->per_interface_next_index; /* redirect if feature path enabled */ - vnet_feature_start_device_input_x1 (apif->sw_if_index, &next_index, &bt); + vnet_feature_start_device_input (apif->sw_if_index, &next_index, &bt); } if ((((block_desc_t *) (block_start = rx_queue->rx_ring[block])) @@ -594,7 +594,7 @@ af_packet_v2_device_input_fn (vlib_main_t *vm, vlib_node_runtime_t *node, next_index = apif->per_interface_next_index; /* redirect if feature path enabled */ - vnet_feature_start_device_input_x1 (apif->sw_if_index, &next_index, &bt); + vnet_feature_start_device_input (apif->sw_if_index, &next_index, &bt); } n_free_bufs = vec_len (apm->rx_buffers[thread_index]); diff --git a/src/plugins/af_xdp/input.c b/src/plugins/af_xdp/input.c index a90cbf5d332..0d890419696 100644 --- a/src/plugins/af_xdp/input.c +++ b/src/plugins/af_xdp/input.c @@ -296,7 +296,7 @@ af_xdp_device_input_inline (vlib_main_t *vm, vlib_node_runtime_t *node, vlib_buffer_copy_template (&bt, ad->buffer_template); next_index = ad->per_interface_next_index; if (PREDICT_FALSE (vnet_device_input_have_features (ad->sw_if_index))) - vnet_feature_start_device_input_x1 (ad->sw_if_index, &next_index, &bt); + vnet_feature_start_device_input (ad->sw_if_index, &next_index, &bt); vlib_get_new_next_frame (vm, node, next_index, to_next, n_left_to_next); diff --git a/src/plugins/avf/input.c b/src/plugins/avf/input.c index 1406d789e0b..3c3d6c07c2d 100644 --- a/src/plugins/avf/input.c +++ b/src/plugins/avf/input.c @@ -296,7 +296,7 @@ avf_device_input_inline (vlib_main_t *vm, vlib_node_runtime_t *node, next_index = ad->per_interface_next_index; if (PREDICT_FALSE (vnet_device_input_have_features (ad->sw_if_index))) - vnet_feature_start_device_input_x1 (ad->sw_if_index, &next_index, bt); + vnet_feature_start_device_input (ad->sw_if_index, &next_index, bt); vlib_get_new_next_frame (vm, node, next_index, to_next, n_left_to_next); diff --git a/src/plugins/dpdk/device/node.c b/src/plugins/dpdk/device/node.c index b4600324551..045b3ff1ce6 100644 --- a/src/plugins/dpdk/device/node.c +++ b/src/plugins/dpdk/device/node.c @@ -396,7 +396,7 @@ dpdk_device_input (vlib_main_t * vm, dpdk_main_t * dm, dpdk_device_t * xd, /* as all packets belong to the same interface feature arc lookup can be don once and result stored in the buffer template */ if (PREDICT_FALSE (vnet_device_input_have_features (xd->sw_if_index))) - vnet_feature_start_device_input_x1 (xd->sw_if_index, &next_index, bt); + vnet_feature_start_device_input (xd->sw_if_index, &next_index, bt); if (xd->flags & DPDK_DEVICE_FLAG_MAYBE_MULTISEG) n_rx_bytes = dpdk_process_rx_burst (vm, ptd, n_rx_packets, 1, &or_flags); diff --git a/src/plugins/marvell/pp2/input.c b/src/plugins/marvell/pp2/input.c index 44f01355e39..106148db023 100644 --- a/src/plugins/marvell/pp2/input.c +++ b/src/plugins/marvell/pp2/input.c @@ -218,8 +218,8 @@ mrvl_pp2_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, { n_rx_bytes += mrvl_pp2_next_from_desc (node, d, b0, &next0); n_rx_bytes += mrvl_pp2_next_from_desc (node, d + 1, b1, &next1); - vnet_feature_start_device_input_x2 (ppif->sw_if_index, &next0, - &next1, b0, b1); + vnet_feature_start_device_input (ppif->sw_if_index, &next0, b0); + vnet_feature_start_device_input (ppif->sw_if_index, &next1, b1); } else { @@ -262,8 +262,7 @@ mrvl_pp2_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, if (PREDICT_TRUE (ppif->per_interface_next_index == ~0)) { n_rx_bytes += mrvl_pp2_next_from_desc (node, d, b0, &next0); - vnet_feature_start_device_input_x1 (ppif->sw_if_index, &next0, - b0); + vnet_feature_start_device_input (ppif->sw_if_index, &next0, b0); } else { diff --git a/src/plugins/memif/node.c b/src/plugins/memif/node.c index 4d97ed22d64..1c678397ad7 100644 --- a/src/plugins/memif/node.c +++ b/src/plugins/memif/node.c @@ -640,8 +640,8 @@ memif_device_input_inline (vlib_main_t *vm, vlib_node_runtime_t *node, if (mif->per_interface_next_index != ~0) next_index = mif->per_interface_next_index; else - vnet_feature_start_device_input_x1 (mif->sw_if_index, &next_index, - &ptd->buffer_template); + vnet_feature_start_device_input (mif->sw_if_index, &next_index, + &ptd->buffer_template); vlib_get_new_next_frame (vm, node, next_index, to_next_bufs, n_left_to_next); @@ -903,14 +903,14 @@ memif_device_input_zc_inline (vlib_main_t *vm, vlib_node_runtime_t *node, { next0 = next1 = next2 = next3 = next_index; /* redirect if feature path enabled */ - vnet_feature_start_device_input_x1 (mif->sw_if_index, - &next0, b0); - vnet_feature_start_device_input_x1 (mif->sw_if_index, - &next1, b1); - vnet_feature_start_device_input_x1 (mif->sw_if_index, - &next2, b2); - vnet_feature_start_device_input_x1 (mif->sw_if_index, - &next3, b3); + vnet_feature_start_device_input (mif->sw_if_index, &next0, + b0); + vnet_feature_start_device_input (mif->sw_if_index, &next1, + b1); + vnet_feature_start_device_input (mif->sw_if_index, &next2, + b2); + vnet_feature_start_device_input (mif->sw_if_index, &next3, + b3); } } @@ -958,8 +958,8 @@ memif_device_input_zc_inline (vlib_main_t *vm, vlib_node_runtime_t *node, { next0 = next_index; /* redirect if feature path enabled */ - vnet_feature_start_device_input_x1 (mif->sw_if_index, - &next0, b0); + vnet_feature_start_device_input (mif->sw_if_index, &next0, + b0); } } @@ -1091,8 +1091,8 @@ CLIB_MARCH_FN (memif_dma_completion_cb, void, vlib_main_t *vm, if (mif->per_interface_next_index != ~0) next_index = mif->per_interface_next_index; else - vnet_feature_start_device_input_x1 (mif->sw_if_index, &next_index, - &ptd->buffer_template); + vnet_feature_start_device_input (mif->sw_if_index, &next_index, + &ptd->buffer_template); vlib_get_new_next_frame (vm, dma_info->node, next_index, to_next_bufs, n_left_to_next); diff --git a/src/plugins/rdma/input.c b/src/plugins/rdma/input.c index 827fc577484..8d2f447a73d 100644 --- a/src/plugins/rdma/input.c +++ b/src/plugins/rdma/input.c @@ -977,7 +977,7 @@ rdma_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, /* update buffer template for input feature arcs if any */ next_index = rd->per_interface_next_index; if (PREDICT_FALSE (vnet_device_input_have_features (rd->sw_if_index))) - vnet_feature_start_device_input_x1 (rd->sw_if_index, &next_index, &bt); + vnet_feature_start_device_input (rd->sw_if_index, &next_index, &bt); vlib_get_new_next_frame (vm, node, next_index, to_next, n_left_to_next); diff --git a/src/plugins/vmxnet3/input.c b/src/plugins/vmxnet3/input.c index a58e2c157be..ebf52d63ff1 100644 --- a/src/plugins/vmxnet3/input.c +++ b/src/plugins/vmxnet3/input.c @@ -377,8 +377,8 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, if (PREDICT_FALSE (vnet_device_input_have_features (vd->sw_if_index))) { - vnet_feature_start_device_input_x1 (vd->sw_if_index, - &next_index, hb); + vnet_feature_start_device_input (vd->sw_if_index, &next_index, + hb); known_next = 1; } -- cgit 1.2.3-korg