Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39889c29 authored by Russell King's avatar Russell King Committed by Greg Kroah-Hartman
Browse files

phylink: ensure the PHY interface mode is appropriately set 




[ Upstream commit 182088aa ]

When setting the ethtool settings, ensure that the validated PHY
interface mode is propagated to the current link settings, so that
2500BaseX can be selected.

Fixes: 9525ae83 ("phylink: add phylink infrastructure")
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7f6dcb82

drivers/net/phy/phylink.c

+1 −0
Original line number Diff line number Diff line
@@ -948,6 +948,7 @@ int phylink_ethtool_ksettings_set(struct phylink *pl, 
	mutex_lock(&pl->state_mutex);

	/* Configure the MAC to match the new settings */

	linkmode_copy(pl->link_config.advertising, our_kset.link_modes.advertising);

	pl->link_config.interface = config.interface;

	pl->link_config.speed = our_kset.base.speed;

	pl->link_config.duplex = our_kset.base.duplex;

	pl->link_config.an_enabled = our_kset.base.autoneg != AUTONEG_DISABLE;