From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Wed, 03 Jan 2024 09:43:39 +0000 Subject: [PATCH] update kernel to 5.10.198 --- kernel/include/net/xsk_buff_pool.h | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/kernel/include/net/xsk_buff_pool.h b/kernel/include/net/xsk_buff_pool.h index c9a47d3..5a63e3b 100644 --- a/kernel/include/net/xsk_buff_pool.h +++ b/kernel/include/net/xsk_buff_pool.h @@ -150,13 +150,8 @@ if (likely(!cross_pg)) return false; - if (pool->dma_pages_cnt) { - return !(pool->dma_pages[addr >> PAGE_SHIFT] & - XSK_NEXT_PG_CONTIG_MASK); - } - - /* skb path */ - return addr + len > pool->addrs_cnt; + return pool->dma_pages_cnt && + !(pool->dma_pages[addr >> PAGE_SHIFT] & XSK_NEXT_PG_CONTIG_MASK); } static inline u64 xp_aligned_extract_addr(struct xsk_buff_pool *pool, u64 addr) -- Gitblit v1.6.2