diff options
| author |   Filip Tehlar <ftehlar@cisco.com> | 2019-03-11 04:26:37 -0700 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-03-12 19:07:42 +0000 |
| commit | 44f0f71b6b1e6dac466452664817abc388662efd (patch) | |
| tree | 7c17c324b7e941c10a8a6ffa00feb8055f35a4d6 /src/vnet/l2/l2_efp_filter.c | |
| parent | c4be9850f21ce59b7b8b830661db0f0437dd1063 (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_efp_filter.c')
| -rw-r--r-- | src/vnet/l2/l2_efp_filter.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/vnet/l2/l2_efp_filter.c b/src/vnet/l2/l2_efp_filter.c index 69d40a03497..3d152ad1f11 100644 --- a/src/vnet/l2/l2_efp_filter.c +++ b/src/vnet/l2/l2_efp_filter.c @@ -22,6 +22,7 @@ #include <vnet/l2/feat_bitmap.h> #include <vnet/l2/l2_output.h> #include <vnet/ethernet/ethernet.h> +#include <vnet/l2/l2_efp_filter.h> #include <vppinfra/error.h> #include <vppinfra/cache.h> @@ -80,9 +81,11 @@ format_l2_efp_filter_trace (u8 * s, va_list * args) return s; } -l2_efp_filter_main_t l2_efp_filter_main; +extern l2_efp_filter_main_t l2_efp_filter_main; -static vlib_node_registration_t l2_efp_filter_node; +#ifndef CLIB_MARCH_VARIANT +l2_efp_filter_main_t l2_efp_filter_main; +#endif /* CLIB_MARCH_VARIANT */ #define foreach_l2_efp_filter_error \ _(L2_EFP_FILTER, "L2 EFP filter packets") \ @@ -169,9 +172,9 @@ extract_keys (vnet_main_t * vnet_main, * The post-rewrite check is performed here. */ -static uword -l2_efp_filter_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (l2_efp_filter_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { u32 n_left_from, *from, *to_next; l2_efp_filter_next_t next_index; @@ -457,8 +460,7 @@ l2_efp_filter_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ -VLIB_REGISTER_NODE (l2_efp_filter_node,static) = { - .function = l2_efp_filter_node_fn, +VLIB_REGISTER_NODE (l2_efp_filter_node) = { .name = "l2-efp-filter", .vector_size = sizeof (u32), .format_trace = format_l2_efp_filter_trace, @@ -476,8 +478,9 @@ VLIB_REGISTER_NODE (l2_efp_filter_node,static) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (l2_efp_filter_node, l2_efp_filter_node_fn) - clib_error_t *l2_efp_filter_init (vlib_main_t * vm) +#ifndef CLIB_MARCH_VARIANT +clib_error_t * +l2_efp_filter_init (vlib_main_t * vm) { l2_efp_filter_main_t *mp = &l2_efp_filter_main; @@ -562,6 +565,7 @@ VLIB_CLI_COMMAND (int_l2_efp_filter_cli, static) = { }; /* *INDENT-ON* */ +#endif /* CLIB_MARCH_VARIANT */ /* * fd.io coding-style-patch-verification: ON |