From 7d98a12f29d5b9696df98b8af2f128614a4f0360 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Thu, 19 Jul 2018 20:42:08 +0200 Subject: Remove unused argument to vlib_feature_next Change-Id: Ieb8b53977fc8484c19780941e232ee072b667de3 Signed-off-by: Damjan Marion --- src/plugins/abf/abf_itf_attach.c | 2 +- src/plugins/acl/dataplane_node.c | 2 +- src/plugins/flowprobe/node.c | 9 +++------ src/plugins/gbp/gbp_policy_dpo.c | 3 +-- src/plugins/gtpu/gtpu_decap.c | 6 +++--- src/plugins/ila/ila.c | 6 +++--- src/plugins/nat/out2in.c | 24 ++++++++---------------- src/plugins/stn/stn.c | 2 +- 8 files changed, 21 insertions(+), 33 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/abf/abf_itf_attach.c b/src/plugins/abf/abf_itf_attach.c index 5373fc0d3ed..67aa5b1b1fa 100644 --- a/src/plugins/abf/abf_itf_attach.c +++ b/src/plugins/abf/abf_itf_attach.c @@ -588,7 +588,7 @@ abf_input_inline (vlib_main_t * vm, * miss: * move on down the feature arc */ - vnet_feature_next (sw_if_index0, &next0, b0); + vnet_feature_next (&next0, b0); } if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) diff --git a/src/plugins/acl/dataplane_node.c b/src/plugins/acl/dataplane_node.c index 499ad163699..3ca1be73c15 100644 --- a/src/plugins/acl/dataplane_node.c +++ b/src/plugins/acl/dataplane_node.c @@ -275,7 +275,7 @@ acl_fa_node_fn (vlib_main_t * vm, if (is_l2_path) next0 = vnet_l2_feature_next (b[0], l2_feat_next_node_index, 0); else - vnet_feature_next (sw_if_index0, &next0, b[0]); + vnet_feature_next (&next0, b[0]); } #ifdef FA_NODE_VERBOSE_DEBUG clib_warning diff --git a/src/plugins/flowprobe/node.c b/src/plugins/flowprobe/node.c index 9ac74cfd617..34f50aacbbc 100644 --- a/src/plugins/flowprobe/node.c +++ b/src/plugins/flowprobe/node.c @@ -774,10 +774,8 @@ flowprobe_node_fn (vlib_main_t * vm, b0 = vlib_get_buffer (vm, bi0); b1 = vlib_get_buffer (vm, bi1); - vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_TX], - &next0, b0); - vnet_feature_next (vnet_buffer (b1)->sw_if_index[VLIB_TX], - &next1, b1); + vnet_feature_next (&next0, b0); + vnet_feature_next (&next1, b1); len0 = vlib_buffer_length_in_chain (vm, b0); ethernet_header_t *eh0 = vlib_buffer_get_current (b0); @@ -822,8 +820,7 @@ flowprobe_node_fn (vlib_main_t * vm, b0 = vlib_get_buffer (vm, bi0); - vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_TX], - &next0, b0); + vnet_feature_next (&next0, b0); len0 = vlib_buffer_length_in_chain (vm, b0); ethernet_header_t *eh0 = vlib_buffer_get_current (b0); diff --git a/src/plugins/gbp/gbp_policy_dpo.c b/src/plugins/gbp/gbp_policy_dpo.c index e2af1e6daab..4b8cd5bf6ad 100644 --- a/src/plugins/gbp/gbp_policy_dpo.c +++ b/src/plugins/gbp/gbp_policy_dpo.c @@ -455,8 +455,7 @@ gbp_lpm_classify_inline (vlib_main_t * vm, { gpd0 = gbp_policy_dpo_get_i (dpo0->dpoi_index); src_epg0 = gpd0->gpd_epg; - vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_RX], - &next0, b0); + vnet_feature_next (&next0, b0); } else { diff --git a/src/plugins/gtpu/gtpu_decap.c b/src/plugins/gtpu/gtpu_decap.c index de235889073..1aac8b55745 100644 --- a/src/plugins/gtpu/gtpu_decap.c +++ b/src/plugins/gtpu/gtpu_decap.c @@ -933,8 +933,8 @@ ip_gtpu_bypass_inline (vlib_main_t * vm, } /* Setup packet for next IP feature */ - vnet_feature_next(vnet_buffer(b0)->sw_if_index[VLIB_RX], &next0, b0); - vnet_feature_next(vnet_buffer(b1)->sw_if_index[VLIB_RX], &next1, b1); + vnet_feature_next(&next0, b0); + vnet_feature_next(&next1, b1); if (is_ip4) { @@ -1141,7 +1141,7 @@ ip_gtpu_bypass_inline (vlib_main_t * vm, ip60 = vlib_buffer_get_current (b0); /* Setup packet for next IP feature */ - vnet_feature_next(vnet_buffer(b0)->sw_if_index[VLIB_RX], &next0, b0); + vnet_feature_next(&next0, b0); if (is_ip4) /* Treat IP4 frag packets as "experimental" protocol for now diff --git a/src/plugins/ila/ila.c b/src/plugins/ila/ila.c index fd56043eb57..93138723479 100644 --- a/src/plugins/ila/ila.c +++ b/src/plugins/ila/ila.c @@ -517,8 +517,8 @@ ila_sir2ila (vlib_main_t * vm, ip61->dst_address.as_u64[0] = ila_address1->as_u64[0]; ip61->dst_address.as_u64[1] = ila_address1->as_u64[1]; - vnet_feature_next (vnet_buffer (p0)->sw_if_index[VLIB_RX], &next0, p0); - vnet_feature_next (vnet_buffer (p1)->sw_if_index[VLIB_RX], &next1, p1); + vnet_feature_next (&next0, p0); + vnet_feature_next (&next1, p1); vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next, n_left_to_next, pi0, pi1, next0, @@ -569,7 +569,7 @@ ila_sir2ila (vlib_main_t * vm, ip60->dst_address.as_u64[0] = ila_address0->as_u64[0]; ip60->dst_address.as_u64[1] = ila_address0->as_u64[1]; - vnet_feature_next (vnet_buffer (p0)->sw_if_index[VLIB_RX], &next0, p0); + vnet_feature_next (&next0, p0); vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, n_left_to_next, pi0, next0); diff --git a/src/plugins/nat/out2in.c b/src/plugins/nat/out2in.c index ecfabc9c07a..26fc23454ae 100755 --- a/src/plugins/nat/out2in.c +++ b/src/plugins/nat/out2in.c @@ -786,8 +786,7 @@ snat_out2in_node_fn (vlib_main_t * vm, && (udp0->dst_port == clib_host_to_net_u16(UDP_DST_PORT_dhcp_to_client)))) { - vnet_feature_next - (vnet_buffer (b0)->sw_if_index[VLIB_RX], &next0, b0); + vnet_feature_next (&next0, b0); goto trace0; } @@ -938,8 +937,7 @@ snat_out2in_node_fn (vlib_main_t * vm, && (udp1->dst_port == clib_host_to_net_u16(UDP_DST_PORT_dhcp_to_client)))) { - vnet_feature_next - (vnet_buffer (b1)->sw_if_index[VLIB_RX], &next1, b1); + vnet_feature_next (&next1, b1); goto trace1; } @@ -1126,8 +1124,7 @@ snat_out2in_node_fn (vlib_main_t * vm, && (udp0->dst_port == clib_host_to_net_u16(UDP_DST_PORT_dhcp_to_client)))) { - vnet_feature_next - (vnet_buffer (b0)->sw_if_index[VLIB_RX], &next0, b0); + vnet_feature_next (&next0, b0); goto trace00; } @@ -1352,9 +1349,7 @@ nat44_out2in_reass_node_fn (vlib_main_t * vm, && (udp0->dst_port == clib_host_to_net_u16(UDP_DST_PORT_dhcp_to_client)))) { - vnet_feature_next - (vnet_buffer (b0)->sw_if_index[VLIB_RX], - &next0, b0); + vnet_feature_next (&next0, b0); goto trace0; } @@ -2182,8 +2177,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm, && (udp0->dst_port == clib_host_to_net_u16(UDP_DST_PORT_dhcp_to_client)))) { - vnet_feature_next - (vnet_buffer (b0)->sw_if_index[VLIB_RX], &next0, b0); + vnet_feature_next (&next0, b0); goto trace00; } @@ -2386,8 +2380,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm, && (udp1->dst_port == clib_host_to_net_u16(UDP_DST_PORT_dhcp_to_client)))) { - vnet_feature_next - (vnet_buffer (b1)->sw_if_index[VLIB_RX], &next1, b1); + vnet_feature_next (&next1, b1); goto trace01; } @@ -2622,8 +2615,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm, && (udp0->dst_port == clib_host_to_net_u16(UDP_DST_PORT_dhcp_to_client)))) { - vnet_feature_next - (vnet_buffer (b0)->sw_if_index[VLIB_RX], &next0, b0); + vnet_feature_next (&next0, b0); goto trace0; } @@ -3700,7 +3692,7 @@ snat_out2in_fast_node_fn (vlib_main_t * vm, sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX]; rx_fib_index0 = ip4_fib_table_get_index_for_sw_if_index(sw_if_index0); - vnet_feature_next (sw_if_index0, &next0, b0); + vnet_feature_next (&next0, b0); if (PREDICT_FALSE(ip0->ttl == 1)) { diff --git a/src/plugins/stn/stn.c b/src/plugins/stn/stn.c index 9368e1c573e..e3f56d38a15 100644 --- a/src/plugins/stn/stn.c +++ b/src/plugins/stn/stn.c @@ -147,7 +147,7 @@ stn_ip46_punt_fn (vlib_main_t * vm, } else { - vnet_feature_next (0, &next0, p0); + vnet_feature_next (&next0, p0); } if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED)) -- cgit 1.2.3-korg