net: bcmgenet: 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>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 55cbe2ed2929..4464bc5db934 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -450,8 +450,8 @@ static inline void bcmgenet_rdma_ring_writel(struct bcmgenet_priv *priv,
                         genet_dma_ring_regs[r]);
 }
 
-static int bcmgenet_get_settings(struct net_device *dev,
-                                 struct ethtool_cmd *cmd)
+static int bcmgenet_get_link_ksettings(struct net_device *dev,
+                                       struct ethtool_link_ksettings *cmd)
 {
         struct bcmgenet_priv *priv = netdev_priv(dev);
 
@@ -461,11 +461,11 @@ static int bcmgenet_get_settings(struct net_device *dev,
         if (!priv->phydev)
                 return -ENODEV;
 
-        return phy_ethtool_gset(priv->phydev, cmd);
+        return phy_ethtool_ksettings_get(priv->phydev, cmd);
 }
 
-static int bcmgenet_set_settings(struct net_device *dev,
-                                 struct ethtool_cmd *cmd)
+static int bcmgenet_set_link_ksettings(struct net_device *dev,
+                                       const struct ethtool_link_ksettings *cmd)
 {
         struct bcmgenet_priv *priv = netdev_priv(dev);
 
@@ -475,7 +475,7 @@ static int bcmgenet_set_settings(struct net_device *dev,
         if (!priv->phydev)
                 return -ENODEV;
 
-        return phy_ethtool_sset(priv->phydev, cmd);
+        return phy_ethtool_ksettings_set(priv->phydev, cmd);
 }
 
 static int bcmgenet_set_rx_csum(struct net_device *dev,
@@ -983,8 +983,6 @@ static const struct ethtool_ops bcmgenet_ethtool_ops = {
         .get_strings            = bcmgenet_get_strings,
         .get_sset_count         = bcmgenet_get_sset_count,
         .get_ethtool_stats      = bcmgenet_get_ethtool_stats,
-        .get_settings           = bcmgenet_get_settings,
-        .set_settings           = bcmgenet_set_settings,
         .get_drvinfo            = bcmgenet_get_drvinfo,
         .get_link               = ethtool_op_get_link,
         .get_msglevel           = bcmgenet_get_msglevel,
@@ -996,6 +994,8 @@ static const struct ethtool_ops bcmgenet_ethtool_ops = {
         .nway_reset             = bcmgenet_nway_reset,
         .get_coalesce           = bcmgenet_get_coalesce,
         .set_coalesce           = bcmgenet_set_coalesce,
+        .get_link_ksettings     = bcmgenet_get_link_ksettings,
+        .set_link_ksettings     = bcmgenet_set_link_ksettings,
 };
 
 /* Power down the unimac, based on mode. */