Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixes for 'make UNATTENDED=yes CC=clang CXX=clang verify'
[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
a624f51
..
4a6832a
100644
(file)
--- a/
src/vnet/dpo/interface_rx_dpo.c
+++ b/
src/vnet/dpo/interface_rx_dpo.c
@@
-154,7
+154,7
@@
format_interface_rx_dpo (u8* s, va_list *ap)
vnet_main_t * vnm = vnet_get_main();
interface_rx_dpo_t *ido = interface_rx_dpo_get(index);
vnet_main_t * vnm = vnet_get_main();
interface_rx_dpo_t *ido = interface_rx_dpo_get(index);
- return (format(s, "%U-dpo: %U",
+ return (format(s, "%U-
rx-
dpo: %U",
format_vnet_sw_interface_name,
vnm,
vnet_get_sw_interface(vnm, ido->ido_sw_if_index),
format_vnet_sw_interface_name,
vnm,
vnet_get_sw_interface(vnm, ido->ido_sw_if_index),
@@
-244,7
+244,7
@@
interface_rx_dpo_inline (vlib_main_t * vm,
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
- next_index =
node->cached_next_index
;
+ next_index =
INTERFACE_RX_DPO_INPUT
;
while (n_left_from > 0)
{
while (n_left_from > 0)
{
@@
-305,11
+305,6
@@
interface_rx_dpo_inline (vlib_main_t * vm,
tr1 = vlib_add_trace (vm, node, b1, sizeof (*tr1));
tr1->sw_if_index = ido1->ido_sw_if_index;
}
tr1 = vlib_add_trace (vm, node, b1, sizeof (*tr1));
tr1->sw_if_index = ido1->ido_sw_if_index;
}
-
- vlib_validate_buffer_enqueue_x2(vm, node, next_index, to_next,
- n_left_to_next, bi0, bi1,
- INTERFACE_RX_DPO_INPUT,
- INTERFACE_RX_DPO_INPUT);
}
while (n_left_from > 0 && n_left_to_next > 0)
}
while (n_left_from > 0 && n_left_to_next > 0)
@@
-349,10
+344,6
@@
interface_rx_dpo_inline (vlib_main_t * vm,
tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
tr->sw_if_index = ido0->ido_sw_if_index;
}
tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
tr->sw_if_index = ido0->ido_sw_if_index;
}
-
- vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next,
- n_left_to_next, bi0,
- INTERFACE_RX_DPO_INPUT);
}
vlib_put_next_frame (vm, node, next_index, n_left_to_next);
}
}
vlib_put_next_frame (vm, node, next_index, n_left_to_next);
}
@@
-365,7
+356,7
@@
format_interface_rx_dpo_trace (u8 * s, va_list * args)
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
interface_rx_dpo_trace_t * t = va_arg (*args, interface_rx_dpo_trace_t *);
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
interface_rx_dpo_trace_t * t = va_arg (*args, interface_rx_dpo_trace_t *);
- u
word
indent = format_get_indent (s);
+ u
32
indent = format_get_indent (s);
s = format (s, "%U sw_if_index:%d",
format_white_space, indent,
t->sw_if_index);
s = format (s, "%U sw_if_index:%d",
format_white_space, indent,
t->sw_if_index);