kernel: bump 5.15 to 5.15.103

[openwrt/staging/nbd.git] / target / linux / generic / backport-5.15 / 706-06-v6.0-net-ethernet-mtk_eth_soc-introduce-xdp-multi-frag-su.patch

diff --git a/target/linux/generic/backport-5.15/706-06-v6.0-net-ethernet-mtk_eth_soc-introduce-xdp-multi-frag-su.patch b/target/linux/generic/backport-5.15/706-06-v6.0-net-ethernet-mtk_eth_soc-introduce-xdp-multi-frag-su.patch
index e75861bc829344f1fecd271e489fb1c06a624634..23e4a4dfcbf4122293bc0b5765243304ca9983f2 100644 (file)
--- a/target/linux/generic/backport-5.15/706-06-v6.0-net-ethernet-mtk_eth_soc-introduce-xdp-multi-frag-su.patch
+++ b/target/linux/generic/backport-5.15/706-06-v6.0-net-ethernet-mtk_eth_soc-introduce-xdp-multi-frag-su.patch
@@ -14,7 +14,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
-@@ -987,23 +987,22 @@ static void mtk_tx_unmap(struct mtk_eth
+@@ -988,23 +988,22 @@ static void mtk_tx_unmap(struct mtk_eth
                }
        }
  
@@ -47,7 +47,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        }
        tx_buf->flags = 0;
        tx_buf->data = NULL;
-@@ -1506,6 +1505,8 @@ static int mtk_xdp_frame_map(struct mtk_
+@@ -1507,6 +1506,8 @@ static int mtk_xdp_frame_map(struct mtk_
        mtk_tx_set_dma_desc(dev, txd, txd_info);
  
        tx_buf->flags |= !mac->id ? MTK_TX_FLAGS_FPORT0 : MTK_TX_FLAGS_FPORT1;
@@ -56,7 +56,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        txd_pdma = qdma_to_pdma(ring, txd);
        setup_tx_buf(eth, tx_buf, txd_pdma, txd_info->addr, txd_info->size,
-@@ -1517,43 +1518,69 @@ static int mtk_xdp_frame_map(struct mtk_
+@@ -1518,43 +1519,69 @@ static int mtk_xdp_frame_map(struct mtk_
  static int mtk_xdp_submit_frame(struct mtk_eth *eth, struct xdp_frame *xdpf,
                                struct net_device *dev, bool dma_map)
  {
@@ -140,7 +140,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        if (!MTK_HAS_CAPS(soc->caps, MTK_QDMA)) {
                txd_pdma = qdma_to_pdma(ring, txd);
-@@ -1580,7 +1607,24 @@ static int mtk_xdp_submit_frame(struct m
+@@ -1581,7 +1608,24 @@ static int mtk_xdp_submit_frame(struct m
                mtk_w32(eth, NEXT_DESP_IDX(idx, ring->dma_size),
                        MT7628_TX_CTX_IDX0);
        }
@@ -166,7 +166,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        spin_unlock(&eth->page_lock);
  
        return err;
-@@ -1909,18 +1953,15 @@ static int mtk_poll_tx_qdma(struct mtk_e
+@@ -1910,18 +1954,15 @@ static int mtk_poll_tx_qdma(struct mtk_e
                if (!tx_buf->data)
                        break;
  
@@ -191,7 +191,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                mtk_tx_unmap(eth, tx_buf, true);
  
                ring->last_free = desc;
-@@ -1951,17 +1992,15 @@ static int mtk_poll_tx_pdma(struct mtk_e
+@@ -1952,17 +1993,15 @@ static int mtk_poll_tx_pdma(struct mtk_e
                if (!tx_buf->data)
                        break;