net: faraday: ftmac100: 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: Philippe Reynes <tremyfr@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
index dce5f7b7f7729225d9bb9456a8c5d7e69be3bb2a..c0ddbbe6c2268939bf994bf6d2559f8995d26a84 100644 (file)
--- a/drivers/net/ethernet/faraday/ftmac100.c
+++ b/drivers/net/ethernet/faraday/ftmac100.c
@@ -825,16 +825,18 @@ static void ftmac100_get_drvinfo(struct net_device *netdev,
        strlcpy(info->bus_info, dev_name(&netdev->dev), sizeof(info->bus_info));
 }
 
-static int ftmac100_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
+static int ftmac100_get_link_ksettings(struct net_device *netdev,
+                                      struct ethtool_link_ksettings *cmd)
 {
        struct ftmac100 *priv = netdev_priv(netdev);
-       return mii_ethtool_gset(&priv->mii, cmd);
+       return mii_ethtool_get_link_ksettings(&priv->mii, cmd);
 }
 
-static int ftmac100_set_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
+static int ftmac100_set_link_ksettings(struct net_device *netdev,
+                                      const struct ethtool_link_ksettings *cmd)
 {
        struct ftmac100 *priv = netdev_priv(netdev);
-       return mii_ethtool_sset(&priv->mii, cmd);
+       return mii_ethtool_set_link_ksettings(&priv->mii, cmd);
 }
 
 static int ftmac100_nway_reset(struct net_device *netdev)
@@ -850,11 +852,11 @@ static u32 ftmac100_get_link(struct net_device *netdev)
 }
 
 static const struct ethtool_ops ftmac100_ethtool_ops = {
-       .set_settings           = ftmac100_set_settings,
-       .get_settings           = ftmac100_get_settings,
        .get_drvinfo            = ftmac100_get_drvinfo,
        .nway_reset             = ftmac100_nway_reset,
        .get_link               = ftmac100_get_link,
+       .get_link_ksettings     = ftmac100_get_link_ksettings,
+       .set_link_ksettings     = ftmac100_set_link_ksettings,
 };
 
 /******************************************************************************