From 924d03a97b67c8172c38840558bba52ff1256ddd Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Wed, 19 Oct 2016 08:25:46 +0100 Subject: Fix Coverity Errors in FIB. This is mainly consolidating the vnet_link_t and fib_link_t enums into just vnet_link_t. Change-Id: Id2147afec1a28e95fec86dfd524088cd56563f63 Signed-off-by: Neale Ranns --- vpp/app/vpe_cli.c | 2 +- vpp/vpp-api/api.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'vpp') diff --git a/vpp/app/vpe_cli.c b/vpp/app/vpe_cli.c index 38bf843d..70fe3a77 100644 --- a/vpp/app/vpe_cli.c +++ b/vpp/app/vpe_cli.c @@ -82,7 +82,7 @@ virtual_ip_cmd_fn_command_fn (vlib_main_t * vm, fib_route_path_t *rpath; adj_nbr_add_or_lock_w_rewrite (FIB_PROTOCOL_IP4, - FIB_LINK_IP4, + VNET_LINK_IP4, &next_hops[i], sw_if_index, mac_addrs[i].mac_addr); diff --git a/vpp/vpp-api/api.c b/vpp/vpp-api/api.c index 33f87702..cc067402 100644 --- a/vpp/vpp-api/api.c +++ b/vpp/vpp-api/api.c @@ -1046,7 +1046,6 @@ add_del_route_t_handler (u8 is_multipath, u32 next_hop_weight, u32 next_hop_out_label) { vnet_classify_main_t *cm = &vnet_classify_main; - fib_protocol_t proto = prefix->fp_proto; stats_main_t *sm = &stats_main; if (is_multipath) @@ -1116,7 +1115,7 @@ add_del_route_t_handler (u8 is_multipath, return VNET_API_ERROR_NO_SUCH_TABLE; } - dpo_set (&dpo, DPO_CLASSIFY, proto, + dpo_set (&dpo, DPO_CLASSIFY, dproto, classify_dpo_create (prefix->fp_proto, ntohl (classify_table_index))); } -- cgit 1.2.3-korg