Commit af473688 authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller

net: korina: 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: default avatarPhilippe Reynes <tremyfr@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b8128c42
...@@ -695,25 +695,27 @@ static void netdev_get_drvinfo(struct net_device *dev, ...@@ -695,25 +695,27 @@ static void netdev_get_drvinfo(struct net_device *dev,
strlcpy(info->bus_info, lp->dev->name, sizeof(info->bus_info)); strlcpy(info->bus_info, lp->dev->name, 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 korina_private *lp = netdev_priv(dev); struct korina_private *lp = netdev_priv(dev);
int rc; int rc;
spin_lock_irq(&lp->lock); spin_lock_irq(&lp->lock);
rc = mii_ethtool_gset(&lp->mii_if, cmd); rc = mii_ethtool_get_link_ksettings(&lp->mii_if, cmd);
spin_unlock_irq(&lp->lock); spin_unlock_irq(&lp->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 korina_private *lp = netdev_priv(dev); struct korina_private *lp = netdev_priv(dev);
int rc; int rc;
spin_lock_irq(&lp->lock); spin_lock_irq(&lp->lock);
rc = mii_ethtool_sset(&lp->mii_if, cmd); rc = mii_ethtool_set_link_ksettings(&lp->mii_if, cmd);
spin_unlock_irq(&lp->lock); spin_unlock_irq(&lp->lock);
korina_set_carrier(&lp->mii_if); korina_set_carrier(&lp->mii_if);
...@@ -729,9 +731,9 @@ static u32 netdev_get_link(struct net_device *dev) ...@@ -729,9 +731,9 @@ static u32 netdev_get_link(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,
.get_link = netdev_get_link, .get_link = netdev_get_link,
.get_link_ksettings = netdev_get_link_ksettings,
.set_link_ksettings = netdev_set_link_ksettings,
}; };
static int korina_alloc_ring(struct net_device *dev) static int korina_alloc_ring(struct net_device *dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment