Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tcp: add option to avoid endpoint cleanup
[vpp.git]
/
src
/
vnet
/
bier
/
bier_lookup.c
diff --git
a/src/vnet/bier/bier_lookup.c
b/src/vnet/bier/bier_lookup.c
index
402bcbc
..
9361845
100644
(file)
--- a/
src/vnet/bier/bier_lookup.c
+++ b/
src/vnet/bier/bier_lookup.c
@@
-44,7
+44,7
@@
static char * bier_lookup_error_strings[] = {
};
/*
};
/*
- * Keep these values sematically the same as BIER lookup
+ * Keep these values sema
n
tically the same as BIER lookup
*/
#define foreach_bier_lookup_next \
_(DROP, "bier-drop") \
*/
#define foreach_bier_lookup_next \
_(DROP, "bier-drop") \
@@
-147,10
+147,9
@@
bier_lookup (vlib_main_t * vm,
memcpy(bbs.bbs_buckets, bh0->bh_bit_string, bbs.bbs_len);
/*
memcpy(bbs.bbs_buckets, bh0->bh_bit_string, bbs.bbs_len);
/*
- * reset the fmask
and clone storage vectors
+ * reset the fmask
storage vector
*/
vec_reset_length (blm->blm_fmasks[thread_index]);
*/
vec_reset_length (blm->blm_fmasks[thread_index]);
- vec_reset_length (blm->blm_clones[thread_index]);
/*
* Loop through the buckets in the header
/*
* Loop through the buckets in the header
@@
-225,7
+224,9
@@
bier_lookup (vlib_main_t * vm,
n_clones,
VLIB_BUFFER_CLONE_HEAD_SIZE);
n_clones,
VLIB_BUFFER_CLONE_HEAD_SIZE);
- if (num_cloned != vec_len(blm->blm_fmasks[thread_index]))
+ vec_set_len(blm->blm_clones[thread_index], num_cloned);
+
+ if (num_cloned != n_clones)
{
vlib_node_increment_counter
(vm, node->node_index,
{
vlib_node_increment_counter
(vm, node->node_index,
@@
-250,9
+251,6
@@
bier_lookup (vlib_main_t * vm,
{
bier_lookup_trace_t *tr;
{
bier_lookup_trace_t *tr;
- if (c0 != b0)
- vlib_buffer_copy_trace_flag (vm, b0, ci0);
-
tr = vlib_add_trace (vm, node, c0, sizeof (*tr));
tr->bt_index = bti0;
tr->bfm_index = blm->blm_fmasks[thread_index][clone];
tr = vlib_add_trace (vm, node, c0, sizeof (*tr));
tr->bt_index = bti0;
tr->bfm_index = blm->blm_fmasks[thread_index][clone];