net: ipvlan: use __ethtool_get_ksettings
authorDavid Decotigny <decot@googlers.com>
Wed, 24 Feb 2016 18:58:03 +0000 (10:58 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 26 Feb 2016 03:06:46 +0000 (22:06 -0500)
Signed-off-by: David Decotigny <decot@googlers.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ipvlan/ipvlan_main.c

index a7ca1c5..5802b90 100644 (file)
@@ -346,12 +346,12 @@ static const struct header_ops ipvlan_header_ops = {
        .cache_update   = eth_header_cache_update,
 };
 
-static int ipvlan_ethtool_get_settings(struct net_device *dev,
-                                      struct ethtool_cmd *cmd)
+static int ipvlan_ethtool_get_link_ksettings(struct net_device *dev,
+                                            struct ethtool_link_ksettings *cmd)
 {
        const struct ipvl_dev *ipvlan = netdev_priv(dev);
 
-       return __ethtool_get_settings(ipvlan->phy_dev, cmd);
+       return __ethtool_get_link_ksettings(ipvlan->phy_dev, cmd);
 }
 
 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)
 
 static const struct ethtool_ops ipvlan_ethtool_ops = {
        .get_link       = ethtool_op_get_link,
-       .get_settings   = ipvlan_ethtool_get_settings,
+       .get_link_ksettings     = ipvlan_ethtool_get_link_ksettings,
        .get_drvinfo    = ipvlan_ethtool_get_drvinfo,
        .get_msglevel   = ipvlan_ethtool_get_msglevel,
        .set_msglevel   = ipvlan_ethtool_set_msglevel,