kernel: bump 5.4 to 5.4.52

[openwrt/staging/hauke.git] / target / linux / mvebu / patches-5.4 / 011-net-mvneta-introduce-page-pool-API-for-sw-buffer-man.patch

diff --git a/target/linux/mvebu/patches-5.4/011-net-mvneta-introduce-page-pool-API-for-sw-buffer-man.patch b/target/linux/mvebu/patches-5.4/011-net-mvneta-introduce-page-pool-API-for-sw-buffer-man.patch
index 24c446f578a0e400355d1d11ea0d57cdad1b55cd..dbed6df873557ac5ad8e262e66813fed8fdebdd9 100644 (file)
--- a/target/linux/mvebu/patches-5.4/011-net-mvneta-introduce-page-pool-API-for-sw-buffer-man.patch
+++ b/target/linux/mvebu/patches-5.4/011-net-mvneta-introduce-page-pool-API-for-sw-buffer-man.patch
@@ -43,7 +43,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  /* Registers */
  #define MVNETA_RXQ_CONFIG_REG(q)                (0x1400 + ((q) << 2))
-@@ -605,6 +606,10 @@ struct mvneta_rx_queue {
+@@ -607,6 +608,10 @@ struct mvneta_rx_queue {
        u32 pkts_coal;
        u32 time_coal;
  
@@ -54,7 +54,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        /* Virtual address of the RX buffer */
        void  **buf_virt_addr;
  
-@@ -1823,23 +1828,21 @@ static int mvneta_rx_refill(struct mvnet
+@@ -1825,23 +1830,21 @@ static int mvneta_rx_refill(struct mvnet
                            struct mvneta_rx_queue *rxq,
                            gfp_t gfp_mask)
  {
@@ -86,7 +86,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        return 0;
  }
  
-@@ -1905,10 +1908,12 @@ static void mvneta_rxq_drop_pkts(struct
+@@ -1907,10 +1910,12 @@ static void mvneta_rxq_drop_pkts(struct
                if (!data || !(rx_desc->buf_phys_addr))
                        continue;
  
@@ -102,7 +102,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
  
  static void
-@@ -2045,8 +2050,7 @@ static int mvneta_rx_swbm(struct napi_st
+@@ -2047,8 +2052,7 @@ static int mvneta_rx_swbm(struct napi_st
                                skb_add_rx_frag(rxq->skb, frag_num, page,
                                                frag_offset, frag_size,
                                                PAGE_SIZE);
@@ -112,7 +112,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                                rxq->left_size -= frag_size;
                        }
                } else {
-@@ -2076,9 +2080,7 @@ static int mvneta_rx_swbm(struct napi_st
+@@ -2078,9 +2082,7 @@ static int mvneta_rx_swbm(struct napi_st
                                                frag_offset, frag_size,
                                                PAGE_SIZE);
  
@@ -123,7 +123,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                                rxq->left_size -= frag_size;
                        }
                } /* Middle or Last descriptor */
-@@ -2845,11 +2847,54 @@ static int mvneta_poll(struct napi_struc
+@@ -2847,11 +2849,54 @@ static int mvneta_poll(struct napi_struc
        return rx_done;
  }