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/l2tp | |
| parent | 47a9c651e21731ec4d20e123f6c591d7078f3992 (diff) | |
deprecate VLIB_NODE_FUNCTION_MULTIARCH
Change-Id: I403173846bc5b1bbbe2a2c41225b0f666f851cb9
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'src/vnet/l2tp')
| -rw-r--r-- | src/vnet/l2tp/decap.c | 12 | ||||
| -rw-r--r-- | src/vnet/l2tp/encap.c | 12 |
2 files changed, 13 insertions, 11 deletions
diff --git a/src/vnet/l2tp/decap.c b/src/vnet/l2tp/decap.c index 5925cdb7f41..5fc25f55226 100644 --- a/src/vnet/l2tp/decap.c +++ b/src/vnet/l2tp/decap.c @@ -236,9 +236,9 @@ done: #include <vnet/pipeline.h> -static uword -l2t_decap_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (l2t_decap_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return dispatch_pipeline (vm, node, frame); } @@ -251,7 +251,6 @@ l2t_decap_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (l2t_decap_node) = { - .function = l2t_decap_node_fn, .name = "l2tp-decap", .vector_size = sizeof (u32), .format_trace = format_l2t_trace, @@ -270,7 +269,8 @@ VLIB_REGISTER_NODE (l2t_decap_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (l2t_decap_node, l2t_decap_node_fn); +extern vlib_node_function_t l2t_decap_node_fn; + /* *INDENT-OFF* */ VLIB_REGISTER_NODE (l2t_decap_local_node) = { .function = l2t_decap_node_fn, @@ -292,11 +292,13 @@ VLIB_REGISTER_NODE (l2t_decap_local_node) = { }; /* *INDENT-ON* */ +#ifndef CLIB_MARCH_VARIANT void l2tp_decap_init (void) { ip6_register_protocol (IP_PROTOCOL_L2TP, l2t_decap_local_node.index); } +#endif /* CLIB_MARCH_VARIANT */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/vnet/l2tp/encap.c b/src/vnet/l2tp/encap.c index 44641d99019..8863ddfa20d 100644 --- a/src/vnet/l2tp/encap.c +++ b/src/vnet/l2tp/encap.c @@ -57,7 +57,7 @@ typedef struct vnet_main_t *vnet_main; } l2tp_encap_runtime_t; -vlib_node_registration_t l2t_encap_node; +extern vlib_node_registration_t l2t_encap_node; #define NSTAGES 3 @@ -184,9 +184,9 @@ done: #include <vnet/pipeline.h> -uword -l2t_encap_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (l2t_encap_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return dispatch_pipeline (vm, node, frame); } @@ -194,7 +194,6 @@ l2t_encap_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (l2t_encap_node) = { - .function = l2t_encap_node_fn, .name = "l2tp-encap", .vector_size = sizeof (u32), .format_trace = format_l2t_trace, @@ -214,7 +213,7 @@ VLIB_REGISTER_NODE (l2t_encap_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (l2t_encap_node, l2t_encap_node_fn); +#ifndef CLIB_MARCH_VARIANT void l2tp_encap_init (vlib_main_t * vm) { @@ -225,6 +224,7 @@ l2tp_encap_init (vlib_main_t * vm) rt->cached_sw_if_index = (u32) ~ 0; rt->cached_session_index = (u32) ~ 0; } +#endif /* CLIB_MARCH_VARIANT */ /* * fd.io coding-style-patch-verification: ON |