openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: amd8111e: 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: Philippe Reynes <tremyfr@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Philippe Reynes 2016-11-05 20:17:03 +01:00 committed by David S. Miller
parent d17970d746
commit 1435003c2c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/amd/amd8111e.c
View File

@ -1421,21 +1421,23 @@ static void amd8111e_get_regs(struct net_device *dev, struct ethtool_regs *regs,
amd8111e_read_regs(lp, buf); amd8111e_read_regs(lp, buf);
} }
static int amd8111e_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) static int amd8111e_get_link_ksettings(struct net_device *dev,
struct ethtool_link_ksettings *cmd)
{ {
struct amd8111e_priv *lp = netdev_priv(dev); struct amd8111e_priv *lp = netdev_priv(dev);
spin_lock_irq(&lp->lock); spin_lock_irq(&lp->lock);
mii_ethtool_gset(&lp->mii_if, ecmd); mii_ethtool_get_link_ksettings(&lp->mii_if, cmd);
spin_unlock_irq(&lp->lock); spin_unlock_irq(&lp->lock);
return 0; return 0;
} }
static int amd8111e_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) static int amd8111e_set_link_ksettings(struct net_device *dev,
const struct ethtool_link_ksettings *cmd)
{ {
struct amd8111e_priv *lp = netdev_priv(dev); struct amd8111e_priv *lp = netdev_priv(dev);
int res; int res;
spin_lock_irq(&lp->lock); spin_lock_irq(&lp->lock);
res = mii_ethtool_sset(&lp->mii_if, ecmd); res = mii_ethtool_set_link_ksettings(&lp->mii_if, cmd);
spin_unlock_irq(&lp->lock); spin_unlock_irq(&lp->lock);
return res; return res;
} }
@ -1482,12 +1484,12 @@ static const struct ethtool_ops ops = {
.get_drvinfo = amd8111e_get_drvinfo, .get_drvinfo = amd8111e_get_drvinfo,
.get_regs_len = amd8111e_get_regs_len, .get_regs_len = amd8111e_get_regs_len,
.get_regs = amd8111e_get_regs, .get_regs = amd8111e_get_regs,
.get_settings = amd8111e_get_settings,
.set_settings = amd8111e_set_settings,
.nway_reset = amd8111e_nway_reset, .nway_reset = amd8111e_nway_reset,
.get_link = amd8111e_get_link, .get_link = amd8111e_get_link,
.get_wol = amd8111e_get_wol, .get_wol = amd8111e_get_wol,
.set_wol = amd8111e_set_wol, .set_wol = amd8111e_set_wol,
.get_link_ksettings = amd8111e_get_link_ksettings,
.set_link_ksettings = amd8111e_set_link_ksettings,
}; };
/* This function handles all the ethtool ioctls. It gives driver info, /* This function handles all the ethtool ioctls. It gives driver info,