kernel: bump 5.15 to 5.15.104

[openwrt/staging/nbd.git] / target / linux / bcm27xx / patches-5.15 / 950-0700-net-phy-lan87xx-Decrease-phy-polling-rate.patch

diff --git a/target/linux/bcm27xx/patches-5.15/950-0700-net-phy-lan87xx-Decrease-phy-polling-rate.patch b/target/linux/bcm27xx/patches-5.15/950-0700-net-phy-lan87xx-Decrease-phy-polling-rate.patch
index 62d7ea93d3a86ac25cb262392b0d6d5077366ec7..0341a0b7bf834837e6d1c4c0001705261b5dc2ea 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0700-net-phy-lan87xx-Decrease-phy-polling-rate.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0700-net-phy-lan87xx-Decrease-phy-polling-rate.patch
@@ -18,8 +18,8 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/drivers/net/phy/smsc.c
 +++ b/drivers/net/phy/smsc.c
-@@ -210,6 +210,8 @@ static int lan87xx_read_status(struct ph
-       int err = genphy_read_status(phydev);
+@@ -213,6 +213,8 @@ static int lan87xx_read_status(struct ph
+               return err;
  
        if (!phydev->link && priv->energy_enable && phydev->irq == PHY_POLL) {
 +              int energy_detected;
@@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
                /* Disable EDPD to wake up PHY */
                int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
                if (rc < 0)
-@@ -225,7 +227,7 @@ static int lan87xx_read_status(struct ph
+@@ -228,7 +230,7 @@ static int lan87xx_read_status(struct ph
                 */
                read_poll_timeout(phy_read, rc,
                                  rc & MII_LAN83C185_ENERGYON || rc < 0,
@@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
                                  MII_LAN83C185_CTRL_STATUS);
                if (rc < 0)
                        return rc;
-@@ -235,10 +237,16 @@ static int lan87xx_read_status(struct ph
+@@ -238,10 +240,16 @@ static int lan87xx_read_status(struct ph
                if (rc < 0)
                        return rc;