From 22f23ae802f6dc654dbef27340c67773eb8be8c3 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Thu, 24 Jan 2019 15:36:57 +0100 Subject: [PATCH] buffers: fix vector types Change-Id: I9df96264e30806ac3daf7121f314f34f06232413 Signed-off-by: Damjan Marion --- src/vlib/buffer.h | 4 ++-- src/vlib/buffer_funcs.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/vlib/buffer.h b/src/vlib/buffer.h index 095c09d10f6..f7fdf208a83 100644 --- a/src/vlib/buffer.h +++ b/src/vlib/buffer.h @@ -178,10 +178,10 @@ typedef union u8x16 as_u8x16[4]; #endif #ifdef CLIB_HAVE_VEC256 - u8x16 as_u8x32[2]; + u8x32 as_u8x32[2]; #endif #ifdef CLIB_HAVE_VEC512 - u8x16 as_u8x64[1]; + u8x64 as_u8x64[1]; #endif } vlib_buffer_t; diff --git a/src/vlib/buffer_funcs.h b/src/vlib/buffer_funcs.h index c2241476094..1c1cd28e95f 100644 --- a/src/vlib/buffer_funcs.h +++ b/src/vlib/buffer_funcs.h @@ -74,7 +74,9 @@ STATIC_ASSERT_OFFSET_OF (vlib_buffer_t, template_end, 64); static_always_inline void vlib_buffer_copy_template (vlib_buffer_t * b, vlib_buffer_t * bt) { -#if defined CLIB_HAVE_VEC256 +#if defined CLIB_HAVE_VEC512 + b->as_u8x64[0] = bt->as_u8x64[0]; +#elif defined (CLIB_HAVE_VEC256) b->as_u8x32[0] = bt->as_u8x32[0]; b->as_u8x32[1] = bt->as_u8x32[1]; #elif defined (CLIB_HAVE_VEC128) -- 2.16.6