提交 f1cd5aa0 编写于 作者: P Philippe Reynes 提交者: David S. Miller

net: adaptec: starfire: 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: NPhilippe Reynes <tremyfr@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 35887d32
...@@ -1816,21 +1816,23 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) ...@@ -1816,21 +1816,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)); 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); struct netdev_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 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); struct netdev_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);
check_duplex(dev); check_duplex(dev);
return res; return res;
...@@ -1861,12 +1863,12 @@ static void set_msglevel(struct net_device *dev, u32 val) ...@@ -1861,12 +1863,12 @@ static void set_msglevel(struct net_device *dev, u32 val)
static const struct ethtool_ops ethtool_ops = { static const struct ethtool_ops ethtool_ops = {
.begin = check_if_running, .begin = check_if_running,
.get_drvinfo = get_drvinfo, .get_drvinfo = get_drvinfo,
.get_settings = get_settings,
.set_settings = set_settings,
.nway_reset = nway_reset, .nway_reset = nway_reset,
.get_link = get_link, .get_link = get_link,
.get_msglevel = get_msglevel, .get_msglevel = get_msglevel,
.set_msglevel = set_msglevel, .set_msglevel = set_msglevel,
.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) static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册