diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-10-31 23:18:04 +0100 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2016-11-01 00:11:15 +0000 |
| commit | 0cd695c7ad18cfe8794b1c669cdefd215f7a1b63 (patch) | |
| tree | 6b28ae2a9f5c64ea928bbff721e930e9a8245c4b /vnet/vnet/mpls | |
| parent | 277b89c946e6fdc764ee48726fcd3df1c189eda9 (diff) | |
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 <damarion@cisco.com>
Diffstat (limited to 'vnet/vnet/mpls')
| -rw-r--r-- | vnet/vnet/mpls/interface.c | 2 | ||||
| -rw-r--r-- | vnet/vnet/mpls/mpls.h | 2 | ||||
| -rw-r--r-- | vnet/vnet/mpls/mpls_features.c | 4 | ||||
| -rw-r--r-- | vnet/vnet/mpls/node.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vnet/vnet/mpls/interface.c b/vnet/vnet/mpls/interface.c index af0428cec8d..9fd93ff8701 100644 --- a/vnet/vnet/mpls/interface.c +++ b/vnet/vnet/mpls/interface.c @@ -277,7 +277,7 @@ mpls_sw_interface_enable_disable (mpls_main_t * mm, u8 is_enable) { vlib_main_t * vm = vlib_get_main(); - ip_config_main_t * cm = &mm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t * cm = &mm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; vnet_config_main_t * vcm = &cm->config_main; u32 lookup_feature_index; fib_node_index_t lfib_index; diff --git a/vnet/vnet/mpls/mpls.h b/vnet/vnet/mpls/mpls.h index da663b0b788..85973d862dc 100644 --- a/vnet/vnet/mpls/mpls.h +++ b/vnet/vnet/mpls/mpls.h @@ -95,7 +95,7 @@ typedef struct { uword *fib_index_by_table_id; /* rx/tx interface/feature configuration. */ - ip_config_main_t feature_config_mains[VNET_N_IP_FEAT]; + vnet_feature_config_main_t feature_config_mains[VNET_N_IP_FEAT]; /* Built-in unicast feature path indices, see vnet_feature_arc_init(...) */ u32 mpls_rx_feature_lookup; diff --git a/vnet/vnet/mpls/mpls_features.c b/vnet/vnet/mpls/mpls_features.c index 3eb469c8768..10a58cfb09c 100644 --- a/vnet/vnet/mpls/mpls_features.c +++ b/vnet/vnet/mpls/mpls_features.c @@ -133,7 +133,7 @@ static char * tx_feature_start_nodes[] = clib_error_t * mpls_feature_init (vlib_main_t * vm) { - ip_config_main_t * cm = &mpls_main.feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t * cm = &mpls_main.feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; vnet_config_main_t * vcm = &cm->config_main; clib_error_t *error; @@ -171,7 +171,7 @@ mpls_sw_interface_add_del (vnet_main_t * vnm, for (cast = 0; cast < VNET_N_IP_FEAT; cast++) { - ip_config_main_t * cm = &mm->feature_config_mains[cast]; + vnet_feature_config_main_t * cm = &mm->feature_config_mains[cast]; vnet_config_main_t * vcm = &cm->config_main; if (VNET_IP_RX_MULTICAST_FEAT == cast) diff --git a/vnet/vnet/mpls/node.c b/vnet/vnet/mpls/node.c index 5b8f2569e77..7a4a302315a 100644 --- a/vnet/vnet/mpls/node.c +++ b/vnet/vnet/mpls/node.c @@ -96,7 +96,7 @@ mpls_input_inline (vlib_main_t * vm, mpls_unicast_header_t * h0; u32 label0; u32 next0; - ip_config_main_t * cm0; + vnet_feature_config_main_t * cm0; u32 sw_if_index0; bi0 = from[0]; |