aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilip Tehlar <ftehlar@cisco.com>2019-03-05 03:34:52 -0800
committerNeale Ranns <nranns@cisco.com>2019-03-05 14:35:54 +0000
commita01e032f06a8c0162b3a90b9f22b902fb1937548 (patch)
tree72c8156f4a4e746a74ffe2da68ae4a5931fc5f3c
parent0bddf7e9f995a8f35ca293a27c5b41b3df4384f6 (diff)
bier: migrate old MULTIARCH macros to VLIB_NODE_FN
Change-Id: I561591c7d31ec66dfa0a1d7ef66bcf1d0c70f07c Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
-rw-r--r--src/vnet/CMakeLists.txt6
-rw-r--r--src/vnet/bier/bier_disp_dispatch_node.c5
-rw-r--r--src/vnet/bier/bier_disp_lookup_node.c5
-rw-r--r--src/vnet/bier/bier_imp_node.c10
4 files changed, 10 insertions, 16 deletions
diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt
index 12b61c8cf54..4c4928a1c4e 100644
--- a/src/vnet/CMakeLists.txt
+++ b/src/vnet/CMakeLists.txt
@@ -1388,6 +1388,12 @@ list(APPEND VNET_SOURCES
bier/bier_bift_table.c
)
+list(APPEND VNET_MULTIARCH_SOURCES
+ bier/bier_disp_dispatch_node.c
+ bier/bier_disp_lookup_node.c
+ bier/bier_imp_node.c
+)
+
list(APPEND VNET_HEADERS
bier/bier_types.h
bier/bier_entry.h
diff --git a/src/vnet/bier/bier_disp_dispatch_node.c b/src/vnet/bier/bier_disp_dispatch_node.c
index 0dbcada78ed..a506f1da70a 100644
--- a/src/vnet/bier/bier_disp_dispatch_node.c
+++ b/src/vnet/bier/bier_disp_dispatch_node.c
@@ -129,8 +129,7 @@ format_bier_disp_dispatch_trace (u8 * s, va_list * args)
return (s);
}
-static uword
-bier_disp_dispatch (vlib_main_t * vm,
+VLIB_NODE_FN (bier_disp_dispatch_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
@@ -138,7 +137,6 @@ bier_disp_dispatch (vlib_main_t * vm,
}
VLIB_REGISTER_NODE (bier_disp_dispatch_node) = {
- .function = bier_disp_dispatch,
.name = "bier-disp-dispatch",
.vector_size = sizeof (u32),
@@ -148,4 +146,3 @@ VLIB_REGISTER_NODE (bier_disp_dispatch_node) = {
[0] = "bier-drop",
}
};
-VLIB_NODE_FUNCTION_MULTIARCH (bier_disp_dispatch_node, bier_disp_dispatch)
diff --git a/src/vnet/bier/bier_disp_lookup_node.c b/src/vnet/bier/bier_disp_lookup_node.c
index 1e1ea99557f..255f0453bf3 100644
--- a/src/vnet/bier/bier_disp_lookup_node.c
+++ b/src/vnet/bier/bier_disp_lookup_node.c
@@ -132,8 +132,7 @@ format_bier_disp_lookup_trace (u8 * s, va_list * args)
return (s);
}
-static uword
-bier_disp_lookup (vlib_main_t * vm,
+VLIB_NODE_FN (bier_disp_lookup_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
@@ -141,7 +140,6 @@ bier_disp_lookup (vlib_main_t * vm,
}
VLIB_REGISTER_NODE (bier_disp_lookup_node) = {
- .function = bier_disp_lookup,
.name = "bier-disp-lookup",
.vector_size = sizeof (u32),
@@ -152,4 +150,3 @@ VLIB_REGISTER_NODE (bier_disp_lookup_node) = {
[BIER_DISP_LOOKUP_NEXT_DISPATCH] = "bier-disp-dispatch",
}
};
-VLIB_NODE_FUNCTION_MULTIARCH (bier_disp_lookup_node, bier_disp_lookup)
diff --git a/src/vnet/bier/bier_imp_node.c b/src/vnet/bier/bier_imp_node.c
index dcfcc1a1982..5e3b3fb065f 100644
--- a/src/vnet/bier/bier_imp_node.c
+++ b/src/vnet/bier/bier_imp_node.c
@@ -185,8 +185,7 @@ format_bier_imp_trace (u8 * s, va_list * args)
return (s);
}
-static uword
-bier_imp_ip4 (vlib_main_t * vm,
+VLIB_NODE_FN (bier_imp_ip4_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
@@ -196,7 +195,6 @@ bier_imp_ip4 (vlib_main_t * vm,
}
VLIB_REGISTER_NODE (bier_imp_ip4_node) = {
- .function = bier_imp_ip4,
.name = "bier-imp-ip4",
.vector_size = sizeof (u32),
@@ -206,10 +204,8 @@ VLIB_REGISTER_NODE (bier_imp_ip4_node) = {
[0] = "bier-drop",
}
};
-VLIB_NODE_FUNCTION_MULTIARCH (bier_imp_ip4_node, bier_imp_ip4)
-static uword
-bier_imp_ip6 (vlib_main_t * vm,
+VLIB_NODE_FN (bier_imp_ip6_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
@@ -219,7 +215,6 @@ bier_imp_ip6 (vlib_main_t * vm,
}
VLIB_REGISTER_NODE (bier_imp_ip6_node) = {
- .function = bier_imp_ip6,
.name = "bier-imp-ip6",
.vector_size = sizeof (u32),
@@ -229,4 +224,3 @@ VLIB_REGISTER_NODE (bier_imp_ip6_node) = {
[0] = "error-drop",
}
};
-VLIB_NODE_FUNCTION_MULTIARCH (bier_imp_ip6_node, bier_imp_ip6)