Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c

+9 −9
Original line number Diff line number Diff line
@@ -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_GLOBAL_LEN ARRAY_SIZE(dpaa_stats_global)



static int dpaa_get_settings(struct net_device *net_dev,

			     struct ethtool_cmd *et_cmd)

static int dpaa_get_link_ksettings(struct net_device *net_dev,

				   struct ethtool_link_ksettings *cmd)

{

	int err;
@@ -82,13 +82,13 @@ static int dpaa_get_settings(struct net_device *net_dev, 
		return 0;

	}



	err = phy_ethtool_gset(net_dev->phydev, et_cmd);

	err = phy_ethtool_ksettings_get(net_dev->phydev, cmd);



	return err;

}



static int dpaa_set_settings(struct net_device *net_dev,

			     struct ethtool_cmd *et_cmd)

static int dpaa_set_link_ksettings(struct net_device *net_dev,

				   const struct ethtool_link_ksettings *cmd)

{

	int err;
@@ -97,9 +97,9 @@ static int dpaa_set_settings(struct net_device *net_dev, 
		return -ENODEV;

	}



	err = phy_ethtool_sset(net_dev->phydev, et_cmd);

	err = phy_ethtool_ksettings_set(net_dev->phydev, cmd);

	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;

}
@@ -402,8 +402,6 @@ static void dpaa_get_strings(struct net_device *net_dev, u32 stringset, 
}



const struct ethtool_ops dpaa_ethtool_ops = {

	.get_settings = dpaa_get_settings,

	.set_settings = dpaa_set_settings,

	.get_drvinfo = dpaa_get_drvinfo,

	.get_msglevel = dpaa_get_msglevel,

	.set_msglevel = dpaa_set_msglevel,
@@ -414,4 +412,6 @@ const struct ethtool_ops dpaa_ethtool_ops = { 
	.get_sset_count = dpaa_get_sset_count,

	.get_ethtool_stats = dpaa_get_ethtool_stats,

	.get_strings = dpaa_get_strings,

	.get_link_ksettings = dpaa_get_link_ksettings,

	.set_link_ksettings = dpaa_set_link_ksettings,

};