From 497ad9f5b2dc86b733761b9afa44ecfa2f17be65 Mon Sep 17 00:00:00 2001 From: Jesper Dangaard Brouer Date: Thu, 20 Jun 2019 00:15:52 +0200 Subject: [PATCH] page_pool: fix compile warning when CONFIG_PAGE_POOL is disabled Kbuild test robot reported compile warning: warning: no return statement in function returning non-void in function page_pool_request_shutdown, when CONFIG_PAGE_POOL is disabled. The fix makes the code a little more verbose, with a descriptive variable. Fixes: 99c07c43c4ea ("xdp: tracking page_pool resources and safe removal") Signed-off-by: Jesper Dangaard Brouer Reported-by: kbuild test robot Signed-off-by: David S. Miller --- include/net/page_pool.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/net/page_pool.h b/include/net/page_pool.h index f09b3f1994e6..f07c518ef8a5 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -156,12 +156,12 @@ static inline void page_pool_recycle_direct(struct page_pool *pool, bool __page_pool_request_shutdown(struct page_pool *pool); static inline bool page_pool_request_shutdown(struct page_pool *pool) { - /* When page_pool isn't compiled-in, net/core/xdp.c doesn't - * allow registering MEM_TYPE_PAGE_POOL, but shield linker. - */ + bool safe_to_remove = false; + #ifdef CONFIG_PAGE_POOL - return __page_pool_request_shutdown(pool); + safe_to_remove = __page_pool_request_shutdown(pool); #endif + return safe_to_remove; } /* Disconnects a page (from a page_pool). API users can have a need -- 2.25.1