mirror of https://gitee.com/openkylin/linux.git
net: dlink: sundance: 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:
parent
9022255006
commit
88c513d478
|
@ -1664,21 +1664,23 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
|
|||
strlcpy(info->bus_info, pci_name(np->pci_dev), sizeof(info->bus_info));
|
||||
}
|
||||
|
||||
static int get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
|
||||
static int get_link_ksettings(struct net_device *dev,
|
||||
struct ethtool_link_ksettings *cmd)
|
||||
{
|
||||
struct netdev_private *np = netdev_priv(dev);
|
||||
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);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
|
||||
static int set_link_ksettings(struct net_device *dev,
|
||||
const struct ethtool_link_ksettings *cmd)
|
||||
{
|
||||
struct netdev_private *np = netdev_priv(dev);
|
||||
int res;
|
||||
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);
|
||||
return res;
|
||||
}
|
||||
|
@ -1800,8 +1802,6 @@ static int sundance_set_wol(struct net_device *dev,
|
|||
static const struct ethtool_ops ethtool_ops = {
|
||||
.begin = check_if_running,
|
||||
.get_drvinfo = get_drvinfo,
|
||||
.get_settings = get_settings,
|
||||
.set_settings = set_settings,
|
||||
.nway_reset = nway_reset,
|
||||
.get_link = get_link,
|
||||
.get_wol = sundance_get_wol,
|
||||
|
@ -1811,6 +1811,8 @@ static const struct ethtool_ops ethtool_ops = {
|
|||
.get_strings = get_strings,
|
||||
.get_sset_count = get_sset_count,
|
||||
.get_ethtool_stats = get_ethtool_stats,
|
||||
.get_link_ksettings = get_link_ksettings,
|
||||
.set_link_ksettings = set_link_ksettings,
|
||||
};
|
||||
|
||||
static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
|
||||
|
|
Loading…
Reference in New Issue