diff options
| author |   Filip Tehlar <ftehlar@cisco.com> | 2019-03-11 05:53:35 -0700 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-03-13 10:59:48 +0000 |
| commit | c3a0e8d2d255c0925d1ec17aba8c8892d532b040 (patch) | |
| tree | 831a90adb1789a06e44cdd15a9c35f2c5c02d438 /src/vnet/handoff.c | |
| parent | 47a9c651e21731ec4d20e123f6c591d7078f3992 (diff) | |
deprecate VLIB_NODE_FUNCTION_MULTIARCH
Change-Id: I403173846bc5b1bbbe2a2c41225b0f666f851cb9
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'src/vnet/handoff.c')
| -rw-r--r-- | src/vnet/handoff.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/vnet/handoff.c b/src/vnet/handoff.c index ffac47e22df..ca46b5a7ab6 100644 --- a/src/vnet/handoff.c +++ b/src/vnet/handoff.c @@ -40,7 +40,11 @@ typedef struct u64 (*hash_fn) (ethernet_header_t *); } handoff_main_t; +extern handoff_main_t handoff_main; + +#ifndef CLIB_MARCH_VARIANT handoff_main_t handoff_main; +#endif /* CLIB_MARCH_VARIANT */ typedef struct { @@ -80,11 +84,9 @@ format_worker_handoff_trace (u8 * s, va_list * args) return s; } -vlib_node_registration_t handoff_node; - -static uword -worker_handoff_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (worker_handoff_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { handoff_main_t *hm = &handoff_main; vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b; @@ -159,7 +161,6 @@ worker_handoff_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (worker_handoff_node) = { - .function = worker_handoff_node_fn, .name = "worker-handoff", .vector_size = sizeof (u32), .format_trace = format_worker_handoff_trace, @@ -173,9 +174,9 @@ VLIB_REGISTER_NODE (worker_handoff_node) = { }, }; -VLIB_NODE_FUNCTION_MULTIARCH (worker_handoff_node, worker_handoff_node_fn) /* *INDENT-ON* */ +#ifndef CLIB_MARCH_VARIANT int interface_handoff_enable_disable (vlib_main_t * vm, u32 sw_if_index, uword * bitmap, int enable_disable) @@ -335,6 +336,7 @@ handoff_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (handoff_init); +#endif /* CLIB_MARCH_VARIANT */ /* * fd.io coding-style-patch-verification: ON * |