From d50e3477635e6cc2592cbf30d4fdcee842053624 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Sun, 20 Jan 2019 00:03:56 +0100 Subject: buffers: keep buffer_main in vlib_main_t Change-Id: I3bb1d9f83dd08f4b93acd4a281bfec0674e39c2e Signed-off-by: Damjan Marion --- src/plugins/dpdk/buffer.c | 4 ++-- src/plugins/memif/memif.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c index 768d66153e5..37966ba9759 100644 --- a/src/plugins/dpdk/buffer.c +++ b/src/plugins/dpdk/buffer.c @@ -286,9 +286,9 @@ static_always_inline void vlib_buffer_free_inline (vlib_main_t * vm, u32 * buffers, u32 n_buffers, u32 follow_buffer_next) { - vlib_buffer_main_t *bm = &buffer_main; + vlib_buffer_main_t *bm = vm->buffer_main; vlib_buffer_t *bufp[n_buffers], **b = bufp; - u32 thread_index = vlib_get_thread_index (); + u32 thread_index = vm->thread_index; int i = 0; u32 simple_mask = VLIB_BUFFER_NEXT_PRESENT; u32 n_left, *bi; diff --git a/src/plugins/memif/memif.c b/src/plugins/memif/memif.c index 3171ba22f7d..6e45b573f2c 100644 --- a/src/plugins/memif/memif.c +++ b/src/plugins/memif/memif.c @@ -338,7 +338,7 @@ memif_init_regions_and_queues (memif_if_t * mif) { vlib_buffer_pool_t *bp; /* *INDENT-OFF* */ - vec_foreach (bp, buffer_main.buffer_pools) + vec_foreach (bp, vm->buffer_main->buffer_pools) { vlib_physmem_map_t *pm; pm = vlib_physmem_get_map (vm, bp->physmem_map_index); -- cgit 1.2.3-korg