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_internal.h | |
| 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_internal.h')
| -rw-r--r-- | vnet/vnet/adj/adj_internal.h | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/vnet/vnet/adj/adj_internal.h b/vnet/vnet/adj/adj_internal.h index f882bff84c0..8c9665972c6 100644 --- a/vnet/vnet/adj/adj_internal.h +++ b/vnet/vnet/adj/adj_internal.h @@ -42,36 +42,21 @@ #endif static inline u32 -adj_get_rewrite_node (fib_link_t linkt) +adj_get_rewrite_node (vnet_link_t linkt) { switch (linkt) { - case FIB_LINK_IP4: + case VNET_LINK_IP4: return (ip4_rewrite_node.index); - case FIB_LINK_IP6: + case VNET_LINK_IP6: return (ip6_rewrite_node.index); - case FIB_LINK_MPLS: + case VNET_LINK_MPLS: return (mpls_output_node.index); - case FIB_LINK_ETHERNET: + case VNET_LINK_ETHERNET: return (adj_l2_rewrite_node.index); - } - ASSERT(0); - return (0); -} - -static inline vnet_l3_packet_type_t -adj_fib_link_2_vnet (fib_link_t linkt) -{ - switch (linkt) - { - case FIB_LINK_IP4: - return (VNET_L3_PACKET_TYPE_IP4); - case FIB_LINK_IP6: - return (VNET_L3_PACKET_TYPE_IP6); - case FIB_LINK_MPLS: - return (VNET_L3_PACKET_TYPE_MPLS_UNICAST); - case FIB_LINK_ETHERNET: + case VNET_LINK_ARP: break; } + ASSERT(0); return (0); } @@ -109,7 +94,7 @@ extern void adj_nbr_update_rewrite_internal (ip_adjacency_t *adj, extern ip_adjacency_t * adj_alloc(fib_protocol_t proto); extern 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); extern void adj_glean_remove(fib_protocol_t proto, |