vppinfra: add STATIC_ASSERT macro

[vpp.git] / vnet / vnet / mpls / mpls_features.c

diff --git a/vnet/vnet/mpls/mpls_features.c b/vnet/vnet/mpls/mpls_features.c
index 80002fc..10a58cf 100644 (file)
--- a/vnet/vnet/mpls/mpls_features.c
+++ b/vnet/vnet/mpls/mpls_features.c
@@ -124,7 +124,7 @@ static char * rx_feature_start_nodes[] =
 {
     "mpls-input",
 };
-static char * tx_feature_start_nodes[] = 
+static char * tx_feature_start_nodes[] =
 {
     "mpls-output",
     "mpls-midchain",
@@ -133,26 +133,28 @@ 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;
 
-  if ((error = ip_feature_init_cast (vm, cm, vcm,
-                                    rx_feature_start_nodes,
-                                    ARRAY_LEN(rx_feature_start_nodes),
-                                    mpls_main.next_feature[VNET_IP_RX_UNICAST_FEAT],
-                                    &mpls_main.feature_nodes[VNET_IP_RX_UNICAST_FEAT])))
+  error = vnet_feature_arc_init
+      (vm, vcm, rx_feature_start_nodes,
+       ARRAY_LEN(rx_feature_start_nodes),
+       mpls_main.next_feature[VNET_IP_RX_UNICAST_FEAT],
+       &mpls_main.feature_nodes[VNET_IP_RX_UNICAST_FEAT]);
+
+  if (error)
       return error;
 
   cm  = &mpls_main.feature_config_mains[VNET_IP_TX_FEAT];
   vcm = &cm->config_main;
 
-  if ((error = ip_feature_init_cast (vm, cm, vcm,
-                                    tx_feature_start_nodes,
-                                    ARRAY_LEN(tx_feature_start_nodes),
-                                    mpls_main.next_feature[VNET_IP_TX_FEAT],
-                                    &mpls_main.feature_nodes[VNET_IP_TX_FEAT])))
-      return error;
+  error = vnet_feature_arc_init
+      (vm, vcm,
+       tx_feature_start_nodes,
+       ARRAY_LEN(tx_feature_start_nodes),
+       mpls_main.next_feature[VNET_IP_TX_FEAT],
+       &mpls_main.feature_nodes[VNET_IP_TX_FEAT]);
 
   return error;
 }
@@ -169,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)
@@ -256,7 +258,7 @@ show_mpls_interface_features_command_fn (vlib_main_t * vm,
   vlib_cli_output (vm, "MPLS feature paths configured on %U...",
                    format_vnet_sw_if_index_name, vnm, sw_if_index);
 
-  ip_interface_features_show (vm, "MPLS", 
+  ip_interface_features_show (vm, "MPLS",
                              mpls_main.feature_config_mains,
                              sw_if_index);