kernel: bump 5.15 to 5.15.49

[openwrt/staging/jow.git] / target / linux / generic / backport-5.15 / 702-v5.19-22-net-ethernet-mtk_eth_soc-rely-on-txd_size-in-txd_to_.patch

diff --git a/target/linux/generic/backport-5.15/702-v5.19-22-net-ethernet-mtk_eth_soc-rely-on-txd_size-in-txd_to_.patch b/target/linux/generic/backport-5.15/702-v5.19-22-net-ethernet-mtk_eth_soc-rely-on-txd_size-in-txd_to_.patch
index 8c97327bd01166ab9aa2c66b3e81168b43735c26..2989d190d828caf6d33a358035f9a1f1ae0d72a1 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-22-net-ethernet-mtk_eth_soc-rely-on-txd_size-in-txd_to_.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-22-net-ethernet-mtk_eth_soc-rely-on-txd_size-in-txd_to_.patch
@@ -11,7 +11,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -894,9 +894,10 @@ static struct mtk_tx_dma *qdma_to_pdma(s
+@@ -905,9 +905,10 @@ static struct mtk_tx_dma *qdma_to_pdma(s
        return ring->dma_pdma - ring->dma + dma;
  }
  
@@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
  
  static void mtk_tx_unmap(struct mtk_eth *eth, struct mtk_tx_buf *tx_buf,
-@@ -1112,8 +1113,10 @@ static int mtk_tx_map(struct sk_buff *sk
+@@ -1123,8 +1124,10 @@ static int mtk_tx_map(struct sk_buff *sk
                    !netdev_xmit_more())
                        mtk_w32(eth, txd->txd2, MTK_QTX_CTX_PTR);
        } else {