diff options
| author | David Decotigny <decot@googlers.com> | 2016-02-24 10:58:04 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-25 22:06:46 -0500 |
| commit | 85f9581975dc0315b1b47c5323a8ee497ebd6a8f (patch) | |
| tree | 406917b1c7ca9350abf06eb1e61570d97c95560d /drivers/net/macvlan.c | |
| parent | 314d10d73b2580c0a036536f6444d704d96d6082 (diff) | |
| download | op-kernel-dev-85f9581975dc0315b1b47c5323a8ee497ebd6a8f.zip op-kernel-dev-85f9581975dc0315b1b47c5323a8ee497ebd6a8f.tar.gz | |
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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 426a2cc..6e953e3 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, strlcpy(drvinfo->version, "0.1", sizeof(drvinfo->version)); } -static int macvlan_ethtool_get_settings(struct net_device *dev, - struct ethtool_cmd *cmd) +static int macvlan_ethtool_get_link_ksettings(struct net_device *dev, + struct ethtool_link_ksettings *cmd) { const struct macvlan_dev *vlan = netdev_priv(dev); - return __ethtool_get_settings(vlan->lowerdev, cmd); + return __ethtool_get_link_ksettings(vlan->lowerdev, cmd); } static 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) static const struct ethtool_ops macvlan_ethtool_ops = { .get_link = ethtool_op_get_link, - .get_settings = macvlan_ethtool_get_settings, + .get_link_ksettings = macvlan_ethtool_get_link_ksettings, .get_drvinfo = macvlan_ethtool_get_drvinfo, }; |
