mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-05-20 21:27:55 +00:00
81e46d2a23
- Fix order of patches (3d483a10327f was merged before 34d5a86ff7bb). - Reorganize patch numbers now that < 6.12 patches are no longer needed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From ea8318cb33e593bbfc59d637eae45a69732c5387 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Wed, 15 Jan 2025 14:43:43 +0000
|
|
Subject: [PATCH] net: phy: realtek: clear master_slave_state if link is down
|
|
|
|
rtlgen_decode_physr() which sets master_slave_state isn't called in case
|
|
the link is down and other than rtlgen_read_status(),
|
|
rtl822x_c45_read_status() doesn't implicitely clear master_slave_state.
|
|
|
|
Avoid stale master_slave_state by always setting it to
|
|
MASTER_SLAVE_STATE_UNKNOWN in rtl822x_c45_read_status() in case the link
|
|
is down.
|
|
|
|
Fixes: 081c9c0265c9 ("net: phy: realtek: read duplex and gbit master from PHYSR register")
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/phy/realtek.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/phy/realtek.c
|
|
+++ b/drivers/net/phy/realtek.c
|
|
@@ -1046,8 +1046,10 @@ static int rtl822x_c45_read_status(struc
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
- if (!phydev->link)
|
|
+ if (!phydev->link) {
|
|
+ phydev->master_slave_state = MASTER_SLAVE_STATE_UNKNOWN;
|
|
return 0;
|
|
+ }
|
|
|
|
/* Read actual speed from vendor register. */
|
|
val = phy_read_mmd(phydev, MDIO_MMD_VEND2, RTL_VND2_PHYSR);
|