aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2018-06-26 14:45:49 +0200
committerMarco Varlese <marco.varlese@suse.de>2018-07-09 07:09:15 +0000
commit6bb589c8acc4e3c27bcbd84d9fcd98ba0777db36 (patch)
tree9744d8748cbc50d5472765fed7b5224e34d092fd /src
parenta652002ffe1c16fead656c5b57b240e73dc496e3 (diff)
node functions cannot be always_inline
Thanks to gcc-8 for highlighting this... Change-Id: I53bfab631a40fd1b680c76a48b0307a33fa2b154 Signed-off-by: Damjan Marion <damarion@cisco.com> (cherry picked from commit 2574d9f41aa0531d0182f83b5d803da32205d809)
Diffstat (limited to 'src')
-rw-r--r--src/vnet/dpo/lookup_dpo.c20
-rw-r--r--src/vnet/interface_output.c2
-rw-r--r--src/vnet/ip/ip4_forward.c2
-rw-r--r--src/vnet/ip/ip4_reassembly.c4
-rw-r--r--src/vnet/ip/ip6_forward.c2
-rw-r--r--src/vnet/ip/ip6_reassembly.c4
-rw-r--r--src/vnet/mpls/mpls_lookup.c2
7 files changed, 18 insertions, 18 deletions
diff --git a/src/vnet/dpo/lookup_dpo.c b/src/vnet/dpo/lookup_dpo.c
index 9426d1ceb54..059fa3fd869 100644
--- 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 563f6149708..612119a9692 100644
--- 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 7c56a294436..173ed9ebbce 100644
--- a/src/vnet/ip/ip4_forward.c
+++ b/src/vnet/ip/ip4_forward.c
@@ -113,7 +113,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 33cdbd5e04d..14758a3c400 100644
--- 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 588cd0675a4..12ad8087416 100644
--- a/src/vnet/ip/ip6_forward.c
+++ b/src/vnet/ip/ip6_forward.c
@@ -477,7 +477,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 8b199f39ced..ec8fdc459f5 100644
--- a/src/vnet/ip/ip6_reassembly.c
+++ b/src/vnet/ip/ip6_reassembly.c
@@ -1027,7 +1027,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)
{
@@ -1054,7 +1054,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 30031e51536..0e53befd69e 100644
--- 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)