summaryrefslogtreecommitdiffstats
path: root/drivers/net/macvlan.c
diff options
context:
space:
mode:
authorDavid Decotigny <decot@googlers.com>2016-02-24 13:58:04 -0500
committerDavid S. Miller <davem@davemloft.net>2016-02-25 22:06:46 -0500
commit85f9581975dc0315b1b47c5323a8ee497ebd6a8f (patch)
tree406917b1c7ca9350abf06eb1e61570d97c95560d /drivers/net/macvlan.c
parent314d10d73b2580c0a036536f6444d704d96d6082 (diff)
net: macvlan: use __ethtool_get_ksettings
Signed-off-by: David Decotigny <decot@googlers.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvlan.c')
-rw-r--r--drivers/net/macvlan.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 426a2cc27ac8..6e953e3a460a 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -940,12 +940,12 @@ static void macvlan_ethtool_get_drvinfo(struct net_device *dev,
940 strlcpy(drvinfo->version, "0.1", sizeof(drvinfo->version)); 940 strlcpy(drvinfo->version, "0.1", sizeof(drvinfo->version));
941} 941}
942 942
943static int macvlan_ethtool_get_settings(struct net_device *dev, 943static int macvlan_ethtool_get_link_ksettings(struct net_device *dev,
944 struct ethtool_cmd *cmd) 944 struct ethtool_link_ksettings *cmd)
945{ 945{
946 const struct macvlan_dev *vlan = netdev_priv(dev); 946 const struct macvlan_dev *vlan = netdev_priv(dev);
947 947
948 return __ethtool_get_settings(vlan->lowerdev, cmd); 948 return __ethtool_get_link_ksettings(vlan->lowerdev, cmd);
949} 949}
950 950
951static netdev_features_t macvlan_fix_features(struct net_device *dev, 951static netdev_features_t macvlan_fix_features(struct net_device *dev,
@@ -1020,7 +1020,7 @@ static int macvlan_dev_get_iflink(const struct net_device *dev)
1020 1020
1021static const struct ethtool_ops macvlan_ethtool_ops = { 1021static const struct ethtool_ops macvlan_ethtool_ops = {
1022 .get_link = ethtool_op_get_link, 1022 .get_link = ethtool_op_get_link,
1023 .get_settings = macvlan_ethtool_get_settings, 1023 .get_link_ksettings = macvlan_ethtool_get_link_ksettings,
1024 .get_drvinfo = macvlan_ethtool_get_drvinfo, 1024 .get_drvinfo = macvlan_ethtool_get_drvinfo,
1025}; 1025};
1026 1026