From 6cf2fde9bb1dda74f8dcc2d96a17d6875cc1c9db Mon Sep 17 00:00:00 2001 From: Simon Zhang Date: Sun, 25 Aug 2019 15:30:45 +0800 Subject: ip: remove unused function parameter Type: refactor Signed-off-by: Simon Zhang Change-Id: I8674ff5f6f6336b256b7df8187afbb36ddef71fb (cherry picked from commit e7eba48937c52478d3844745ebb63a4b9ce8d681) --- src/plugins/gbp/gbp_policy_dpo.h | 2 +- src/plugins/svs/svs.c | 3 +-- src/plugins/unittest/fib_test.c | 5 +---- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/gbp/gbp_policy_dpo.h b/src/plugins/gbp/gbp_policy_dpo.h index 1dc11ab2e32..77ca5d93bd0 100644 --- a/src/plugins/gbp/gbp_policy_dpo.h +++ b/src/plugins/gbp/gbp_policy_dpo.h @@ -96,7 +96,7 @@ gbp_classify_get_gpd (const ip4_address_t * ip4, const ip6_address_t * ip6, if (ip4) lbi = ip4_fib_forwarding_lookup (fib_index, ip4); else if (ip6) - lbi = ip6_fib_table_fwding_lookup (&ip6_main, fib_index, ip6); + lbi = ip6_fib_table_fwding_lookup (fib_index, ip6); else return 0; diff --git a/src/plugins/svs/svs.c b/src/plugins/svs/svs.c index 2ee15cffac3..8c1487c6ebc 100644 --- a/src/plugins/svs/svs.c +++ b/src/plugins/svs/svs.c @@ -304,8 +304,7 @@ svs_input_inline (vlib_main_t * vm, ip6_header_t *ip0; ip0 = vlib_buffer_get_current (b0); - lbi0 = ip6_fib_table_fwding_lookup (&ip6_main, - svs_itf_db[fproto] + lbi0 = ip6_fib_table_fwding_lookup (svs_itf_db[fproto] [sw_if_index0], &ip0->src_address); } diff --git a/src/plugins/unittest/fib_test.c b/src/plugins/unittest/fib_test.c index d631350aa89..f220eb0d358 100644 --- a/src/plugins/unittest/fib_test.c +++ b/src/plugins/unittest/fib_test.c @@ -714,7 +714,7 @@ fib_test_validate_entry (fib_node_index_t fei, fw_lbi = ip4_fib_forwarding_lookup(fib_index, &pfx->fp_addr.ip4); break; case FIB_PROTOCOL_IP6: - fw_lbi = ip6_fib_table_fwding_lookup(&ip6_main, fib_index, &pfx->fp_addr.ip6); + fw_lbi = ip6_fib_table_fwding_lookup(fib_index, &pfx->fp_addr.ip6); break; case FIB_PROTOCOL_MPLS: { @@ -4433,7 +4433,6 @@ fib_test_v6 (void) dpo = fib_entry_contribute_ip_forwarding(dfrt); FIB_TEST((dpo->dpoi_index == ip6_fib_table_fwding_lookup( - &ip6_main, 1, &pfx_0_0.fp_addr.ip6)), "default-route; fwd and non-fwd tables match"); @@ -4501,7 +4500,6 @@ fib_test_v6 (void) "attached interface adj is receive ok"); dpo = fib_entry_contribute_ip_forwarding(fei); FIB_TEST((dpo->dpoi_index == ip6_fib_table_fwding_lookup( - &ip6_main, 1, &local_pfx.fp_addr.ip6)), "attached-route; fwd and non-fwd tables match"); @@ -4534,7 +4532,6 @@ fib_test_v6 (void) dpo = fib_entry_contribute_ip_forwarding(fei); FIB_TEST((dpo->dpoi_index == ip6_fib_table_fwding_lookup( - &ip6_main, 1, &local_pfx.fp_addr.ip6)), "local-route; fwd and non-fwd tables match"); -- cgit 1.2.3-korg