| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame^] | 1 | From c77e142beed7241a1360f2dedbe34e2f697512c9 Mon Sep 17 00:00:00 2001 |
| 2 | From: Madalin Bucur <madalin.bucur@nxp.com> |
| 3 | Date: Tue, 29 Aug 2017 09:51:45 +0300 |
| 4 | Subject: [PATCH] sdk_dpaa: use new api ethtool_ksettings_{get|set} |
| 5 | |
| 6 | Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com> |
| 7 | --- |
| 8 | .../net/ethernet/freescale/sdk_dpaa/dpaa_ethtool.c | 20 +++++++++----------- |
| 9 | 1 file changed, 9 insertions(+), 11 deletions(-) |
| 10 | |
| 11 | --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_ethtool.c |
| 12 | +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_ethtool.c |
| 13 | @@ -84,8 +84,8 @@ static char dpa_stats_global[][ETH_GSTRI |
| 14 | #define DPA_STATS_PERCPU_LEN ARRAY_SIZE(dpa_stats_percpu) |
| 15 | #define DPA_STATS_GLOBAL_LEN ARRAY_SIZE(dpa_stats_global) |
| 16 | |
| 17 | -static int __cold dpa_get_settings(struct net_device *net_dev, |
| 18 | - struct ethtool_cmd *et_cmd) |
| 19 | +static int __cold dpa_get_ksettings(struct net_device *net_dev, |
| 20 | + struct ethtool_link_ksettings *cmd) |
| 21 | { |
| 22 | int _errno; |
| 23 | struct dpa_priv_s *priv; |
| 24 | @@ -101,15 +101,13 @@ static int __cold dpa_get_settings(struc |
| 25 | return 0; |
| 26 | } |
| 27 | |
| 28 | - _errno = phy_ethtool_gset(priv->mac_dev->phy_dev, et_cmd); |
| 29 | - if (unlikely(_errno < 0)) |
| 30 | - netdev_err(net_dev, "phy_ethtool_gset() = %d\n", _errno); |
| 31 | + phy_ethtool_ksettings_get(priv->mac_dev->phy_dev, cmd); |
| 32 | |
| 33 | return _errno; |
| 34 | } |
| 35 | |
| 36 | -static int __cold dpa_set_settings(struct net_device *net_dev, |
| 37 | - struct ethtool_cmd *et_cmd) |
| 38 | +static int __cold dpa_set_ksettings(struct net_device *net_dev, |
| 39 | + struct ethtool_link_ksettings *cmd) |
| 40 | { |
| 41 | int _errno; |
| 42 | struct dpa_priv_s *priv; |
| 43 | @@ -125,9 +123,9 @@ static int __cold dpa_set_settings(struc |
| 44 | return -ENODEV; |
| 45 | } |
| 46 | |
| 47 | - _errno = phy_ethtool_sset(priv->mac_dev->phy_dev, et_cmd); |
| 48 | + _errno = phy_ethtool_ksettings_set(priv->mac_dev->phy_dev, cmd); |
| 49 | if (unlikely(_errno < 0)) |
| 50 | - netdev_err(net_dev, "phy_ethtool_sset() = %d\n", _errno); |
| 51 | + netdev_err(net_dev, "phy_ethtool_ksettings_set() = %d\n", _errno); |
| 52 | |
| 53 | return _errno; |
| 54 | } |
| 55 | @@ -522,8 +520,8 @@ static void dpa_get_strings(struct net_d |
| 56 | } |
| 57 | |
| 58 | const struct ethtool_ops dpa_ethtool_ops = { |
| 59 | - .get_settings = dpa_get_settings, |
| 60 | - .set_settings = dpa_set_settings, |
| 61 | + .get_link_ksettings = dpa_get_ksettings, |
| 62 | + .set_link_ksettings = dpa_set_ksettings, |
| 63 | .get_drvinfo = dpa_get_drvinfo, |
| 64 | .get_msglevel = dpa_get_msglevel, |
| 65 | .set_msglevel = dpa_set_msglevel, |