aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet/l2/l2_xcrw.c
diff options
context:
space:
mode:
authorFilip Tehlar <ftehlar@cisco.com>2019-03-11 04:26:37 -0700
committerDamjan Marion <dmarion@me.com>2019-03-12 19:07:42 +0000
commit44f0f71b6b1e6dac466452664817abc388662efd (patch)
tree7c17c324b7e941c10a8a6ffa00feb8055f35a4d6 /src/vnet/l2/l2_xcrw.c
parentc4be9850f21ce59b7b8b830661db0f0437dd1063 (diff)
l2: migrate old MULTIARCH macros to VLIB_NODE_FN
Change-Id: I8370c06150ce4499475e9d6dc6b3ab8be2016202 Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'src/vnet/l2/l2_xcrw.c')
-rw-r--r--src/vnet/l2/l2_xcrw.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/vnet/l2/l2_xcrw.c b/src/vnet/l2/l2_xcrw.c
index b7ccd81806f..1280b11e6b9 100644
--- a/src/vnet/l2/l2_xcrw.c
+++ b/src/vnet/l2/l2_xcrw.c
@@ -57,9 +57,11 @@ format_l2_xcrw_trace (u8 * s, va_list * args)
return s;
}
-l2_xcrw_main_t l2_xcrw_main;
+extern l2_xcrw_main_t l2_xcrw_main;
-static vlib_node_registration_t l2_xcrw_node;
+#ifndef CLIB_MARCH_VARIANT
+l2_xcrw_main_t l2_xcrw_main;
+#endif /* CLIB_MARCH_VARIANT */
static char *l2_xcrw_error_strings[] = {
#define _(sym,string) string,
@@ -67,9 +69,8 @@ static char *l2_xcrw_error_strings[] = {
#undef _
};
-static uword
-l2_xcrw_node_fn (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (l2_xcrw_node) (vlib_main_t * vm,
+ vlib_node_runtime_t * node, vlib_frame_t * frame)
{
u32 n_left_from, *from, *to_next;
l2_xcrw_next_t next_index;
@@ -238,8 +239,7 @@ l2_xcrw_node_fn (vlib_main_t * vm,
}
/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2_xcrw_node, static) = {
- .function = l2_xcrw_node_fn,
+VLIB_REGISTER_NODE (l2_xcrw_node) = {
.name = "l2-xcrw",
.vector_size = sizeof (u32),
.format_trace = format_l2_xcrw_trace,
@@ -257,8 +257,9 @@ VLIB_REGISTER_NODE (l2_xcrw_node, static) = {
};
/* *INDENT-ON* */
-VLIB_NODE_FUNCTION_MULTIARCH (l2_xcrw_node, l2_xcrw_node_fn)
- clib_error_t *l2_xcrw_init (vlib_main_t * vm)
+#ifndef CLIB_MARCH_VARIANT
+clib_error_t *
+l2_xcrw_init (vlib_main_t * vm)
{
l2_xcrw_main_t *mp = &l2_xcrw_main;
@@ -514,6 +515,8 @@ VLIB_CLI_COMMAND (set_l2_xcrw_command, static) = {
};
/* *INDENT-ON* */
+#endif /* CLIB_MARCH_VARIANT */
+
static u8 *
format_l2xcrw (u8 * s, va_list * args)
{