diff options
| author |   Neale Ranns <nranns@cisco.com> | 2016-10-19 08:25:46 +0100 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2016-10-21 20:17:32 +0000 |
| commit | 924d03a97b67c8172c38840558bba52ff1256ddd (patch) | |
| tree | 13111e492cc993e3b0f88e1d9beaf483b19e1691 /vnet/vnet/adj/adj_nbr.c | |
| parent | 670909eb6eea7c0d0c0e8d674771db23bb018f4a (diff) | |
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 <nranns@cisco.com>
Diffstat (limited to 'vnet/vnet/adj/adj_nbr.c')
| -rw-r--r-- | vnet/vnet/adj/adj_nbr.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vnet/vnet/adj/adj_nbr.c b/vnet/vnet/adj/adj_nbr.c index 7bc5310ed7a..8d0511061de 100644 --- a/vnet/vnet/adj/adj_nbr.c +++ b/vnet/vnet/adj/adj_nbr.c @@ -43,7 +43,7 @@ static BVT(clib_bihash) **adj_nbr_tables[FIB_PROTOCOL_MAX]; static void adj_nbr_insert (fib_protocol_t nh_proto, - fib_link_t link_type, + vnet_link_t link_type, const ip46_address_t *nh_addr, u32 sw_if_index, adj_index_t adj_index) @@ -77,7 +77,7 @@ adj_nbr_insert (fib_protocol_t nh_proto, void adj_nbr_remove (fib_protocol_t nh_proto, - fib_link_t link_type, + vnet_link_t link_type, const ip46_address_t *nh_addr, u32 sw_if_index) { @@ -93,7 +93,7 @@ adj_nbr_remove (fib_protocol_t nh_proto, static adj_index_t adj_nbr_find (fib_protocol_t nh_proto, - fib_link_t link_type, + vnet_link_t link_type, const ip46_address_t *nh_addr, u32 sw_if_index) { @@ -132,7 +132,7 @@ adj_get_nd_node (fib_protocol_t proto) static ip_adjacency_t* adj_nbr_alloc (fib_protocol_t nh_proto, - fib_link_t link_type, + vnet_link_t link_type, const ip46_address_t *nh_addr, u32 sw_if_index) { @@ -171,7 +171,7 @@ adj_nbr_alloc (fib_protocol_t nh_proto, */ adj_index_t adj_nbr_add_or_lock (fib_protocol_t nh_proto, - fib_link_t link_type, + vnet_link_t link_type, const ip46_address_t *nh_addr, u32 sw_if_index) { @@ -211,7 +211,7 @@ adj_nbr_add_or_lock (fib_protocol_t nh_proto, adj_index_t adj_nbr_add_or_lock_w_rewrite (fib_protocol_t nh_proto, - fib_link_t link_type, + vnet_link_t link_type, const ip46_address_t *nh_addr, u32 sw_if_index, u8 *rewrite) @@ -289,7 +289,7 @@ adj_nbr_update_rewrite (adj_index_t adj_index, * The link type MPLS Adj never has children. So if it is this adj * that is updated, we need to walk from its IP sibling. */ - if (FIB_LINK_MPLS == adj->ia_link) + if (VNET_LINK_MPLS == adj->ia_link) { adj_index = adj_nbr_find(adj->ia_nh_proto, fib_proto_to_link(adj->ia_nh_proto), @@ -787,7 +787,7 @@ format_adj_nbr_incomplete (u8* s, va_list *ap) vnet_main_t * vnm = vnet_get_main(); ip_adjacency_t * adj = adj_get(index); - s = format (s, "arp-%U", format_fib_link, adj->ia_link); + s = format (s, "arp-%U", format_vnet_link, adj->ia_link); s = format (s, ": via %U", format_ip46_address, &adj->sub_type.nbr.next_hop, adj_proto_to_46(adj->ia_nh_proto)); @@ -808,7 +808,7 @@ format_adj_nbr (u8* s, va_list *ap) vnet_main_t * vnm = vnet_get_main(); ip_adjacency_t * adj = adj_get(index); - s = format (s, "%U", format_fib_link, adj->ia_link); + s = format (s, "%U", format_vnet_link, adj->ia_link); s = format (s, " via %U ", format_ip46_address, &adj->sub_type.nbr.next_hop, adj_proto_to_46(adj->ia_nh_proto)); |