aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2017-04-11 09:55:19 -0700
committerFlorin Coras <florin.coras@gmail.com>2017-04-11 19:20:38 +0000
commit107e7d4b5375295e94e01653e3cf064ea6647064 (patch)
tree7bdda8f00b5e29a70436b70bb005dc5c907c837d /src/plugins
parent3a7956383420a1d2f5f28b5bd3d3b3f5dda0420d (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/plugins')
-rw-r--r--src/plugins/ioam/encap/ip6_ioam_trace.c4
-rw-r--r--src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c3
-rw-r--r--src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c10
3 files changed, 6 insertions, 11 deletions
diff --git a/src/plugins/ioam/encap/ip6_ioam_trace.c b/src/plugins/ioam/encap/ip6_ioam_trace.c
index 299ee88f9c8..3ec3ea82113 100644
--- a/src/plugins/ioam/encap/ip6_ioam_trace.c
+++ b/src/plugins/ioam/encap/ip6_ioam_trace.c
@@ -254,13 +254,11 @@ int
ip6_hbh_ioam_trace_data_list_handler (vlib_buffer_t * b, ip6_header_t * ip,
ip6_hop_by_hop_option_t * opt)
{
- ip6_main_t *im = &ip6_main;
- ip_lookup_main_t *lm = &im->lookup_main;
ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
u8 elt_index = 0;
ioam_trace_option_t *trace = (ioam_trace_option_t *) opt;
u32 adj_index = vnet_buffer (b)->ip.adj_index[VLIB_TX];
- ip_adjacency_t *adj = ip_get_adjacency (lm, adj_index);
+ ip_adjacency_t *adj = adj_get (adj_index);
time_u64_t time_u64;
u32 *elt;
int rv = 0;
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c
index 6c04d9af210..88d7d205273 100644
--- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c
@@ -265,8 +265,7 @@ vxlan_gpe_enable_disable_ioam_for_dest (vlib_main_t * vm,
continue;
}
- adj0 =
- ip_get_adjacency (&(ip4_main.lookup_main), adj_index0);
+ adj0 = adj_get (adj_index0);
sw_if_index0 = adj0->rewrite_header.sw_if_index;
if (~0 == sw_if_index0)
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c
index 48edb4b0204..f3d03b674cc 100644
--- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c
@@ -302,11 +302,10 @@ vxlan_gpe_ioam_trace_data_list_handler (vlib_buffer_t * b,
{
u16 tx_if = 0;
u32 adj_index = vnet_buffer (b)->ip.adj_index[VLIB_TX];
- ip4_main_t *im4 = &ip4_main;
- ip_lookup_main_t *lm = &im4->lookup_main;
+
if (use_adj)
{
- ip_adjacency_t *adj = ip_get_adjacency (lm, adj_index);
+ ip_adjacency_t *adj = adj_get (adj_index);
tx_if = adj->rewrite_header.sw_if_index & 0xFFFF;
}
@@ -330,11 +329,10 @@ vxlan_gpe_ioam_trace_data_list_handler (vlib_buffer_t * b,
{
u16 tx_if = 0;
u32 adj_index = vnet_buffer (b)->ip.adj_index[VLIB_TX];
- ip6_main_t *im6 = &ip6_main;
- ip_lookup_main_t *lm = &im6->lookup_main;
+
if (use_adj)
{
- ip_adjacency_t *adj = ip_get_adjacency (lm, adj_index);
+ ip_adjacency_t *adj = adj_get (adj_index);
tx_if = adj->rewrite_header.sw_if_index & 0xFFFF;
}