mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-25 03:55:09 +08:00
net: dec: winbond-840: 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
6711a87a9b
commit
453e5f3dfc
@ -1391,25 +1391,27 @@ static void netdev_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *
|
||||
strlcpy(info->bus_info, pci_name(np->pci_dev), sizeof(info->bus_info));
|
||||
}
|
||||
|
||||
static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
||||
static int netdev_get_link_ksettings(struct net_device *dev,
|
||||
struct ethtool_link_ksettings *cmd)
|
||||
{
|
||||
struct netdev_private *np = netdev_priv(dev);
|
||||
int rc;
|
||||
|
||||
spin_lock_irq(&np->lock);
|
||||
rc = mii_ethtool_gset(&np->mii_if, cmd);
|
||||
rc = mii_ethtool_get_link_ksettings(&np->mii_if, cmd);
|
||||
spin_unlock_irq(&np->lock);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int netdev_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
||||
static int netdev_set_link_ksettings(struct net_device *dev,
|
||||
const struct ethtool_link_ksettings *cmd)
|
||||
{
|
||||
struct netdev_private *np = netdev_priv(dev);
|
||||
int rc;
|
||||
|
||||
spin_lock_irq(&np->lock);
|
||||
rc = mii_ethtool_sset(&np->mii_if, cmd);
|
||||
rc = mii_ethtool_set_link_ksettings(&np->mii_if, cmd);
|
||||
spin_unlock_irq(&np->lock);
|
||||
|
||||
return rc;
|
||||
@ -1439,12 +1441,12 @@ static void netdev_set_msglevel(struct net_device *dev, u32 value)
|
||||
|
||||
static const struct ethtool_ops netdev_ethtool_ops = {
|
||||
.get_drvinfo = netdev_get_drvinfo,
|
||||
.get_settings = netdev_get_settings,
|
||||
.set_settings = netdev_set_settings,
|
||||
.nway_reset = netdev_nway_reset,
|
||||
.get_link = netdev_get_link,
|
||||
.get_msglevel = netdev_get_msglevel,
|
||||
.set_msglevel = netdev_set_msglevel,
|
||||
.get_link_ksettings = netdev_get_link_ksettings,
|
||||
.set_link_ksettings = netdev_set_link_ksettings,
|
||||
};
|
||||
|
||||
static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
|
||||
|
Loading…
Reference in New Issue
Block a user