summaryrefslogtreecommitdiffstats
path: root/src/plugins/nsh/nsh_output.c
diff options
context:
space:
mode:
authorFilip Tehlar <ftehlar@cisco.com>2019-02-26 02:59:07 -0800
committerDamjan Marion <dmarion@me.com>2019-02-26 20:18:46 +0000
commit4ba19b8a75c40cecd3818af2fd657fe5bf1b2f41 (patch)
treed79c028a1069612597178aa84ce9e112b9ea28cd /src/plugins/nsh/nsh_output.c
parent849cbe225ea9c0358e3f2789c89d4b84d0f7b367 (diff)
nsh: migrate old MUTIARCH macros to VLIB_NODE_FN
Change-Id: Iafe8b3a38f2a7d7571e60db91608d8130bb07cb3 Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'src/plugins/nsh/nsh_output.c')
-rw-r--r--src/plugins/nsh/nsh_output.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/src/plugins/nsh/nsh_output.c b/src/plugins/nsh/nsh_output.c
index f0ac673cf61..047fe8ae3b2 100644
--- a/src/plugins/nsh/nsh_output.c
+++ b/src/plugins/nsh/nsh_output.c
@@ -323,8 +323,7 @@ typedef enum nsh_midchain_next_t_
NSH_MIDCHAIN_NEXT_DROP,
} nsh_midchain_next_t;
-static inline uword
-nsh_eth_output (vlib_main_t * vm,
+VLIB_NODE_FN (nsh_eth_output) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
@@ -332,7 +331,6 @@ nsh_eth_output (vlib_main_t * vm,
}
VLIB_REGISTER_NODE (nsh_eth_output_node) = {
- .function = nsh_eth_output,
.name = "nsh-eth-output",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
@@ -346,10 +344,7 @@ VLIB_REGISTER_NODE (nsh_eth_output_node) = {
.format_trace = format_nsh_output_trace,
};
-VLIB_NODE_FUNCTION_MULTIARCH (nsh_eth_output_node, nsh_eth_output)
-
-static inline uword
-nsh_midchain (vlib_main_t * vm,
+VLIB_NODE_FN (nsh_midchain) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
@@ -357,7 +352,6 @@ nsh_midchain (vlib_main_t * vm,
}
VLIB_REGISTER_NODE (nsh_midchain_node) = {
- .function = nsh_midchain,
.name = "nsh-midchain",
.vector_size = sizeof (u32),
.format_trace = format_nsh_output_trace,
@@ -367,8 +361,6 @@ VLIB_REGISTER_NODE (nsh_midchain_node) = {
},
};
-VLIB_NODE_FUNCTION_MULTIARCH (nsh_midchain_node, nsh_midchain)
-
/* Built-in nsh tx feature path definition */
VNET_FEATURE_INIT (nsh_interface_output, static) = {
.arc_name = "nsh-eth-output",
@@ -423,8 +415,7 @@ typedef struct nsh_adj_incomplete_trace_t_
* We pay a cost for this 'routing' node, but an incomplete adj is the
* exception case.
*/
-static inline uword
-nsh_adj_incomplete (vlib_main_t * vm,
+VLIB_NODE_FN (nsh_adj_incomplete) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
@@ -503,7 +494,6 @@ format_nsh_adj_incomplete_trace (u8 * s, va_list * args)
}
VLIB_REGISTER_NODE (nsh_adj_incomplete_node) = {
- .function = nsh_adj_incomplete,
.name = "nsh-adj-incomplete",
.format_trace = format_nsh_adj_incomplete_trace,
/* Takes a vector of packets. */
@@ -516,5 +506,3 @@ VLIB_REGISTER_NODE (nsh_adj_incomplete_node) = {
},
};
-VLIB_NODE_FUNCTION_MULTIARCH (nsh_adj_incomplete_node,
- nsh_adj_incomplete)