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

net: 3c59x: 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.
Signed-off-by: default avatarPhilippe Reynes <tremyfr@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bc8ee596
...@@ -2907,18 +2907,20 @@ static int vortex_nway_reset(struct net_device *dev) ...@@ -2907,18 +2907,20 @@ static int vortex_nway_reset(struct net_device *dev)
return mii_nway_restart(&vp->mii); return mii_nway_restart(&vp->mii);
} }
static int vortex_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int vortex_get_link_ksettings(struct net_device *dev,
struct ethtool_link_ksettings *cmd)
{ {
struct vortex_private *vp = netdev_priv(dev); struct vortex_private *vp = netdev_priv(dev);
return mii_ethtool_gset(&vp->mii, cmd); return mii_ethtool_get_link_ksettings(&vp->mii, cmd);
} }
static int vortex_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int vortex_set_link_ksettings(struct net_device *dev,
const struct ethtool_link_ksettings *cmd)
{ {
struct vortex_private *vp = netdev_priv(dev); struct vortex_private *vp = netdev_priv(dev);
return mii_ethtool_sset(&vp->mii, cmd); return mii_ethtool_set_link_ksettings(&vp->mii, cmd);
} }
static u32 vortex_get_msglevel(struct net_device *dev) static u32 vortex_get_msglevel(struct net_device *dev)
...@@ -3031,13 +3033,13 @@ static const struct ethtool_ops vortex_ethtool_ops = { ...@@ -3031,13 +3033,13 @@ static const struct ethtool_ops vortex_ethtool_ops = {
.set_msglevel = vortex_set_msglevel, .set_msglevel = vortex_set_msglevel,
.get_ethtool_stats = vortex_get_ethtool_stats, .get_ethtool_stats = vortex_get_ethtool_stats,
.get_sset_count = vortex_get_sset_count, .get_sset_count = vortex_get_sset_count,
.get_settings = vortex_get_settings,
.set_settings = vortex_set_settings,
.get_link = ethtool_op_get_link, .get_link = ethtool_op_get_link,
.nway_reset = vortex_nway_reset, .nway_reset = vortex_nway_reset,
.get_wol = vortex_get_wol, .get_wol = vortex_get_wol,
.set_wol = vortex_set_wol, .set_wol = vortex_set_wol,
.get_ts_info = ethtool_op_get_ts_info, .get_ts_info = ethtool_op_get_ts_info,
.get_link_ksettings = vortex_get_link_ksettings,
.set_link_ksettings = vortex_set_link_ksettings,
}; };
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
......
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