generic: 6.1: refresh backport patches

[openwrt/staging/hauke.git] / target / linux / generic / backport-6.1 / 610-v6.3-net-page_pool-use-in_softirq-instead.patch

diff --git a/target/linux/generic/backport-6.1/610-v6.3-net-page_pool-use-in_softirq-instead.patch b/target/linux/generic/backport-6.1/610-v6.3-net-page_pool-use-in_softirq-instead.patch
index 71e11405958abf634dfb43003e91c9cefdfe93e3..84ea86044cd113505c90db31f1f36a2f50445c22 100644 (file)
--- a/target/linux/generic/backport-6.1/610-v6.3-net-page_pool-use-in_softirq-instead.patch
+++ b/target/linux/generic/backport-6.1/610-v6.3-net-page_pool-use-in_softirq-instead.patch
@@ -14,7 +14,7 @@ Signed-off-by: Qingfang DENG <qingfang.deng@siflower.com.cn>
 
 --- a/include/net/page_pool.h
 +++ b/include/net/page_pool.h
-@@ -357,7 +357,7 @@ static inline void page_pool_nid_changed
+@@ -386,7 +386,7 @@ static inline void page_pool_nid_changed
  static inline void page_pool_ring_lock(struct page_pool *pool)
        __acquires(&pool->ring.producer_lock)
  {
@@ -23,7 +23,7 @@ Signed-off-by: Qingfang DENG <qingfang.deng@siflower.com.cn>
                spin_lock(&pool->ring.producer_lock);
        else
                spin_lock_bh(&pool->ring.producer_lock);
-@@ -366,7 +366,7 @@ static inline void page_pool_ring_lock(s
+@@ -395,7 +395,7 @@ static inline void page_pool_ring_lock(s
  static inline void page_pool_ring_unlock(struct page_pool *pool)
        __releases(&pool->ring.producer_lock)
  {
@@ -34,7 +34,7 @@ Signed-off-by: Qingfang DENG <qingfang.deng@siflower.com.cn>
                spin_unlock_bh(&pool->ring.producer_lock);
 --- a/net/core/page_pool.c
 +++ b/net/core/page_pool.c
-@@ -512,8 +512,8 @@ static void page_pool_return_page(struct
+@@ -511,8 +511,8 @@ static void page_pool_return_page(struct
  static bool page_pool_recycle_in_ring(struct page_pool *pool, struct page *page)
  {
        int ret;
@@ -45,7 +45,7 @@ Signed-off-by: Qingfang DENG <qingfang.deng@siflower.com.cn>
                ret = ptr_ring_produce(&pool->ring, page);
        else
                ret = ptr_ring_produce_bh(&pool->ring, page);
-@@ -576,7 +576,7 @@ __page_pool_put_page(struct page_pool *p
+@@ -570,7 +570,7 @@ __page_pool_put_page(struct page_pool *p
                        page_pool_dma_sync_for_device(pool, page,
                                                      dma_sync_size);