From 5331c72daa9f7d345915a865df898cff652289ac Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Wed, 17 Aug 2016 11:54:30 -0400 Subject: VPP-337 Add per interface IN filtering - ip post-rewrite feature subgraph arc support Change-Id: Ia4b07197463021ade916326231af246e2559a290 Signed-off-by: Dave Barach Signed-off-by: Keith Burns (alagalah) --- plugins/ila-plugin/ila/ila.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'plugins/ila-plugin/ila/ila.c') diff --git a/plugins/ila-plugin/ila/ila.c b/plugins/ila-plugin/ila/ila.c index 2673c626..99d1db8a 100644 --- a/plugins/ila-plugin/ila/ila.c +++ b/plugins/ila-plugin/ila/ila.c @@ -421,7 +421,7 @@ ila_sir2ila (vlib_main_t * vm, { ip6_main_t *im = &ip6_main; ip_lookup_main_t *lm = &im->lookup_main; - ip_config_main_t *cm = &lm->rx_config_mains[VNET_UNICAST]; + ip_config_main_t *cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; u32 n_left_from, *from, next_index, *to_next, n_left_to_next; ila_main_t *ilm = &ila_main; @@ -592,9 +592,10 @@ VLIB_REGISTER_NODE (ila_sir2ila_node, static) = VNET_IP6_UNICAST_FEATURE_INIT (ila_sir2ila, static) = { - .node_name = "sir-to-ila",.runs_before = - { -"ip6-lookup", 0},.feature_index = &ila_main.ila_sir2ila_feature_index,}; + .node_name = "sir-to-ila", + .runs_before = ORDER_CONSTRAINTS{"ip6-lookup", 0}, + .feature_index = &ila_main.ila_sir2ila_feature_index, +}; int ila_add_del_entry (ila_add_del_entry_args_t * args) @@ -769,7 +770,7 @@ ila_interface (u32 sw_if_index, u8 disable) ila_main_t *ilm = &ila_main; ip6_main_t *im = &ip6_main; ip_lookup_main_t *lm = &im->lookup_main; - ip_config_main_t *cm = &lm->rx_config_mains[VNET_UNICAST]; + ip_config_main_t *cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; vnet_config_main_t *vcm = &cm->config_main; u32 ci, feature_index; -- cgit 1.2.3-korg