kernel: bump 5.15 to 5.15.115

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 604-v5.19-net-page_pool-introduce-ethtool-stats.patch

diff --git a/target/linux/generic/backport-5.15/604-v5.19-net-page_pool-introduce-ethtool-stats.patch b/target/linux/generic/backport-5.15/604-v5.19-net-page_pool-introduce-ethtool-stats.patch
index fa3f1c8fb83d206b28716cd9d5ae81dc8a547db7..3ff136b084265a6ee877768beb885165cee25552 100644 (file)
--- a/target/linux/generic/backport-5.15/604-v5.19-net-page_pool-introduce-ethtool-stats.patch
+++ b/target/linux/generic/backport-5.15/604-v5.19-net-page_pool-introduce-ethtool-stats.patch
@@ -15,8 +15,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  net/core/page_pool.c    | 63 ++++++++++++++++++++++++++++++++++++++++-
  2 files changed, 83 insertions(+), 1 deletion(-)
 
-diff --git a/include/net/page_pool.h b/include/net/page_pool.h
-index ea5fb70e5101..813c93499f20 100644
 --- a/include/net/page_pool.h
 +++ b/include/net/page_pool.h
 @@ -115,6 +115,10 @@ struct page_pool_stats {
@@ -64,7 +62,7 @@ index ea5fb70e5101..813c93499f20 100644
  
  #include <trace/events/page_pool.h>
  
-@@ -42,6 +43,20 @@
+@@ -65,6 +66,20 @@ static void page_pool_producer_unlock(st
                this_cpu_add(s->__stat, val);                                           \
        } while (0)
  
@@ -85,7 +83,7 @@ index ea5fb70e5101..813c93499f20 100644
  bool page_pool_get_stats(struct page_pool *pool,
                         struct page_pool_stats *stats)
  {
-@@ -50,7 +65,13 @@ bool page_pool_get_stats(struct page_poo
+@@ -73,7 +88,13 @@ bool page_pool_get_stats(struct page_poo
        if (!stats)
                return false;
  
@@ -100,7 +98,7 @@ index ea5fb70e5101..813c93499f20 100644
  
        for_each_possible_cpu(cpu) {
                const struct page_pool_recycle_stats *pcpu =
-@@ -66,6 +87,46 @@ bool page_pool_get_stats(struct page_poo
+@@ -89,6 +110,46 @@ bool page_pool_get_stats(struct page_poo
        return true;
  }
  EXPORT_SYMBOL(page_pool_get_stats);