From e3371afc8a90177eef331cf609ddd89c9413aeb5 Mon Sep 17 00:00:00 2001 From: Juraj Sloboda Date: Fri, 2 Dec 2016 14:37:16 +0100 Subject: Fix vpp crash when generating jumbo packets Change-Id: Ie1832f2b5df9f9f7ba2f0f406116e11014d3ac21 Signed-off-by: Juraj Sloboda --- vnet/vnet/pg/input.c | 2 -- vnet/vnet/pg/stream.c | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'vnet') diff --git a/vnet/vnet/pg/input.c b/vnet/vnet/pg/input.c index 77b56f52..e15faeb8 100644 --- a/vnet/vnet/pg/input.c +++ b/vnet/vnet/pg/input.c @@ -1248,8 +1248,6 @@ pg_stream_fill_helper (pg_main_t * pg, /* set_data */ DPDK == 1 || (s->flags & PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE) != 0); - /* $$$ this doesn't work at the moment */ - ASSERT (next_buffers == 0); if (next_buffers) pg_set_next_buffer_pointers (pg, s, buffers, next_buffers, n_alloc); diff --git a/vnet/vnet/pg/stream.c b/vnet/vnet/pg/stream.c index d0cbab0b..1ed7189f 100644 --- a/vnet/vnet/pg/stream.c +++ b/vnet/vnet/pg/stream.c @@ -422,6 +422,10 @@ pg_stream_add (pg_main_t * pg, pg_stream_t * s_init) pg_buffer_index_t *bi; int n; +#if DPDK > 0 + s->buffer_bytes = VLIB_BUFFER_DATA_SIZE; +#endif + if (!s->buffer_bytes) s->buffer_bytes = s->max_packet_bytes; -- cgit 1.2.3-korg