Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ipip: Tunnel flags controlling copying data to/from payload/encap
[vpp.git]
/
src
/
vnet
/
l2tp
/
decap.c
diff --git
a/src/vnet/l2tp/decap.c
b/src/vnet/l2tp/decap.c
index
334f1fe
..
787cc11
100644
(file)
--- a/
src/vnet/l2tp/decap.c
+++ b/
src/vnet/l2tp/decap.c
@@
-21,6
+21,7
@@
#include <vnet/ip/ip.h>
#include <vnet/ethernet/ethernet.h>
#include <vnet/l2tp/l2tp.h>
#include <vnet/ip/ip.h>
#include <vnet/ethernet/ethernet.h>
#include <vnet/l2tp/l2tp.h>
+#include <vnet/l2/l2_input.h>
/* Statistics (not really errors) */
#define foreach_l2t_decap_error \
/* Statistics (not really errors) */
#define foreach_l2t_decap_error \
@@
-235,9
+236,9
@@
done:
#include <vnet/pipeline.h>
#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);
}
{
return dispatch_pipeline (vm, node, frame);
}
@@
-250,7
+251,6
@@
l2t_decap_node_fn (vlib_main_t * vm,
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (l2t_decap_node) = {
/* *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,
.name = "l2tp-decap",
.vector_size = sizeof (u32),
.format_trace = format_l2t_trace,
@@
-269,7
+269,8
@@
VLIB_REGISTER_NODE (l2t_decap_node) = {
};
/* *INDENT-ON* */
};
/* *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,
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (l2t_decap_local_node) = {
.function = l2t_decap_node_fn,
@@
-291,12
+292,6
@@
VLIB_REGISTER_NODE (l2t_decap_local_node) = {
};
/* *INDENT-ON* */
};
/* *INDENT-ON* */
-void
-l2tp_decap_init (void)
-{
- ip6_register_protocol (IP_PROTOCOL_L2TP, l2t_decap_local_node.index);
-}
-
/*
* fd.io coding-style-patch-verification: ON
*
/*
* fd.io coding-style-patch-verification: ON
*