kernel: bump 6.1 to 6.1.42

[openwrt/staging/hauke.git] / target / linux / generic / backport-6.1 / 729-22-v6.3-net-ethernet-mtk_wed-add-reset-reset_complete-callba.patch

diff --git a/target/linux/generic/backport-6.1/729-22-v6.3-net-ethernet-mtk_wed-add-reset-reset_complete-callba.patch b/target/linux/generic/backport-6.1/729-22-v6.3-net-ethernet-mtk_wed-add-reset-reset_complete-callba.patch
index 2f816af7e22152b8bf60c7b2d0b2e0d6a8085c0f..b8b3a1a181cf55abdd8ecc0a709a6a7fdd95c1ec 100644 (file)
--- a/target/linux/generic/backport-6.1/729-22-v6.3-net-ethernet-mtk_wed-add-reset-reset_complete-callba.patch
+++ b/target/linux/generic/backport-6.1/729-22-v6.3-net-ethernet-mtk_wed-add-reset-reset_complete-callba.patch
@@ -14,7 +14,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -3703,6 +3703,11 @@ static void mtk_pending_work(struct work
+@@ -3686,6 +3686,11 @@ static void mtk_pending_work(struct work
        set_bit(MTK_RESETTING, &eth->state);
  
        mtk_prepare_for_reset(eth);
@@ -26,7 +26,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  
        /* stop all devices to make sure that dma is properly shut down */
        for (i = 0; i < MTK_MAC_COUNT; i++) {
-@@ -3740,6 +3745,8 @@ static void mtk_pending_work(struct work
+@@ -3723,6 +3728,8 @@ static void mtk_pending_work(struct work
  
        clear_bit(MTK_RESETTING, &eth->state);