kernel: bump 5.15 to 5.15.115

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 602-v5.18-page_pool-Add-function-to-batch-and-return-stats.patch

diff --git a/target/linux/generic/backport-5.15/602-v5.18-page_pool-Add-function-to-batch-and-return-stats.patch b/target/linux/generic/backport-5.15/602-v5.18-page_pool-Add-function-to-batch-and-return-stats.patch
index 8afbd5d120183f29117d4e1680e86b4e0e18f8b2..e1a7635133cd15587ba81671abf89d262f4209f6 100644 (file)
--- a/target/linux/generic/backport-5.15/602-v5.18-page_pool-Add-function-to-batch-and-return-stats.patch
+++ b/target/linux/generic/backport-5.15/602-v5.18-page_pool-Add-function-to-batch-and-return-stats.patch
@@ -1,16 +1,19 @@
-commit 6b95e3388b1ea0ca63500c5a6e39162dbf828433
-Author: Joe Damato <jdamato@fastly.com>
-Date:   Tue Mar 1 23:55:49 2022 -0800
+From 6b95e3388b1ea0ca63500c5a6e39162dbf828433 Mon Sep 17 00:00:00 2001
+From: Joe Damato <jdamato@fastly.com>
+Date: Tue, 1 Mar 2022 23:55:49 -0800
+Subject: [PATCH 3/3] page_pool: Add function to batch and return stats
 
-    page_pool: Add function to batch and return stats
-    
-    Adds a function page_pool_get_stats which can be used by drivers to obtain
-    stats for a specified page_pool.
-    
-    Signed-off-by: Joe Damato <jdamato@fastly.com>
-    Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
-    Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
-    Signed-off-by: David S. Miller <davem@davemloft.net>
+Adds a function page_pool_get_stats which can be used by drivers to obtain
+stats for a specified page_pool.
+
+Signed-off-by: Joe Damato <jdamato@fastly.com>
+Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
+Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ include/net/page_pool.h | 17 +++++++++++++++++
+ net/core/page_pool.c    | 25 +++++++++++++++++++++++++
+ 2 files changed, 42 insertions(+)
 
 --- a/include/net/page_pool.h
 +++ b/include/net/page_pool.h
@@ -40,7 +43,7 @@ Date:   Tue Mar 1 23:55:49 2022 -0800
  struct page_pool {
 --- a/net/core/page_pool.c
 +++ b/net/core/page_pool.c
-@@ -35,6 +35,31 @@
+@@ -58,6 +58,31 @@ static void page_pool_producer_unlock(st
                struct page_pool_recycle_stats __percpu *s = pool->recycle_stats;       \
                this_cpu_inc(s->__stat);                                                \
        } while (0)