Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ipsec: fix esn handling
[vpp.git]
/
src
/
vnet
/
bier
/
bier_disp_dispatch_node.c
diff --git
a/src/vnet/bier/bier_disp_dispatch_node.c
b/src/vnet/bier/bier_disp_dispatch_node.c
index
a00c2ee
..
a506f1d
100644
(file)
--- a/
src/vnet/bier/bier_disp_dispatch_node.c
+++ b/
src/vnet/bier/bier_disp_dispatch_node.c
@@
-72,6
+72,7
@@
bier_disp_dispatch_inline (vlib_main_t * vm,
bdei0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
hdr0 = vlib_buffer_get_current(b0);
bde0 = bier_disp_entry_get(bdei0);
bdei0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
hdr0 = vlib_buffer_get_current(b0);
bde0 = bier_disp_entry_get(bdei0);
+ vnet_buffer(b0)->ip.adj_index[VLIB_RX] = BIER_RX_ITF;
/*
* header is in network order - flip it, we are about to
/*
* header is in network order - flip it, we are about to
@@
-86,7
+87,7
@@
bier_disp_dispatch_inline (vlib_main_t * vm,
* the packets flow-hash field
* DSCP mumble mumble...
*/
* the packets flow-hash field
* DSCP mumble mumble...
*/
- vlib_buffer_advance(b0, (vnet_buffer(b0)->bier.n_bytes +
+ vlib_buffer_advance(b0, (vnet_buffer(b0)->
mpls.
bier.n_bytes +
sizeof(*hdr0)));
vnet_buffer(b0)->ip.flow_hash = entropy0;
sizeof(*hdr0)));
vnet_buffer(b0)->ip.flow_hash = entropy0;
@@
-128,8
+129,7
@@
format_bier_disp_dispatch_trace (u8 * s, va_list * args)
return (s);
}
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)
{
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
@@
-137,7
+137,6
@@
bier_disp_dispatch (vlib_main_t * vm,
}
VLIB_REGISTER_NODE (bier_disp_dispatch_node) = {
}
VLIB_REGISTER_NODE (bier_disp_dispatch_node) = {
- .function = bier_disp_dispatch,
.name = "bier-disp-dispatch",
.vector_size = sizeof (u32),
.name = "bier-disp-dispatch",
.vector_size = sizeof (u32),
@@
-147,4
+146,3
@@
VLIB_REGISTER_NODE (bier_disp_dispatch_node) = {
[0] = "bier-drop",
}
};
[0] = "bier-drop",
}
};
-VLIB_NODE_FUNCTION_MULTIARCH (bier_disp_dispatch_node, bier_disp_dispatch)