summaryrefslogtreecommitdiffstats
path: root/net/dsa
diff options
context:
space:
mode:
authorVivien Didelot <vivien.didelot@savoirfairelinux.com>2017-09-26 17:15:33 -0400
committerDavid S. Miller <davem@davemloft.net>2017-09-26 23:06:34 -0400
commit771df31ace8a0264bcc3576d3f02660e3366cd6d (patch)
tree58805dc77496cad87f31cded9030e78698f7d774 /net/dsa
parent0115dcd1787d2d1c50719fab98d6bcb0c17931a1 (diff)
net: dsa: use phy_ethtool_get_link_ksettings
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>
Diffstat (limited to 'net/dsa')
-rw-r--r--net/dsa/slave.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 4ea1c6eb0da8..bb0f64f47ae7 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -420,17 +420,6 @@ static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev)
420} 420}
421 421
422/* ethtool operations *******************************************************/ 422/* ethtool operations *******************************************************/
423static int
424dsa_slave_get_link_ksettings(struct net_device *dev,
425 struct ethtool_link_ksettings *cmd)
426{
427 if (!dev->phydev)
428 return -ENODEV;
429
430 phy_ethtool_ksettings_get(dev->phydev, cmd);
431
432 return 0;
433}
434 423
435static int 424static int
436dsa_slave_set_link_ksettings(struct net_device *dev, 425dsa_slave_set_link_ksettings(struct net_device *dev,
@@ -921,8 +910,8 @@ static const struct ethtool_ops dsa_slave_ethtool_ops = {
921 .get_wol = dsa_slave_get_wol, 910 .get_wol = dsa_slave_get_wol,
922 .set_eee = dsa_slave_set_eee, 911 .set_eee = dsa_slave_set_eee,
923 .get_eee = dsa_slave_get_eee, 912 .get_eee = dsa_slave_get_eee,
924 .get_link_ksettings = dsa_slave_get_link_ksettings,
925 .set_link_ksettings = dsa_slave_set_link_ksettings, 913 .set_link_ksettings = dsa_slave_set_link_ksettings,
914 .get_link_ksettings = phy_ethtool_get_link_ksettings,
926 .get_rxnfc = dsa_slave_get_rxnfc, 915 .get_rxnfc = dsa_slave_get_rxnfc,
927 .set_rxnfc = dsa_slave_set_rxnfc, 916 .set_rxnfc = dsa_slave_set_rxnfc,
928}; 917};