Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
quic: Check quicly version tag at compile time
[vpp.git]
/
src
/
vnet
/
dpo
/
interface_rx_dpo.c
diff --git
a/src/vnet/dpo/interface_rx_dpo.c
b/src/vnet/dpo/interface_rx_dpo.c
index
82767e7
..
d3615d0
100644
(file)
--- a/
src/vnet/dpo/interface_rx_dpo.c
+++ b/
src/vnet/dpo/interface_rx_dpo.c
@@
-17,6
+17,9
@@
#include <vnet/fib/fib_node.h>
#include <vnet/l2/l2_input.h>
#include <vnet/fib/fib_node.h>
#include <vnet/l2/l2_input.h>
+#ifndef CLIB_MARCH_VARIANT
+interface_rx_dpo_t *interface_rx_dpo_pool;
+
/*
* The 'DB' of interface DPOs.
* There is only one per-interface per-protocol, so this is a per-interface
/*
* The 'DB' of interface DPOs.
* There is only one per-interface per-protocol, so this is a per-interface
@@
-107,6
+110,7
@@
interface_rx_dpo_add_or_lock (dpo_proto_t proto,
dpo_set(dpo, DPO_INTERFACE_RX, proto, interface_rx_dpo_get_index(ido));
}
dpo_set(dpo, DPO_INTERFACE_RX, proto, interface_rx_dpo_get_index(ido));
}
+#endif /* CLIB_MARCH_VARIANT */
static clib_error_t *
static clib_error_t *
@@
-147,7
+151,8
@@
interface_rx_dpo_interface_delete (vnet_main_t * vnm,
VNET_SW_INTERFACE_ADD_DEL_FUNCTION(
interface_rx_dpo_interface_delete);
VNET_SW_INTERFACE_ADD_DEL_FUNCTION(
interface_rx_dpo_interface_delete);
-u8*
+#ifndef CLIB_MARCH_VARIANT
+static u8*
format_interface_rx_dpo (u8* s, va_list *ap)
{
index_t index = va_arg(*ap, index_t);
format_interface_rx_dpo (u8* s, va_list *ap)
{
index_t index = va_arg(*ap, index_t);
@@
-217,6
+222,7
@@
interface_rx_dpo_module_init (void)
&interface_rx_dpo_vft,
interface_rx_dpo_nodes);
}
&interface_rx_dpo_vft,
interface_rx_dpo_nodes);
}
+#endif /* CLIB_MARCH_VARIANT */
/**
* @brief Interface DPO trace data
/**
* @brief Interface DPO trace data
@@
-375,24
+381,21
@@
format_interface_rx_dpo_trace (u8 * s, va_list * args)
return s;
}
return s;
}
-static uword
-interface_rx_dpo_ip4 (vlib_main_t * vm,
+VLIB_NODE_FN (interface_rx_dpo_ip4_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
return (interface_rx_dpo_inline(vm, node, from_frame, 0));
}
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
return (interface_rx_dpo_inline(vm, node, from_frame, 0));
}
-static uword
-interface_rx_dpo_ip6 (vlib_main_t * vm,
+VLIB_NODE_FN (interface_rx_dpo_ip6_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
return (interface_rx_dpo_inline(vm, node, from_frame, 0));
}
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
return (interface_rx_dpo_inline(vm, node, from_frame, 0));
}
-static uword
-interface_rx_dpo_l2 (vlib_main_t * vm,
+VLIB_NODE_FN (interface_rx_dpo_l2_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
@@
-400,7
+403,6
@@
interface_rx_dpo_l2 (vlib_main_t * vm,
}
VLIB_REGISTER_NODE (interface_rx_dpo_ip4_node) = {
}
VLIB_REGISTER_NODE (interface_rx_dpo_ip4_node) = {
- .function = interface_rx_dpo_ip4,
.name = "interface-rx-dpo-ip4",
.vector_size = sizeof (u32),
.format_trace = format_interface_rx_dpo_trace,
.name = "interface-rx-dpo-ip4",
.vector_size = sizeof (u32),
.format_trace = format_interface_rx_dpo_trace,
@@
-412,11
+414,8
@@
VLIB_REGISTER_NODE (interface_rx_dpo_ip4_node) = {
},
};
},
};
-VLIB_NODE_FUNCTION_MULTIARCH (interface_rx_dpo_ip4_node,
- interface_rx_dpo_ip4)
VLIB_REGISTER_NODE (interface_rx_dpo_ip6_node) = {
VLIB_REGISTER_NODE (interface_rx_dpo_ip6_node) = {
- .function = interface_rx_dpo_ip6,
.name = "interface-rx-dpo-ip6",
.vector_size = sizeof (u32),
.format_trace = format_interface_rx_dpo_trace,
.name = "interface-rx-dpo-ip6",
.vector_size = sizeof (u32),
.format_trace = format_interface_rx_dpo_trace,
@@
-428,11
+427,8
@@
VLIB_REGISTER_NODE (interface_rx_dpo_ip6_node) = {
},
};
},
};
-VLIB_NODE_FUNCTION_MULTIARCH (interface_rx_dpo_ip6_node,
- interface_rx_dpo_ip6)
VLIB_REGISTER_NODE (interface_rx_dpo_l2_node) = {
VLIB_REGISTER_NODE (interface_rx_dpo_l2_node) = {
- .function = interface_rx_dpo_l2,
.name = "interface-rx-dpo-l2",
.vector_size = sizeof (u32),
.format_trace = format_interface_rx_dpo_trace,
.name = "interface-rx-dpo-l2",
.vector_size = sizeof (u32),
.format_trace = format_interface_rx_dpo_trace,
@@
-444,5
+440,3
@@
VLIB_REGISTER_NODE (interface_rx_dpo_l2_node) = {
},
};
},
};
-VLIB_NODE_FUNCTION_MULTIARCH (interface_rx_dpo_l2_node,
- interface_rx_dpo_l2)