Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove dummy_interface_tx output node from PPPoE plugin
[vpp.git]
/
src
/
plugins
/
pppoe
/
pppoe_decap.c
diff --git
a/src/plugins/pppoe/pppoe_decap.c
b/src/plugins/pppoe/pppoe_decap.c
index
02c8271
..
256dd83
100644
(file)
--- a/
src/plugins/pppoe/pppoe_decap.c
+++ b/
src/plugins/pppoe/pppoe_decap.c
@@
-46,8
+46,7
@@
static u8 * format_pppoe_rx_trace (u8 * s, va_list * args)
return s;
}
return s;
}
-static uword
-pppoe_input (vlib_main_t * vm,
+VLIB_NODE_FN (pppoe_input_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)
{
@@
-153,7
+152,7
@@
pppoe_input (vlib_main_t * vm,
t0 = pool_elt_at_index (pem->sessions,
result0.fields.session_index);
t0 = pool_elt_at_index (pem->sessions,
result0.fields.session_index);
- /* Pop Eth and PPP
P
oE header */
+ /* Pop Eth and PPPoE header */
vlib_buffer_advance(b0, sizeof(*h0)+sizeof(*pppoe0));
next0 = (ppp_proto0==PPP_PROTOCOL_ip4)?
vlib_buffer_advance(b0, sizeof(*h0)+sizeof(*pppoe0));
next0 = (ppp_proto0==PPP_PROTOCOL_ip4)?
@@
-223,7
+222,7
@@
pppoe_input (vlib_main_t * vm,
t1 = pool_elt_at_index (pem->sessions,
result1.fields.session_index);
t1 = pool_elt_at_index (pem->sessions,
result1.fields.session_index);
- /* Pop Eth and PPP
P
oE header */
+ /* Pop Eth and PPPoE header */
vlib_buffer_advance(b1, sizeof(*h1)+sizeof(*pppoe1));
next1 = (ppp_proto1==PPP_PROTOCOL_ip4)?
vlib_buffer_advance(b1, sizeof(*h1)+sizeof(*pppoe1));
next1 = (ppp_proto1==PPP_PROTOCOL_ip4)?
@@
-325,7
+324,7
@@
pppoe_input (vlib_main_t * vm,
t0 = pool_elt_at_index (pem->sessions,
result0.fields.session_index);
t0 = pool_elt_at_index (pem->sessions,
result0.fields.session_index);
- /* Pop Eth and PPP
P
oE header */
+ /* Pop Eth and PPPoE header */
vlib_buffer_advance(b0, sizeof(*h0)+sizeof(*pppoe0));
next0 = (ppp_proto0==PPP_PROTOCOL_ip4)?
vlib_buffer_advance(b0, sizeof(*h0)+sizeof(*pppoe0));
next0 = (ppp_proto0==PPP_PROTOCOL_ip4)?
@@
-399,7
+398,6
@@
static char * pppoe_error_strings[] = {
};
VLIB_REGISTER_NODE (pppoe_input_node) = {
};
VLIB_REGISTER_NODE (pppoe_input_node) = {
- .function = pppoe_input,
.name = "pppoe-input",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.name = "pppoe-input",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
@@
-417,6
+415,4
@@
VLIB_REGISTER_NODE (pppoe_input_node) = {
.format_trace = format_pppoe_rx_trace,
};
.format_trace = format_pppoe_rx_trace,
};
-VLIB_NODE_FUNCTION_MULTIARCH (pppoe_input_node, pppoe_input)
-