OSDN Git Service

net: dsa: use phy_ethtool_get_link_ksettings
authorVivien Didelot <vivien.didelot@savoirfairelinux.com>
Tue, 26 Sep 2017 21:15:33 +0000 (17:15 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 Sep 2017 03:06:34 +0000 (20:06 -0700)
Use phy_ethtool_get_link_ksettings now that dsa_slave_get_link_ksettings
does exactly the same.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/dsa/slave.c

index 4ea1c6e..bb0f64f 100644 (file)
@@ -420,17 +420,6 @@ static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev)
 }
 
 /* ethtool operations *******************************************************/
-static int
-dsa_slave_get_link_ksettings(struct net_device *dev,
-                            struct ethtool_link_ksettings *cmd)
-{
-       if (!dev->phydev)
-               return -ENODEV;
-
-       phy_ethtool_ksettings_get(dev->phydev, cmd);
-
-       return 0;
-}
 
 static int
 dsa_slave_set_link_ksettings(struct net_device *dev,
@@ -921,8 +910,8 @@ static const struct ethtool_ops dsa_slave_ethtool_ops = {
        .get_wol                = dsa_slave_get_wol,
        .set_eee                = dsa_slave_set_eee,
        .get_eee                = dsa_slave_get_eee,
-       .get_link_ksettings     = dsa_slave_get_link_ksettings,
        .set_link_ksettings     = dsa_slave_set_link_ksettings,
+       .get_link_ksettings     = phy_ethtool_get_link_ksettings,
        .get_rxnfc              = dsa_slave_get_rxnfc,
        .set_rxnfc              = dsa_slave_set_rxnfc,
 };