--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
-@@ -1994,6 +1994,11 @@ int phylink_ethtool_ksettings_set(struct
+@@ -2484,6 +2484,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.
*/
+ pl->phydev->drv->set_port(pl->phydev, kset->base.port);
+ }
+ }
- return phy_ethtool_ksettings_set(pl->phydev, kset);
+ return phy_ethtool_ksettings_set(pl->phydev, &phy_kset);
}
-@@ -2297,8 +2302,11 @@ int phylink_ethtool_get_eee(struct phyli
+@@ -2786,8 +2791,11 @@ int phylink_ethtool_get_eee(struct phyli
ASSERT_RTNL();
return ret;
}
-@@ -2315,8 +2323,11 @@ int phylink_ethtool_set_eee(struct phyli
+@@ -2804,8 +2812,11 @@ int phylink_ethtool_set_eee(struct phyli
ASSERT_RTNL();