diff options
author | Neale Ranns <nranns@cisco.com> | 2017-04-11 09:55:19 -0700 |
---|---|---|
committer | Florin Coras <florin.coras@gmail.com> | 2017-04-11 19:20:38 +0000 |
commit | 107e7d4b5375295e94e01653e3cf064ea6647064 (patch) | |
tree | 7bdda8f00b5e29a70436b70bb005dc5c907c837d /src/vnet/ip/lookup.h | |
parent | 3a7956383420a1d2f5f28b5bd3d3b3f5dda0420d (diff) |
Remove usued, redundant and deprecated code from lookup.h
Change-Id: Ic16bc10d0b2877b2afdf052615f9334f31b9519f
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/ip/lookup.h')
-rw-r--r-- | src/vnet/ip/lookup.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/vnet/ip/lookup.h b/src/vnet/ip/lookup.h index 662a1cc0066..941a6df965e 100644 --- a/src/vnet/ip/lookup.h +++ b/src/vnet/ip/lookup.h @@ -121,12 +121,6 @@ struct ip_lookup_main_t; typedef struct ip_lookup_main_t { - /* Adjacency heap. */ - ip_adjacency_t *adjacency_heap; - - /** load-balance packet/byte counters indexed by LB index. */ - vlib_combined_counter_main_t load_balance_counters; - /** Pool of addresses that are assigned to interfaces. */ ip_interface_address_t *if_address_pool; @@ -149,17 +143,12 @@ typedef struct ip_lookup_main_t sizeof (uword). First word is always adjacency index. */ u32 fib_result_n_bytes, fib_result_n_words; - format_function_t *format_fib_result; - /** 1 for ip6; 0 for ip4. */ u32 is_ip6; /** Either format_ip4_address_and_length or format_ip6_address_and_length. */ format_function_t *format_address_and_length; - /** Special adjacency format functions */ - format_function_t **special_adjacency_format_functions; - /** Table mapping ip protocol to ip[46]-local node next index. */ u8 local_next_by_ip_protocol[256]; @@ -167,22 +156,6 @@ typedef struct ip_lookup_main_t u8 builtin_protocol_by_ip_protocol[256]; } ip_lookup_main_t; -always_inline ip_adjacency_t * -ip_get_adjacency (ip_lookup_main_t * lm, u32 adj_index) -{ - ip_adjacency_t *adj; - - adj = vec_elt_at_index (lm->adjacency_heap, adj_index); - - return adj; -} - -#define ip_prefetch_adjacency(lm,adj_index,type) \ -do { \ - ip_adjacency_t * _adj = (lm)->adjacency_heap + (adj_index); \ - CLIB_PREFETCH (_adj, sizeof (_adj[0]), type); \ -} while (0) - clib_error_t *ip_interface_address_add_del (ip_lookup_main_t * lm, u32 sw_if_index, void *address, @@ -198,8 +171,6 @@ ip_get_interface_address (ip_lookup_main_t * lm, void *addr_fib) return p ? pool_elt_at_index (lm->if_address_pool, p[0]) : 0; } -u32 fib_table_id_find_fib_index (fib_protocol_t proto, u32 table_id); - always_inline void * ip_interface_address_get_address (ip_lookup_main_t * lm, ip_interface_address_t * a) |