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

Commit 18ec898e authored by David S. Miller's avatar David S. Miller
Browse files

Revert "net: core: 'ethtool' issue with querying phy settings" 



This reverts commit f96dee13.

It isn't right, ethtool is meant to manage one PHY instance
per netdevice at a time, and this is selected by the SET
command.  Therefore by definition the GET command must only
return the settings for the configured and selected PHY.

Reported-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c6e36d8c

net/core/ethtool.c

+1 −9
Original line number Original line Diff line number Diff line
@@ -359,15 +359,7 @@ static int ethtool_get_settings(struct net_device *dev, void __user *useraddr) 
	int err;

	int err;

	struct ethtool_cmd cmd;

	struct ethtool_cmd cmd;





	if (!dev->ethtool_ops->get_settings)

	err = __ethtool_get_settings(dev, &cmd);

		return -EOPNOTSUPP;



	if (copy_from_user(&cmd, useraddr, sizeof(cmd)))

		return -EFAULT;



	cmd.cmd = ETHTOOL_GSET;



	err = dev->ethtool_ops->get_settings(dev, &cmd);

	if (err < 0)

	if (err < 0)

		return err;

		return err;