|
@@ -763,24 +763,28 @@ static void mpc52xx_fec_reset(struct net_device *dev)
|
|
|
|
|
|
/* ethtool interface */
|
|
|
|
|
|
-static int mpc52xx_fec_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
|
|
+static int mpc52xx_fec_get_ksettings(struct net_device *dev,
|
|
|
+ struct ethtool_link_ksettings *cmd)
|
|
|
{
|
|
|
struct mpc52xx_fec_priv *priv = netdev_priv(dev);
|
|
|
+ struct phy_device *phydev = priv->phydev;
|
|
|
|
|
|
if (!priv->phydev)
|
|
|
return -ENODEV;
|
|
|
|
|
|
- return phy_ethtool_gset(priv->phydev, cmd);
|
|
|
+ return phy_ethtool_ksettings_get(phydev, cmd);
|
|
|
}
|
|
|
|
|
|
-static int mpc52xx_fec_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
|
|
+static int mpc52xx_fec_set_ksettings(struct net_device *dev,
|
|
|
+ const struct ethtool_link_ksettings *cmd)
|
|
|
{
|
|
|
struct mpc52xx_fec_priv *priv = netdev_priv(dev);
|
|
|
+ struct phy_device *phydev = priv->phydev;
|
|
|
|
|
|
if (!priv->phydev)
|
|
|
return -ENODEV;
|
|
|
|
|
|
- return phy_ethtool_sset(priv->phydev, cmd);
|
|
|
+ return phy_ethtool_ksettings_set(phydev, cmd);
|
|
|
}
|
|
|
|
|
|
static u32 mpc52xx_fec_get_msglevel(struct net_device *dev)
|
|
@@ -796,12 +800,12 @@ static void mpc52xx_fec_set_msglevel(struct net_device *dev, u32 level)
|
|
|
}
|
|
|
|
|
|
static const struct ethtool_ops mpc52xx_fec_ethtool_ops = {
|
|
|
- .get_settings = mpc52xx_fec_get_settings,
|
|
|
- .set_settings = mpc52xx_fec_set_settings,
|
|
|
.get_link = ethtool_op_get_link,
|
|
|
.get_msglevel = mpc52xx_fec_get_msglevel,
|
|
|
.set_msglevel = mpc52xx_fec_set_msglevel,
|
|
|
.get_ts_info = ethtool_op_get_ts_info,
|
|
|
+ .get_link_ksettings = mpc52xx_fec_get_ksettings,
|
|
|
+ .set_link_ksettings = mpc52xx_fec_set_ksettings,
|
|
|
};
|
|
|
|
|
|
|