diff options
| author |   Alberto Compagno <acompagn+fdio@cisco.com> | 2019-08-14 13:31:56 +0200 |
|---|---|---|
| committer | Alberto Compagno <acompagn+fdio@cisco.com> | 2019-08-22 10:51:56 +0200 |
| commit | 3abde45db1b56c5876029964d10c889e0f1ddfbb (patch) | |
| tree | 701da4ff41c68d95425d734b6b59d6f3d769f295 /hicn-plugin/src | |
| parent | 1d896a7f11998346b7ceb0385b1c94ecb5c90c2e (diff) | |
[HICN-263] DO_NOT_MERGEv19.08
Updating hicn-plugin and libtransport to vpp_1908
Change-Id: I8bdad9725ec50597d79b3dc9a8d151ca149c3808
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>
Diffstat (limited to 'hicn-plugin/src')
| -rw-r--r-- | hicn-plugin/src/data_fwd.h | 4 | ||||
| -rw-r--r-- | hicn-plugin/src/strategy.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hicn-plugin/src/data_fwd.h b/hicn-plugin/src/data_fwd.h index c001e5af5..55434a024 100644 --- a/hicn-plugin/src/data_fwd.h +++ b/hicn-plugin/src/data_fwd.h @@ -83,7 +83,7 @@ vlib_buffer_clone_256_2 (vlib_main_t * vm, u32 src_buffer, u32 * buffers, vlib_buffer_t *d = vlib_get_buffer (vm, buffers[i]); d->current_data = s->current_data; d->current_length = head_end_offset; - d->trace_index = s->trace_index; + d->trace_handle = s->trace_handle; d->total_length_not_including_first_buffer = s->current_length - head_end_offset; @@ -94,7 +94,7 @@ vlib_buffer_clone_256_2 (vlib_main_t * vm, u32 src_buffer, u32 * buffers, } d->flags = s->flags | VLIB_BUFFER_NEXT_PRESENT; d->flags &= ~VLIB_BUFFER_EXT_HDR_VALID; - d->trace_index = s->trace_index; + d->trace_handle = s->trace_handle; clib_memcpy_fast (d->opaque, s->opaque, sizeof (s->opaque)); clib_memcpy_fast (d->opaque2, s->opaque2, sizeof (s->opaque2)); clib_memcpy_fast (vlib_buffer_get_current (d), diff --git a/hicn-plugin/src/strategy.c b/hicn-plugin/src/strategy.c index 747e155b1..a6c058e4f 100644 --- a/hicn-plugin/src/strategy.c +++ b/hicn-plugin/src/strategy.c @@ -186,7 +186,7 @@ hicn_forward_interest_fn (vlib_main_t * vm, vlib_buffer_t *b1; b1 = vlib_get_buffer (vm, from[1]); CLIB_PREFETCH (b1, CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (&b1->trace_index, 2 * CLIB_CACHE_LINE_BYTES, + CLIB_PREFETCH (&b1->trace_handle, 2 * CLIB_CACHE_LINE_BYTES, STORE); } /* Dequeue a packet buffer */ |