mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-10 04:41:49 +00:00
6121581765
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.10.203 Removed upstreamed: backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.203&id=7d1d3f1134254f5fae926f79fc0d94e3d7e2e452 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
--- a/drivers/net/phy/phylink.c
|
|
+++ b/drivers/net/phy/phylink.c
|
|
@@ -1450,6 +1450,11 @@ int phylink_ethtool_ksettings_set(struct
|
|
* the presence of a PHY, this should not be changed as that
|
|
* should be determined from the media side advertisement.
|
|
*/
|
|
+ if (pl->phydev->drv->get_port && pl->phydev->drv->set_port) {
|
|
+ if(pl->phydev->drv->get_port(pl->phydev) != kset->base.port) {
|
|
+ pl->phydev->drv->set_port(pl->phydev, kset->base.port);
|
|
+ }
|
|
+ }
|
|
return phy_ethtool_ksettings_set(pl->phydev, kset);
|
|
}
|
|
|
|
@@ -1751,8 +1756,11 @@ int phylink_ethtool_get_eee(struct phyli
|
|
|
|
ASSERT_RTNL();
|
|
|
|
- if (pl->phydev)
|
|
+ if (pl->phydev) {
|
|
+ if (pl->phydev->drv->get_eee)
|
|
+ return pl->phydev->drv->get_eee(pl->phydev, eee);
|
|
ret = phy_ethtool_get_eee(pl->phydev, eee);
|
|
+ }
|
|
|
|
return ret;
|
|
}
|
|
@@ -1769,8 +1777,11 @@ int phylink_ethtool_set_eee(struct phyli
|
|
|
|
ASSERT_RTNL();
|
|
|
|
- if (pl->phydev)
|
|
+ if (pl->phydev) {
|
|
+ if (pl->phydev->drv->set_eee)
|
|
+ return pl->phydev->drv->set_eee(pl->phydev, eee);
|
|
ret = phy_ethtool_set_eee(pl->phydev, eee);
|
|
+ }
|
|
|
|
return ret;
|
|
}
|