net: tundra: tsi108: 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.

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>

diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c
index c5583991da4aa462652b5236992c7731529422db..5ac6eaa9e78510a2c28cf2506dd791ece82b3009 100644 (file)
--- a/drivers/net/ethernet/tundra/tsi108_eth.c
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
@@ -1499,27 +1499,29 @@ static void tsi108_init_mac(struct net_device *dev)
        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);
        unsigned long flags;
        int rc;
 
        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);
 
        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);
        unsigned long flags;
        int rc;
 
        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);
 
        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 = {
        .get_link       = ethtool_op_get_link,
-       .get_settings   = tsi108_get_settings,
-       .set_settings   = tsi108_set_settings,
+       .get_link_ksettings     = tsi108_get_link_ksettings,
+       .set_link_ksettings     = tsi108_set_link_ksettings,
 };
 
 static const struct net_device_ops tsi108_netdev_ops = {