iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: tundra: tsi108: 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-03-06 23:26:09 +01:00 committed by David S. Miller
parent 01461abe62
commit 99bdb400f7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/tundra/tsi108_eth.c
View File

@ -1499,27 +1499,29 @@ static void tsi108_init_mac(struct net_device *dev)
TSI_WRITE(TSI108_EC_INTMASK, ~0); TSI_WRITE(TSI108_EC_INTMASK, ~0);
} }
static int tsi108_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int tsi108_get_link_ksettings(struct net_device *dev,
struct ethtool_link_ksettings *cmd)
{ {
struct tsi108_prv_data *data = netdev_priv(dev); struct tsi108_prv_data *data = netdev_priv(dev);
unsigned long flags; unsigned long flags;
int rc; int rc;
spin_lock_irqsave(&data->txlock, flags); spin_lock_irqsave(&data->txlock, flags);
rc = mii_ethtool_gset(&data->mii_if, cmd); rc = mii_ethtool_get_link_ksettings(&data->mii_if, cmd);
spin_unlock_irqrestore(&data->txlock, flags); spin_unlock_irqrestore(&data->txlock, flags);
return rc; return rc;
} }
static int tsi108_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int tsi108_set_link_ksettings(struct net_device *dev,
const struct ethtool_link_ksettings *cmd)
{ {
struct tsi108_prv_data *data = netdev_priv(dev); struct tsi108_prv_data *data = netdev_priv(dev);
unsigned long flags; unsigned long flags;
int rc; int rc;
spin_lock_irqsave(&data->txlock, flags); spin_lock_irqsave(&data->txlock, flags);
rc = mii_ethtool_sset(&data->mii_if, cmd); rc = mii_ethtool_set_link_ksettings(&data->mii_if, cmd);
spin_unlock_irqrestore(&data->txlock, flags); spin_unlock_irqrestore(&data->txlock, flags);
return rc; return rc;
@ -1535,8 +1537,8 @@ static int tsi108_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
static const struct ethtool_ops tsi108_ethtool_ops = { static const struct ethtool_ops tsi108_ethtool_ops = {
.get_link = ethtool_op_get_link, .get_link = ethtool_op_get_link,
.get_settings = tsi108_get_settings, .get_link_ksettings = tsi108_get_link_ksettings,
.set_settings = tsi108_set_settings, .set_link_ksettings = tsi108_set_link_ksettings,
}; };
static const struct net_device_ops tsi108_netdev_ops = { static const struct net_device_ops tsi108_netdev_ops = {