staging: net: netlogic: use new api ethtool_{get|set}_link_ksettings
authorPhilippe Reynes <tremyfr@gmail.com>
Sun, 9 Oct 2016 13:58:39 +0000 (15:58 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 16 Oct 2016 08:25:57 +0000 (10:25 +0200)
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/netlogic/xlr_net.c

index 552a7dcbf50bb8497c007ead50576ff285cbf514..cdf01b931296308ba77a688dda0f1c6ac07a83d7 100644 (file)
@@ -172,29 +172,31 @@ static struct phy_device *xlr_get_phydev(struct xlr_net_priv *priv)
 /*
  * Ethtool operation
  */
-static int xlr_get_settings(struct net_device *ndev, struct ethtool_cmd *ecmd)
+static int xlr_get_link_ksettings(struct net_device *ndev,
+                                 struct ethtool_link_ksettings *ecmd)
 {
        struct xlr_net_priv *priv = netdev_priv(ndev);
        struct phy_device *phydev = xlr_get_phydev(priv);
 
        if (!phydev)
                return -ENODEV;
-       return phy_ethtool_gset(phydev, ecmd);
+       return phy_ethtool_ksettings_get(phydev, ecmd);
 }
 
-static int xlr_set_settings(struct net_device *ndev, struct ethtool_cmd *ecmd)
+static int xlr_set_link_ksettings(struct net_device *ndev,
+                                 const struct ethtool_link_ksettings *ecmd)
 {
        struct xlr_net_priv *priv = netdev_priv(ndev);
        struct phy_device *phydev = xlr_get_phydev(priv);
 
        if (!phydev)
                return -ENODEV;
-       return phy_ethtool_sset(phydev, ecmd);
+       return phy_ethtool_ksettings_set(phydev, ecmd);
 }
 
 static const struct ethtool_ops xlr_ethtool_ops = {
-       .get_settings = xlr_get_settings,
-       .set_settings = xlr_set_settings,
+       .get_link_ksettings = xlr_get_link_ksettings,
+       .set_link_ksettings = xlr_set_link_ksettings,
 };
 
 /*