Commit b4cafd8c authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller

net: ethernet: amd: au1000_eth: use phy_ethtool_{get|set}_link_ksettings

There are two generics functions phy_ethtool_{get|set}_link_ksettings,
so we can use them instead of defining the same code in the driver.

There was a check on CAP_NET_ADMIN in au1000_set_settings, but this
check is already done in dev_ethtool, so no need to repeat it before
calling the generic function.
Signed-off-by: default avatarPhilippe Reynes <tremyfr@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1e8b7389
...@@ -677,25 +677,6 @@ au1000_setup_hw_rings(struct au1000_private *aup, void __iomem *tx_base) ...@@ -677,25 +677,6 @@ au1000_setup_hw_rings(struct au1000_private *aup, void __iomem *tx_base)
* ethtool operations * ethtool operations
*/ */
static int au1000_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
if (dev->phydev)
return phy_ethtool_gset(dev->phydev, cmd);
return -EINVAL;
}
static int au1000_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
if (!capable(CAP_NET_ADMIN))
return -EPERM;
if (dev->phydev)
return phy_ethtool_sset(dev->phydev, cmd);
return -EINVAL;
}
static void static void
au1000_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) au1000_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
{ {
...@@ -720,12 +701,12 @@ static u32 au1000_get_msglevel(struct net_device *dev) ...@@ -720,12 +701,12 @@ static u32 au1000_get_msglevel(struct net_device *dev)
} }
static const struct ethtool_ops au1000_ethtool_ops = { static const struct ethtool_ops au1000_ethtool_ops = {
.get_settings = au1000_get_settings,
.set_settings = au1000_set_settings,
.get_drvinfo = au1000_get_drvinfo, .get_drvinfo = au1000_get_drvinfo,
.get_link = ethtool_op_get_link, .get_link = ethtool_op_get_link,
.get_msglevel = au1000_get_msglevel, .get_msglevel = au1000_get_msglevel,
.set_msglevel = au1000_set_msglevel, .set_msglevel = au1000_set_msglevel,
.get_link_ksettings = phy_ethtool_get_link_ksettings,
.set_link_ksettings = phy_ethtool_set_link_ksettings,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment