node functions cannot be always_inline

Thanks to gcc-8 for highlighting this...

Change-Id: I53bfab631a40fd1b680c76a48b0307a33fa2b154
Signed-off-by: Damjan Marion <damarion@cisco.com>

diff --git a/src/vnet/dpo/lookup_dpo.c b/src/vnet/dpo/lookup_dpo.c
index 9426d1c..059fa3f 100644 (file)
--- a/src/vnet/dpo/lookup_dpo.c
+++ b/src/vnet/dpo/lookup_dpo.c
@@ -604,7 +604,7 @@ format_lookup_trace (u8 * s, va_list * args)
     return s;
 }
 
-always_inline uword
+static uword
 lookup_ip4_dst (vlib_main_t * vm,
                 vlib_node_runtime_t * node,
                 vlib_frame_t * from_frame)
@@ -621,7 +621,7 @@ VLIB_REGISTER_NODE (lookup_ip4_dst_node) = {
 };
 VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip4_dst_node, lookup_ip4_dst)
 
-always_inline uword
+static uword
 lookup_ip4_dst_itf (vlib_main_t * vm,
                     vlib_node_runtime_t * node,
                     vlib_frame_t * from_frame)
@@ -638,7 +638,7 @@ VLIB_REGISTER_NODE (lookup_ip4_dst_itf_node) = {
 };
 VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip4_dst_itf_node, lookup_ip4_dst_itf)
 
-always_inline uword
+static uword
 lookup_ip4_src (vlib_main_t * vm,
                 vlib_node_runtime_t * node,
                 vlib_frame_t * from_frame)
@@ -930,7 +930,7 @@ lookup_dpo_ip6_inline (vlib_main_t * vm,
     return from_frame->n_vectors;
 }
 
-always_inline uword
+static uword
 lookup_ip6_dst (vlib_main_t * vm,
                 vlib_node_runtime_t * node,
                 vlib_frame_t * from_frame)
@@ -947,7 +947,7 @@ VLIB_REGISTER_NODE (lookup_ip6_dst_node) = {
 };
 VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip6_dst_node, lookup_ip6_dst)
 
-always_inline uword
+static uword
 lookup_ip6_dst_itf (vlib_main_t * vm,
                    vlib_node_runtime_t * node,
                    vlib_frame_t * from_frame)
@@ -964,7 +964,7 @@ VLIB_REGISTER_NODE (lookup_ip6_dst_itf_node) = {
 };
 VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip6_dst_itf_node, lookup_ip6_dst_itf)
 
-always_inline uword
+static uword
 lookup_ip6_src (vlib_main_t * vm,
                 vlib_node_runtime_t * node,
                 vlib_frame_t * from_frame)
@@ -1126,7 +1126,7 @@ format_lookup_mpls_trace (u8 * s, va_list * args)
     return s;
 }
 
-always_inline uword
+static uword
 lookup_mpls_dst (vlib_main_t * vm,
                 vlib_node_runtime_t * node,
                 vlib_frame_t * from_frame)
@@ -1144,7 +1144,7 @@ VLIB_REGISTER_NODE (lookup_mpls_dst_node) = {
 };
 VLIB_NODE_FUNCTION_MULTIARCH (lookup_mpls_dst_node, lookup_mpls_dst)
 
-always_inline uword
+static uword
 lookup_mpls_dst_itf (vlib_main_t * vm,
                     vlib_node_runtime_t * node,
                     vlib_frame_t * from_frame)
@@ -1257,7 +1257,7 @@ lookup_dpo_ip_dst_mcast_inline (vlib_main_t * vm,
     return from_frame->n_vectors;
 }
 
-always_inline uword
+static uword
 lookup_ip4_dst_mcast (vlib_main_t * vm,
                       vlib_node_runtime_t * node,
                       vlib_frame_t * from_frame)
@@ -1279,7 +1279,7 @@ VLIB_REGISTER_NODE (lookup_ip4_dst_mcast_node) = {
 VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip4_dst_mcast_node,
                               lookup_ip4_dst_mcast)
 
-always_inline uword
+static uword
 lookup_ip6_dst_mcast (vlib_main_t * vm,
                       vlib_node_runtime_t * node,
                       vlib_frame_t * from_frame)

diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c
index 7631a32..89ce274 100644 (file)
--- a/src/vnet/interface_output.c
+++ b/src/vnet/interface_output.c
@@ -443,7 +443,7 @@ vnet_interface_output_node_inline (vlib_main_t * vm,
   return n_buffers;
 }
 
-static_always_inline uword
+static uword
 vnet_interface_output_node (vlib_main_t * vm, vlib_node_runtime_t * node,
                            vlib_frame_t * frame)
 {

diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c
index 677f88c..d556f0a 100644 (file)
--- a/src/vnet/ip/ip4_forward.c
+++ b/src/vnet/ip/ip4_forward.c
@@ -114,7 +114,7 @@ VLIB_REGISTER_NODE (ip4_lookup_node) =
 
 VLIB_NODE_FUNCTION_MULTIARCH (ip4_lookup_node, ip4_lookup);
 
-always_inline uword
+static uword
 ip4_load_balance (vlib_main_t * vm,
                  vlib_node_runtime_t * node, vlib_frame_t * frame)
 {

diff --git a/src/vnet/ip/ip4_reassembly.c b/src/vnet/ip/ip4_reassembly.c
index d924f37..2f4318f 100644 (file)
--- a/src/vnet/ip/ip4_reassembly.c
+++ b/src/vnet/ip/ip4_reassembly.c
@@ -990,7 +990,7 @@ static char *ip4_reassembly_error_strings[] = {
 #undef _
 };
 
-always_inline uword
+static uword
 ip4_reassembly (vlib_main_t * vm, vlib_node_runtime_t * node,
                vlib_frame_t * frame)
 {
@@ -1016,7 +1016,7 @@ VLIB_REGISTER_NODE (ip4_reass_node, static) = {
 
 VLIB_NODE_FUNCTION_MULTIARCH (ip4_reass_node, ip4_reassembly);
 
-always_inline uword
+static uword
 ip4_reassembly_feature (vlib_main_t * vm,
                        vlib_node_runtime_t * node, vlib_frame_t * frame)
 {

diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c
index cf1011f..343d348 100644 (file)
--- a/src/vnet/ip/ip6_forward.c
+++ b/src/vnet/ip/ip6_forward.c
@@ -522,7 +522,7 @@ VLIB_REGISTER_NODE (ip6_lookup_node) =
 
 VLIB_NODE_FUNCTION_MULTIARCH (ip6_lookup_node, ip6_lookup);
 
-always_inline uword
+static uword
 ip6_load_balance (vlib_main_t * vm,
                  vlib_node_runtime_t * node, vlib_frame_t * frame)
 {

diff --git a/src/vnet/ip/ip6_reassembly.c b/src/vnet/ip/ip6_reassembly.c
index ce30d95..3cc4c06 100644 (file)
--- a/src/vnet/ip/ip6_reassembly.c
+++ b/src/vnet/ip/ip6_reassembly.c
@@ -1026,7 +1026,7 @@ static char *ip6_reassembly_error_strings[] = {
 #undef _
 };
 
-always_inline uword
+static uword
 ip6_reassembly (vlib_main_t * vm, vlib_node_runtime_t * node,
                vlib_frame_t * frame)
 {
@@ -1053,7 +1053,7 @@ VLIB_REGISTER_NODE (ip6_reass_node, static) = {
 
 VLIB_NODE_FUNCTION_MULTIARCH (ip6_reass_node, ip6_reassembly);
 
-always_inline uword
+static uword
 ip6_reassembly_feature (vlib_main_t * vm,
                        vlib_node_runtime_t * node, vlib_frame_t * frame)
 {

diff --git a/src/vnet/mpls/mpls_lookup.c b/src/vnet/mpls/mpls_lookup.c
index b13c65d..04a983b 100644 (file)
--- a/src/vnet/mpls/mpls_lookup.c
+++ b/src/vnet/mpls/mpls_lookup.c
@@ -500,7 +500,7 @@ format_mpls_load_balance_trace (u8 * s, va_list * args)
   return s;
 }
 
-always_inline uword
+static uword
 mpls_load_balance (vlib_main_t * vm,
                   vlib_node_runtime_t * node,
                   vlib_frame_t * frame)