vppinfra: Improve code portability

[vpp.git] / src / vnet / bier / bier_imp_node.c

diff --git a/src/vnet/bier/bier_imp_node.c b/src/vnet/bier/bier_imp_node.c
index dcfcc1a..fc75cb2 100644 (file)
--- a/src/vnet/bier/bier_imp_node.c
+++ b/src/vnet/bier/bier_imp_node.c
@@ -15,7 +15,8 @@
 
 #include <vnet/bier/bier_imp.h>
 #include <vnet/bier/bier_hdr_inlines.h>
-#include <vnet/ip/ip.h>
+#include <vnet/ip/ip4_inlines.h>
+#include <vnet/ip/ip6_inlines.h>
 
 /**
  * @brief A struct to hold tracing information for the BIER imposition
@@ -143,8 +144,8 @@ bier_imp_dpo_inline (vlib_main_t * vm,
                                          BIER_HDR_ENTROPY_FIELD_SHIFT);
 
                 /*
-                 * use TTL 64 for the post enacp MPLS label/BIFT-ID
-                 * this we be decremeted in bier_output node.
+                 * use TTL 64 for the post encap MPLS label/BIFT-ID
+                 * this we be decremented in bier_output node.
                  */
                 vnet_buffer(b0)->mpls.ttl = 65;
 
@@ -185,8 +186,7 @@ format_bier_imp_trace (u8 * s, va_list * args)
     return (s);
 }
 
-static uword
-bier_imp_ip4 (vlib_main_t * vm,
+VLIB_NODE_FN (bier_imp_ip4_node) (vlib_main_t * vm,
               vlib_node_runtime_t * node,
               vlib_frame_t * frame)
 {
@@ -196,7 +196,6 @@ bier_imp_ip4 (vlib_main_t * vm,
 }
 
 VLIB_REGISTER_NODE (bier_imp_ip4_node) = {
-    .function = bier_imp_ip4,
     .name = "bier-imp-ip4",
     .vector_size = sizeof (u32),
 
@@ -206,10 +205,8 @@ VLIB_REGISTER_NODE (bier_imp_ip4_node) = {
         [0] = "bier-drop",
     }
 };
-VLIB_NODE_FUNCTION_MULTIARCH (bier_imp_ip4_node, bier_imp_ip4)
 
-static uword
-bier_imp_ip6 (vlib_main_t * vm,
+VLIB_NODE_FN (bier_imp_ip6_node) (vlib_main_t * vm,
               vlib_node_runtime_t * node,
               vlib_frame_t * frame)
 {
@@ -219,7 +216,6 @@ bier_imp_ip6 (vlib_main_t * vm,
 }
 
 VLIB_REGISTER_NODE (bier_imp_ip6_node) = {
-    .function = bier_imp_ip6,
     .name = "bier-imp-ip6",
     .vector_size = sizeof (u32),
 
@@ -229,4 +225,3 @@ VLIB_REGISTER_NODE (bier_imp_ip6_node) = {
         [0] = "error-drop",
     }
 };
-VLIB_NODE_FUNCTION_MULTIARCH (bier_imp_ip6_node, bier_imp_ip6)