leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: smsc: epic100: use new api ethtool_{get|set}_link_ksettings

Browse Source 
The ethtool api {get|set}_settings is deprecated.
We move this driver to new api {get|set}_link_ksettings.

As I don't have the hardware, I'd be very pleased if
someone may test this patch.

Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Philippe Reynes 2017-02-27 23:43:14 +01:00 committed by David S. Miller
parent 7d59e319d9
commit 60269ae1b0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/smsc/epic100.c
View File

@ -1387,25 +1387,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)); 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 epic_private *np = netdev_priv(dev); struct epic_private *np = netdev_priv(dev);
int rc; int rc;
spin_lock_irq(&np->lock); spin_lock_irq(&np->lock);
rc = mii_ethtool_gset(&np->mii, cmd); rc = mii_ethtool_get_link_ksettings(&np->mii, cmd);
spin_unlock_irq(&np->lock); spin_unlock_irq(&np->lock);
return rc; 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 epic_private *np = netdev_priv(dev); struct epic_private *np = netdev_priv(dev);
int rc; int rc;
spin_lock_irq(&np->lock); spin_lock_irq(&np->lock);
rc = mii_ethtool_sset(&np->mii, cmd); rc = mii_ethtool_set_link_ksettings(&np->mii, cmd);
spin_unlock_irq(&np->lock); spin_unlock_irq(&np->lock);
return rc; return rc;
@ -1460,14 +1462,14 @@ static void ethtool_complete(struct net_device *dev)
static const struct ethtool_ops netdev_ethtool_ops = { static const struct ethtool_ops netdev_ethtool_ops = {
.get_drvinfo = netdev_get_drvinfo, .get_drvinfo = netdev_get_drvinfo,
.get_settings = netdev_get_settings,
.set_settings = netdev_set_settings,
.nway_reset = netdev_nway_reset, .nway_reset = netdev_nway_reset,
.get_link = netdev_get_link, .get_link = netdev_get_link,
.get_msglevel = netdev_get_msglevel, .get_msglevel = netdev_get_msglevel,
.set_msglevel = netdev_set_msglevel, .set_msglevel = netdev_set_msglevel,
.begin = ethtool_begin, .begin = ethtool_begin,
.complete = ethtool_complete .complete = ethtool_complete,
.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) static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)