]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
net: ethernet: amd: au1000_eth: use phy_ethtool_{get|set}_link_ksettings
authorPhilippe Reynes <tremyfr@gmail.com>
Fri, 15 Jul 2016 10:05:12 +0000 (12:05 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 15 Jul 2016 23:41:35 +0000 (16:41 -0700)
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: Philippe Reynes <tremyfr@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/amd/au1000_eth.c

index 18fe333fbaf6a3871521ac9d65f576b78639da25..df664187cd8271fd40a441ccebf2de29629b9722 100644 (file)
@@ -677,25 +677,6 @@ au1000_setup_hw_rings(struct au1000_private *aup, void __iomem *tx_base)
  * 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
 au1000_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
@@ -720,12 +701,12 @@ static u32 au1000_get_msglevel(struct net_device *dev)
 }
 
 static const struct ethtool_ops au1000_ethtool_ops = {
-       .get_settings = au1000_get_settings,
-       .set_settings = au1000_set_settings,
        .get_drvinfo = au1000_get_drvinfo,
        .get_link = ethtool_op_get_link,
        .get_msglevel = au1000_get_msglevel,
        .set_msglevel = au1000_set_msglevel,
+       .get_link_ksettings = phy_ethtool_get_link_ksettings,
+       .set_link_ksettings = phy_ethtool_set_link_ksettings,
 };