summaryrefslogtreecommitdiffstats
path: root/src/vnet/ip/ip4_source_check.c
diff options
context:
space:
mode:
authorFilip Tehlar <ftehlar@cisco.com>2019-03-11 05:30:21 -0700
committerDamjan Marion <dmarion@me.com>2019-03-12 19:08:33 +0000
commit26ea14eeade802b8b4993f60506f2b5c9b976433 (patch)
tree22c0b7ad6ebd26d99daff1df4becfdf0d6301cb1 /src/vnet/ip/ip4_source_check.c
parent44f0f71b6b1e6dac466452664817abc388662efd (diff)
ip: migrate old MULTIARCH macros to VLIB_NODE_FN
Change-Id: Id55ec87724e421d5b722314f9302c6ade7545306 Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'src/vnet/ip/ip4_source_check.c')
-rw-r--r--src/vnet/ip/ip4_source_check.c24
1 files changed, 8 insertions, 16 deletions
diff --git a/src/vnet/ip/ip4_source_check.c b/src/vnet/ip/ip4_source_check.c
index 2e4226f2108..b3d4b001e9e 100644
--- a/src/vnet/ip/ip4_source_check.c
+++ b/src/vnet/ip/ip4_source_check.c
@@ -274,19 +274,17 @@ ip4_source_check_inline (vlib_main_t * vm,
return frame->n_vectors;
}
-static uword
-ip4_source_check_reachable_via_any (vlib_main_t * vm,
- vlib_node_runtime_t * node,
- vlib_frame_t * frame)
+VLIB_NODE_FN (ip4_check_source_reachable_via_any) (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * frame)
{
return ip4_source_check_inline (vm, node, frame,
IP4_SOURCE_CHECK_REACHABLE_VIA_ANY);
}
-static uword
-ip4_source_check_reachable_via_rx (vlib_main_t * vm,
- vlib_node_runtime_t * node,
- vlib_frame_t * frame)
+VLIB_NODE_FN (ip4_check_source_reachable_via_rx) (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * frame)
{
return ip4_source_check_inline (vm, node, frame,
IP4_SOURCE_CHECK_REACHABLE_VIA_RX);
@@ -294,7 +292,6 @@ ip4_source_check_reachable_via_rx (vlib_main_t * vm,
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (ip4_check_source_reachable_via_any) = {
- .function = ip4_source_check_reachable_via_any,
.name = "ip4-source-check-via-any",
.vector_size = sizeof (u32),
@@ -308,12 +305,8 @@ VLIB_REGISTER_NODE (ip4_check_source_reachable_via_any) = {
};
/* *INDENT-ON* */
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_check_source_reachable_via_any,
- ip4_source_check_reachable_via_any);
-
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (ip4_check_source_reachable_via_rx) = {
- .function = ip4_source_check_reachable_via_rx,
.name = "ip4-source-check-via-rx",
.vector_size = sizeof (u32),
@@ -327,9 +320,6 @@ VLIB_REGISTER_NODE (ip4_check_source_reachable_via_rx) = {
};
/* *INDENT-ON* */
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_check_source_reachable_via_rx,
- ip4_source_check_reachable_via_rx);
-
static clib_error_t *
set_ip_source_check (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
@@ -535,6 +525,7 @@ VLIB_CLI_COMMAND (ip_source_check_accept_command, static) = {
/* *INDENT-ON* */
+#ifndef CLIB_MARCH_VARIANT
/* Dummy init function to get us linked in. */
clib_error_t *
ip4_source_check_init (vlib_main_t * vm)
@@ -543,6 +534,7 @@ ip4_source_check_init (vlib_main_t * vm)
}
VLIB_INIT_FUNCTION (ip4_source_check_init);
+#endif /* CLIB_MARCH_VARIANT */
/*
* fd.io coding-style-patch-verification: ON