Commit 28fa4f30 authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller

net: freescale: dpaa: 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: default avatarPhilippe Reynes <tremyfr@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 303b0d4b
...@@ -72,8 +72,8 @@ static char dpaa_stats_global[][ETH_GSTRING_LEN] = { ...@@ -72,8 +72,8 @@ static char dpaa_stats_global[][ETH_GSTRING_LEN] = {
#define DPAA_STATS_PERCPU_LEN ARRAY_SIZE(dpaa_stats_percpu) #define DPAA_STATS_PERCPU_LEN ARRAY_SIZE(dpaa_stats_percpu)
#define DPAA_STATS_GLOBAL_LEN ARRAY_SIZE(dpaa_stats_global) #define DPAA_STATS_GLOBAL_LEN ARRAY_SIZE(dpaa_stats_global)
static int dpaa_get_settings(struct net_device *net_dev, static int dpaa_get_link_ksettings(struct net_device *net_dev,
struct ethtool_cmd *et_cmd) struct ethtool_link_ksettings *cmd)
{ {
int err; int err;
...@@ -82,13 +82,13 @@ static int dpaa_get_settings(struct net_device *net_dev, ...@@ -82,13 +82,13 @@ static int dpaa_get_settings(struct net_device *net_dev,
return 0; return 0;
} }
err = phy_ethtool_gset(net_dev->phydev, et_cmd); err = phy_ethtool_ksettings_get(net_dev->phydev, cmd);
return err; return err;
} }
static int dpaa_set_settings(struct net_device *net_dev, static int dpaa_set_link_ksettings(struct net_device *net_dev,
struct ethtool_cmd *et_cmd) const struct ethtool_link_ksettings *cmd)
{ {
int err; int err;
...@@ -97,9 +97,9 @@ static int dpaa_set_settings(struct net_device *net_dev, ...@@ -97,9 +97,9 @@ static int dpaa_set_settings(struct net_device *net_dev,
return -ENODEV; return -ENODEV;
} }
err = phy_ethtool_sset(net_dev->phydev, et_cmd); err = phy_ethtool_ksettings_set(net_dev->phydev, cmd);
if (err < 0) if (err < 0)
netdev_err(net_dev, "phy_ethtool_sset() = %d\n", err); netdev_err(net_dev, "phy_ethtool_ksettings_set() = %d\n", err);
return err; return err;
} }
...@@ -402,8 +402,6 @@ static void dpaa_get_strings(struct net_device *net_dev, u32 stringset, ...@@ -402,8 +402,6 @@ static void dpaa_get_strings(struct net_device *net_dev, u32 stringset,
} }
const struct ethtool_ops dpaa_ethtool_ops = { const struct ethtool_ops dpaa_ethtool_ops = {
.get_settings = dpaa_get_settings,
.set_settings = dpaa_set_settings,
.get_drvinfo = dpaa_get_drvinfo, .get_drvinfo = dpaa_get_drvinfo,
.get_msglevel = dpaa_get_msglevel, .get_msglevel = dpaa_get_msglevel,
.set_msglevel = dpaa_set_msglevel, .set_msglevel = dpaa_set_msglevel,
...@@ -414,4 +412,6 @@ const struct ethtool_ops dpaa_ethtool_ops = { ...@@ -414,4 +412,6 @@ const struct ethtool_ops dpaa_ethtool_ops = {
.get_sset_count = dpaa_get_sset_count, .get_sset_count = dpaa_get_sset_count,
.get_ethtool_stats = dpaa_get_ethtool_stats, .get_ethtool_stats = dpaa_get_ethtool_stats,
.get_strings = dpaa_get_strings, .get_strings = dpaa_get_strings,
.get_link_ksettings = dpaa_get_link_ksettings,
.set_link_ksettings = dpaa_set_link_ksettings,
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment