xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: sgi: ioc3-eth: 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-26 22:48:59 +01:00
committed by David S. Miller
parent de48015054
commit b61a26f8d4
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/sgi/ioc3-eth.c
View File

@@ -1558,25 +1558,27 @@ static void ioc3_get_drvinfo (struct net_device *dev,
strlcpy(info->bus_info, pci_name(ip->pdev), sizeof(info->bus_info)); strlcpy(info->bus_info, pci_name(ip->pdev), sizeof(info->bus_info));
} }
static int ioc3_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int ioc3_get_link_ksettings(struct net_device *dev,
struct ethtool_link_ksettings *cmd)
{ {
struct ioc3_private *ip = netdev_priv(dev); struct ioc3_private *ip = netdev_priv(dev);
int rc; int rc;
spin_lock_irq(&ip->ioc3_lock); spin_lock_irq(&ip->ioc3_lock);
rc = mii_ethtool_gset(&ip->mii, cmd); rc = mii_ethtool_get_link_ksettings(&ip->mii, cmd);
spin_unlock_irq(&ip->ioc3_lock); spin_unlock_irq(&ip->ioc3_lock);
return rc; return rc;
} }
static int ioc3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int ioc3_set_link_ksettings(struct net_device *dev,
const struct ethtool_link_ksettings *cmd)
{ {
struct ioc3_private *ip = netdev_priv(dev); struct ioc3_private *ip = netdev_priv(dev);
int rc; int rc;
spin_lock_irq(&ip->ioc3_lock); spin_lock_irq(&ip->ioc3_lock);
rc = mii_ethtool_sset(&ip->mii, cmd); rc = mii_ethtool_set_link_ksettings(&ip->mii, cmd);
spin_unlock_irq(&ip->ioc3_lock); spin_unlock_irq(&ip->ioc3_lock);
return rc; return rc;
@@ -1608,10 +1610,10 @@ static u32 ioc3_get_link(struct net_device *dev)
static const struct ethtool_ops ioc3_ethtool_ops = { static const struct ethtool_ops ioc3_ethtool_ops = {
.get_drvinfo = ioc3_get_drvinfo, .get_drvinfo = ioc3_get_drvinfo,
.get_settings = ioc3_get_settings,
.set_settings = ioc3_set_settings,
.nway_reset = ioc3_nway_reset, .nway_reset = ioc3_nway_reset,
.get_link = ioc3_get_link, .get_link = ioc3_get_link,
.get_link_ksettings = ioc3_get_link_ksettings,
.set_link_ksettings = ioc3_set_link_ksettings,
}; };
static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)