From 0cd695c7ad18cfe8794b1c669cdefd215f7a1b63 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Mon, 31 Oct 2016 23:18:04 +0100 Subject: config: rename ip_config_main_t to vnet_feature_config_main_t It will not be used for IP only... Change-Id: I90ef3030aff7f9e24767553f019cabc1ea987126 Signed-off-by: Damjan Marion --- plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c | 2 +- plugins/flowperpkt-plugin/flowperpkt/node.c | 2 +- plugins/ila-plugin/ila/ila.c | 4 ++-- plugins/snat-plugin/snat/out2in.c | 4 ++-- plugins/snat-plugin/snat/snat.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins') diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c b/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c index 3aef24a223a..824fc50ec57 100644 --- a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c +++ b/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c @@ -252,7 +252,7 @@ static int flowperpkt_tx_interface_add_del_feature u32 ci; ip4_main_t *im = &ip4_main; ip_lookup_main_t *lm = &im->lookup_main; - ip_config_main_t *cm = &lm->feature_config_mains[VNET_IP_TX_FEAT]; + vnet_feature_config_main_t *cm = &lm->feature_config_mains[VNET_IP_TX_FEAT]; u32 feature_index; flow_report_main_t *frm = &flow_report_main; vnet_flow_report_add_del_args_t _a, *a = &_a; diff --git a/plugins/flowperpkt-plugin/flowperpkt/node.c b/plugins/flowperpkt-plugin/flowperpkt/node.c index 4deaae1a67c..0991c91d2dc 100644 --- a/plugins/flowperpkt-plugin/flowperpkt/node.c +++ b/plugins/flowperpkt-plugin/flowperpkt/node.c @@ -279,7 +279,7 @@ flowperpkt_node_fn (vlib_main_t * vm, flowperpkt_next_t next_index; ip4_main_t *im = &ip4_main; ip_lookup_main_t *lm = &im->lookup_main; - ip_config_main_t *cm = &lm->feature_config_mains[VNET_IP_TX_FEAT]; + vnet_feature_config_main_t *cm = &lm->feature_config_mains[VNET_IP_TX_FEAT]; flowperpkt_main_t *fm = &flowperpkt_main; f64 now = vlib_time_now (vm); diff --git a/plugins/ila-plugin/ila/ila.c b/plugins/ila-plugin/ila/ila.c index 90dde5f25af..61ce0f7bacd 100644 --- a/plugins/ila-plugin/ila/ila.c +++ b/plugins/ila-plugin/ila/ila.c @@ -427,7 +427,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->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_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; @@ -827,7 +827,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->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_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; diff --git a/plugins/snat-plugin/snat/out2in.c b/plugins/snat-plugin/snat/out2in.c index 7601eb8dfdd..190350ada2b 100644 --- a/plugins/snat-plugin/snat/out2in.c +++ b/plugins/snat-plugin/snat/out2in.c @@ -285,7 +285,7 @@ snat_out2in_node_fn (vlib_main_t * vm, u32 pkts_processed = 0; snat_main_t * sm = &snat_main; ip_lookup_main_t * lm = sm->ip4_lookup_main; - ip_config_main_t * cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t * cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; f64 now = vlib_time_now (vm); from = vlib_frame_vector_args (frame); @@ -854,7 +854,7 @@ snat_out2in_fast_node_fn (vlib_main_t * vm, u32 pkts_processed = 0; snat_main_t * sm = &snat_main; ip_lookup_main_t * lm = sm->ip4_lookup_main; - ip_config_main_t * cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t * cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; from = vlib_frame_vector_args (frame); n_left_from = frame->n_vectors; diff --git a/plugins/snat-plugin/snat/snat.c b/plugins/snat-plugin/snat/snat.c index 1a8c93dcf72..0b972110f19 100644 --- a/plugins/snat-plugin/snat/snat.c +++ b/plugins/snat-plugin/snat/snat.c @@ -543,7 +543,7 @@ static int snat_interface_add_del (u32 sw_if_index, u8 is_inside, int is_del) u32 ci; ip4_main_t * im = &ip4_main; ip_lookup_main_t * lm = &im->lookup_main; - ip_config_main_t * rx_cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t * rx_cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; u32 feature_index; if (sm->static_mapping_only && !(sm->static_mapping_connection_tracking)) -- cgit 1.2.3-korg