diff options
author | David Decotigny <decot@googlers.com> | 2016-02-24 13:58:03 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-02-25 22:06:46 -0500 |
commit | 314d10d73b2580c0a036536f6444d704d96d6082 (patch) | |
tree | 8d66eb48c6689ef0b0096b596fd284cb6756ba3c /drivers/net/ipvlan/ipvlan_main.c | |
parent | 9856909c2abb32a795d9782bff2ce987696ffb9b (diff) |
net: ipvlan: 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/ipvlan/ipvlan_main.c')
-rw-r--r-- | drivers/net/ipvlan/ipvlan_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c index a7ca1c519a0d..5802b9025765 100644 --- a/drivers/net/ipvlan/ipvlan_main.c +++ b/drivers/net/ipvlan/ipvlan_main.c | |||
@@ -346,12 +346,12 @@ static const struct header_ops ipvlan_header_ops = { | |||
346 | .cache_update = eth_header_cache_update, | 346 | .cache_update = eth_header_cache_update, |
347 | }; | 347 | }; |
348 | 348 | ||
349 | static int ipvlan_ethtool_get_settings(struct net_device *dev, | 349 | static int ipvlan_ethtool_get_link_ksettings(struct net_device *dev, |
350 | struct ethtool_cmd *cmd) | 350 | struct ethtool_link_ksettings *cmd) |
351 | { | 351 | { |
352 | const struct ipvl_dev *ipvlan = netdev_priv(dev); | 352 | const struct ipvl_dev *ipvlan = netdev_priv(dev); |
353 | 353 | ||
354 | return __ethtool_get_settings(ipvlan->phy_dev, cmd); | 354 | return __ethtool_get_link_ksettings(ipvlan->phy_dev, cmd); |
355 | } | 355 | } |
356 | 356 | ||
357 | static void ipvlan_ethtool_get_drvinfo(struct net_device *dev, | 357 | static void ipvlan_ethtool_get_drvinfo(struct net_device *dev, |
@@ -377,7 +377,7 @@ static void ipvlan_ethtool_set_msglevel(struct net_device *dev, u32 value) | |||
377 | 377 | ||
378 | static const struct ethtool_ops ipvlan_ethtool_ops = { | 378 | static const struct ethtool_ops ipvlan_ethtool_ops = { |
379 | .get_link = ethtool_op_get_link, | 379 | .get_link = ethtool_op_get_link, |
380 | .get_settings = ipvlan_ethtool_get_settings, | 380 | .get_link_ksettings = ipvlan_ethtool_get_link_ksettings, |
381 | .get_drvinfo = ipvlan_ethtool_get_drvinfo, | 381 | .get_drvinfo = ipvlan_ethtool_get_drvinfo, |
382 | .get_msglevel = ipvlan_ethtool_get_msglevel, | 382 | .get_msglevel = ipvlan_ethtool_get_msglevel, |
383 | .set_msglevel = ipvlan_ethtool_set_msglevel, | 383 | .set_msglevel = ipvlan_ethtool_set_msglevel, |