kernel: bump 5.15 to 5.15.132

[openwrt/staging/jow.git] / target / linux / generic / backport-5.15 / 729-06-v6.1-net-ethernet-mtk_eth_soc-do-not-overwrite-mtu-config.patch

diff --git a/target/linux/generic/backport-5.15/729-06-v6.1-net-ethernet-mtk_eth_soc-do-not-overwrite-mtu-config.patch b/target/linux/generic/backport-5.15/729-06-v6.1-net-ethernet-mtk_eth_soc-do-not-overwrite-mtu-config.patch
index 78f5f1859e4fe552219b69ae640f86ffeaa175dd..9206be370f818c1bd034308c35d3a89182a5de20 100644 (file)
--- a/target/linux/generic/backport-5.15/729-06-v6.1-net-ethernet-mtk_eth_soc-do-not-overwrite-mtu-config.patch
+++ b/target/linux/generic/backport-5.15/729-06-v6.1-net-ethernet-mtk_eth_soc-do-not-overwrite-mtu-config.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
-@@ -3176,6 +3176,30 @@ static void mtk_dim_tx(struct work_struc
+@@ -3179,6 +3179,30 @@ static void mtk_dim_tx(struct work_struc
        dim->state = DIM_START_MEASURE;
  }
  
@@ -45,7 +45,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static int mtk_hw_init(struct mtk_eth *eth)
  {
        u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA |
-@@ -3250,8 +3274,16 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -3253,8 +3277,16 @@ static int mtk_hw_init(struct mtk_eth *e
         * up with the more appropriate value when mtk_mac_config call is being
         * invoked.
         */
@@ -63,7 +63,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        /* Indicates CDM to parse the MTK special tag from CPU
         * which also is working out for untag packets.
-@@ -3350,7 +3382,6 @@ static int mtk_change_mtu(struct net_dev
+@@ -3353,7 +3385,6 @@ static int mtk_change_mtu(struct net_dev
        int length = new_mtu + MTK_RX_ETH_HLEN;
        struct mtk_mac *mac = netdev_priv(dev);
        struct mtk_eth *eth = mac->hw;
@@ -71,7 +71,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        if (rcu_access_pointer(eth->prog) &&
            length > MTK_PP_MAX_BUF_SIZE) {
-@@ -3358,23 +3389,7 @@ static int mtk_change_mtu(struct net_dev
+@@ -3361,23 +3392,7 @@ static int mtk_change_mtu(struct net_dev
                return -EINVAL;
        }