kernel: backport list_count_nodes()

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 606-v5.18-xdp-add-frags-support-to-xdp_return_-buff-frame.patch

diff --git a/target/linux/generic/backport-5.15/606-v5.18-xdp-add-frags-support-to-xdp_return_-buff-frame.patch b/target/linux/generic/backport-5.15/606-v5.18-xdp-add-frags-support-to-xdp_return_-buff-frame.patch
index a852c4d5b0fe36668730f2ed1eeaf49b19de4892..e126b21417f192db2f26a5998761703d3a6951bd 100644 (file)
--- a/target/linux/generic/backport-5.15/606-v5.18-xdp-add-frags-support-to-xdp_return_-buff-frame.patch
+++ b/target/linux/generic/backport-5.15/606-v5.18-xdp-add-frags-support-to-xdp_return_-buff-frame.patch
@@ -17,8 +17,6 @@ Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  net/core/xdp.c    | 54 ++++++++++++++++++++++++++++++++++++++++++++++-
  2 files changed, 69 insertions(+), 3 deletions(-)
 
-diff --git a/include/net/xdp.h b/include/net/xdp.h
-index 1f8641ec658e..8463dea8b4db 100644
 --- a/include/net/xdp.h
 +++ b/include/net/xdp.h
 @@ -275,10 +275,24 @@ void __xdp_release_frame(void *data, str
@@ -50,7 +48,7 @@ index 1f8641ec658e..8463dea8b4db 100644
  int xdp_rxq_info_reg(struct xdp_rxq_info *xdp_rxq,
 --- a/net/core/xdp.c
 +++ b/net/core/xdp.c
-@@ -376,12 +376,38 @@ static void __xdp_return(void *data, str
+@@ -409,12 +409,38 @@ static void __xdp_return(void *data, str
  
  void xdp_return_frame(struct xdp_frame *xdpf)
  {
@@ -89,7 +87,7 @@ index 1f8641ec658e..8463dea8b4db 100644
        __xdp_return(xdpf->data, &xdpf->mem, true, NULL);
  }
  EXPORT_SYMBOL_GPL(xdp_return_frame_rx_napi);
-@@ -417,7 +443,7 @@ void xdp_return_frame_bulk(struct xdp_fr
+@@ -450,7 +476,7 @@ void xdp_return_frame_bulk(struct xdp_fr
        struct xdp_mem_allocator *xa;
  
        if (mem->type != MEM_TYPE_PAGE_POOL) {
@@ -98,7 +96,7 @@ index 1f8641ec658e..8463dea8b4db 100644
                return;
        }
  
-@@ -436,12 +462,38 @@ void xdp_return_frame_bulk(struct xdp_fr
+@@ -469,12 +495,38 @@ void xdp_return_frame_bulk(struct xdp_fr
                bq->xa = rhashtable_lookup(mem_id_ht, &mem->id, mem_id_rht_params);
        }