Merge tag 'linux-kselftest-kunit-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kerne...

[linux-block.git] / net / core / page_pool.c

diff --git a/net/core/page_pool.c b/net/core/page_pool.c
index 9b203d8660e47006c29cc11479912acd7cda36a5..193c18799865038a76a6863d28604245654fa922 100644 (file)
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c
@@ -511,8 +511,8 @@ static void page_pool_return_page(struct page_pool *pool, struct page *page)
 static bool page_pool_recycle_in_ring(struct page_pool *pool, struct page *page)
 {
        int ret;
-       /* BH protection not needed if current is serving softirq */
-       if (in_serving_softirq())
+       /* BH protection not needed if current is softirq */
+       if (in_softirq())
                ret = ptr_ring_produce(&pool->ring, page);
        else
                ret = ptr_ring_produce_bh(&pool->ring, page);
@@ -570,7 +570,7 @@ __page_pool_put_page(struct page_pool *pool, struct page *page,
                        page_pool_dma_sync_for_device(pool, page,
                                                      dma_sync_size);
 
-               if (allow_direct && in_serving_softirq() &&
+               if (allow_direct && in_softirq() &&
                    page_pool_recycle_in_cache(page, pool))
                        return NULL;