diff options
| author |   Filip Tehlar <ftehlar@cisco.com> | 2019-03-11 05:30:21 -0700 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-03-12 19:08:33 +0000 |
| commit | 26ea14eeade802b8b4993f60506f2b5c9b976433 (patch) | |
| tree | 22c0b7ad6ebd26d99daff1df4becfdf0d6301cb1 /src/vnet/ip/ip6_input.c | |
| parent | 44f0f71b6b1e6dac466452664817abc388662efd (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/ip6_input.c')
| -rw-r--r-- | src/vnet/ip/ip6_input.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/vnet/ip/ip6_input.c b/src/vnet/ip/ip6_input.c index a01920a7b48..0450064eafe 100644 --- a/src/vnet/ip/ip6_input.c +++ b/src/vnet/ip/ip6_input.c @@ -62,8 +62,8 @@ format_ip6_input_trace (u8 * s, va_list * va) /* Validate IP v6 packets and pass them either to forwarding code or drop exception packets. */ -static uword -ip6_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (ip6_input_node) (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * frame) { vnet_main_t *vnm = vnet_get_main (); ip6_main_t *im = &ip6_main; @@ -218,15 +218,16 @@ ip6_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) return frame->n_vectors; } +#ifndef CLIB_MARCH_VARIANT char *ip6_error_strings[] = { #define _(sym,string) string, foreach_ip6_error #undef _ }; +#endif /* CLIB_MARCH_VARIANT */ /* *INDENT-OFF* */ VLIB_REGISTER_NODE (ip6_input_node) = { - .function = ip6_input, .name = "ip6-input", .vector_size = sizeof (u32), @@ -246,8 +247,6 @@ VLIB_REGISTER_NODE (ip6_input_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (ip6_input_node, ip6_input); - static clib_error_t * ip6_init (vlib_main_t * vm) { |