From 107e7d4b5375295e94e01653e3cf064ea6647064 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Tue, 11 Apr 2017 09:55:19 -0700 Subject: Remove usued, redundant and deprecated code from lookup.h Change-Id: Ic16bc10d0b2877b2afdf052615f9334f31b9519f Signed-off-by: Neale Ranns --- src/vnet/sr/sr_steering.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/vnet/sr/sr_steering.c') diff --git a/src/vnet/sr/sr_steering.c b/src/vnet/sr/sr_steering.c index 5156b20474c..04646198de1 100755 --- a/src/vnet/sr/sr_steering.c +++ b/src/vnet/sr/sr_steering.c @@ -115,10 +115,10 @@ sr_steering_policy (int is_del, ip6_address_t * bsid, u32 sr_policy_index, pfx.fp_len = steer_pl->classify.l3.mask_width; pfx.fp_addr.ip6 = steer_pl->classify.l3.prefix.ip6; - fib_table_entry_delete (fib_table_id_find_fib_index + fib_table_entry_delete (fib_table_find (FIB_PROTOCOL_IP6, - steer_pl->classify.l3.fib_table), &pfx, - FIB_SOURCE_SR); + steer_pl->classify.l3.fib_table), + &pfx, FIB_SOURCE_SR); } else if (steer_pl->classify.traffic_type == SR_STEER_IPV4) { @@ -127,7 +127,7 @@ sr_steering_policy (int is_del, ip6_address_t * bsid, u32 sr_policy_index, pfx.fp_len = steer_pl->classify.l3.mask_width; pfx.fp_addr.ip4 = steer_pl->classify.l3.prefix.ip4; - fib_table_entry_delete (fib_table_id_find_fib_index + fib_table_entry_delete (fib_table_find (FIB_PROTOCOL_IP4, steer_pl->classify.l3.fib_table), &pfx, FIB_SOURCE_SR); @@ -194,10 +194,10 @@ sr_steering_policy (int is_del, ip6_address_t * bsid, u32 sr_policy_index, pfx.fp_len = steer_pl->classify.l3.mask_width; pfx.fp_addr.ip6 = steer_pl->classify.l3.prefix.ip6; - fib_table_entry_delete (fib_table_id_find_fib_index + fib_table_entry_delete (fib_table_find (FIB_PROTOCOL_IP6, - steer_pl->classify.l3.fib_table), &pfx, - FIB_SOURCE_SR); + steer_pl->classify.l3.fib_table), + &pfx, FIB_SOURCE_SR); /* Create a new one */ goto update_fib; @@ -209,10 +209,10 @@ sr_steering_policy (int is_del, ip6_address_t * bsid, u32 sr_policy_index, pfx.fp_len = steer_pl->classify.l3.mask_width; pfx.fp_addr.ip4 = steer_pl->classify.l3.prefix.ip4; - fib_table_entry_delete (fib_table_id_find_fib_index + fib_table_entry_delete (fib_table_find (FIB_PROTOCOL_IP4, - steer_pl->classify.l3.fib_table), &pfx, - FIB_SOURCE_SR); + steer_pl->classify.l3.fib_table), + &pfx, FIB_SOURCE_SR); /* Create a new one */ goto update_fib; @@ -304,10 +304,10 @@ update_fib: pfx.fp_len = steer_pl->classify.l3.mask_width; pfx.fp_addr.ip6 = steer_pl->classify.l3.prefix.ip6; - fib_table_entry_path_add (fib_table_id_find_fib_index (FIB_PROTOCOL_IP6, - (table_id != - (u32) ~ 0 ? - table_id : 0)), + fib_table_entry_path_add (fib_table_find (FIB_PROTOCOL_IP6, + (table_id != + (u32) ~ 0 ? + table_id : 0)), &pfx, FIB_SOURCE_SR, FIB_ENTRY_FLAG_LOOSE_URPF_EXEMPT, FIB_PROTOCOL_IP6, @@ -321,10 +321,10 @@ update_fib: pfx.fp_len = steer_pl->classify.l3.mask_width; pfx.fp_addr.ip4 = steer_pl->classify.l3.prefix.ip4; - fib_table_entry_path_add (fib_table_id_find_fib_index (FIB_PROTOCOL_IP4, - (table_id != - (u32) ~ 0 ? - table_id : 0)), + fib_table_entry_path_add (fib_table_find (FIB_PROTOCOL_IP4, + (table_id != + (u32) ~ 0 ? + table_id : 0)), &pfx, FIB_SOURCE_SR, FIB_ENTRY_FLAG_LOOSE_URPF_EXEMPT, FIB_PROTOCOL_IP6, -- cgit 1.2.3-korg