kernel: bump 6.1 to 6.1.40

[openwrt/staging/hauke.git] / target / linux / generic / backport-6.1 / 777-v6.2-05-net-dsa-qca8k-improve-mdio-master-read-write-by-usin.patch

diff --git a/target/linux/generic/backport-6.1/777-v6.2-05-net-dsa-qca8k-improve-mdio-master-read-write-by-usin.patch b/target/linux/generic/backport-6.1/777-v6.2-05-net-dsa-qca8k-improve-mdio-master-read-write-by-usin.patch
index 4cbb66cf35fac388eb8c6bdc1a3badf61cb3175e..ea34901472dd717f9d6711ab54890614788e22fe 100644 (file)
--- a/target/linux/generic/backport-6.1/777-v6.2-05-net-dsa-qca8k-improve-mdio-master-read-write-by-usin.patch
+++ b/target/linux/generic/backport-6.1/777-v6.2-05-net-dsa-qca8k-improve-mdio-master-read-write-by-usin.patch
@@ -28,7 +28,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/dsa/qca/qca8k-8xxx.c
 +++ b/drivers/net/dsa/qca/qca8k-8xxx.c
-@@ -740,9 +740,9 @@ qca8k_mdio_busy_wait(struct mii_bus *bus
+@@ -743,9 +743,9 @@ qca8k_mdio_busy_wait(struct mii_bus *bus
  
        qca8k_split_addr(reg, &r1, &r2, &page);
  
@@ -40,7 +40,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        /* Check if qca8k_read has failed for a different reason
         * before returnting -ETIMEDOUT
-@@ -784,7 +784,7 @@ qca8k_mdio_write(struct qca8k_priv *priv
+@@ -787,7 +787,7 @@ qca8k_mdio_write(struct qca8k_priv *priv
  
  exit:
        /* even if the busy_wait timeouts try to clear the MASTER_EN */
@@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        mutex_unlock(&bus->mdio_lock);
  
-@@ -814,18 +814,18 @@ qca8k_mdio_read(struct qca8k_priv *priv,
+@@ -817,18 +817,18 @@ qca8k_mdio_read(struct qca8k_priv *priv,
        if (ret)
                goto exit;