Commit 336f8a71 authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller

net: hamachi: use new api ethtool_{get|set}_link_ksettings

The ethtool api {get|set}_settings is deprecated.
We move this driver to new api {get|set}_link_ksettings.

As I don't have the hardware, I'd be very pleased if
someone may test this patch.
Signed-off-by: default avatarPhilippe Reynes <tremyfr@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eda7a5e8
...@@ -1811,21 +1811,23 @@ static void hamachi_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo * ...@@ -1811,21 +1811,23 @@ static void hamachi_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *
strlcpy(info->bus_info, pci_name(np->pci_dev), sizeof(info->bus_info)); strlcpy(info->bus_info, pci_name(np->pci_dev), sizeof(info->bus_info));
} }
static int hamachi_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) static int hamachi_get_link_ksettings(struct net_device *dev,
struct ethtool_link_ksettings *cmd)
{ {
struct hamachi_private *np = netdev_priv(dev); struct hamachi_private *np = netdev_priv(dev);
spin_lock_irq(&np->lock); spin_lock_irq(&np->lock);
mii_ethtool_gset(&np->mii_if, ecmd); mii_ethtool_get_link_ksettings(&np->mii_if, cmd);
spin_unlock_irq(&np->lock); spin_unlock_irq(&np->lock);
return 0; return 0;
} }
static int hamachi_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) static int hamachi_set_link_ksettings(struct net_device *dev,
const struct ethtool_link_ksettings *cmd)
{ {
struct hamachi_private *np = netdev_priv(dev); struct hamachi_private *np = netdev_priv(dev);
int res; int res;
spin_lock_irq(&np->lock); spin_lock_irq(&np->lock);
res = mii_ethtool_sset(&np->mii_if, ecmd); res = mii_ethtool_set_link_ksettings(&np->mii_if, cmd);
spin_unlock_irq(&np->lock); spin_unlock_irq(&np->lock);
return res; return res;
} }
...@@ -1845,10 +1847,10 @@ static u32 hamachi_get_link(struct net_device *dev) ...@@ -1845,10 +1847,10 @@ static u32 hamachi_get_link(struct net_device *dev)
static const struct ethtool_ops ethtool_ops = { static const struct ethtool_ops ethtool_ops = {
.begin = check_if_running, .begin = check_if_running,
.get_drvinfo = hamachi_get_drvinfo, .get_drvinfo = hamachi_get_drvinfo,
.get_settings = hamachi_get_settings,
.set_settings = hamachi_set_settings,
.nway_reset = hamachi_nway_reset, .nway_reset = hamachi_nway_reset,
.get_link = hamachi_get_link, .get_link = hamachi_get_link,
.get_link_ksettings = hamachi_get_link_ksettings,
.set_link_ksettings = hamachi_set_link_ksettings,
}; };
static const struct ethtool_ops ethtool_ops_no_mii = { static const struct ethtool_ops ethtool_ops_no_mii = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment