From f0bc2636cec9000ae6f6411e510555140dbc6537 Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 22 Mar 2023 11:08:27 -0400 Subject: kernel: bump 5.15 to 5.15.104 All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia --- ...950-0500-net-phy-lan87xx-Allow-more-time-for-link-detect.patch | 2 +- .../950-0700-net-phy-lan87xx-Decrease-phy-polling-rate.patch | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/bcm27xx') diff --git a/target/linux/bcm27xx/patches-5.15/950-0500-net-phy-lan87xx-Allow-more-time-for-link-detect.patch b/target/linux/bcm27xx/patches-5.15/950-0500-net-phy-lan87xx-Allow-more-time-for-link-detect.patch index 9126507138..7c620c4400 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0500-net-phy-lan87xx-Allow-more-time-for-link-detect.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0500-net-phy-lan87xx-Allow-more-time-for-link-detect.patch @@ -21,7 +21,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c -@@ -220,12 +220,12 @@ static int lan87xx_read_status(struct ph +@@ -223,12 +223,12 @@ static int lan87xx_read_status(struct ph if (rc < 0) return rc; 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 62d7ea93d3..0341a0b7bf 100644 --- 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 --- 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 /* 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 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; -- cgit v1.2.3