From 87bd96aa4ddf2f777f8b972062c205e27addbc4a Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Mon, 13 Nov 2017 17:44:51 -0800 Subject: [PATCH] vppinfra: fix pool_get_aligned_will_expand for fixed pools Change-Id: Ia66ac0a2fa23a3d29370b54e2014900838a8d3ac Signed-off-by: Florin Coras --- src/vppinfra/pool.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vppinfra/pool.h b/src/vppinfra/pool.h index 62d5b54ec07..14c6a75c13b 100644 --- a/src/vppinfra/pool.h +++ b/src/vppinfra/pool.h @@ -233,9 +233,10 @@ do { \ _pool_var (l) = 0; \ if (P) \ { \ - if (_pool_var (p)->max_elts) \ - return 0; \ - _pool_var (l) = vec_len (_pool_var (p)->free_indices); \ + if (_pool_var (p)->max_elts) \ + _pool_var (l) = _pool_var (p)->max_elts; \ + else \ + _pool_var (l) = vec_len (_pool_var (p)->free_indices); \ } \ \ /* Free elements, certainly won't expand */ \ -- 2.16.6