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

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

net: ethernet: fs-enet: move to new ethtool api {get|set}_link_ksettings 



The ethtool api {get|set}_settings is deprecated.
We move the fs-enet 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 5e74bf2d

drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c

+10 −6
Original line number Diff line number Diff line
@@ -847,24 +847,28 @@ static void fs_get_regs(struct net_device *dev, struct ethtool_regs *regs, 
		regs->version = 0;

}



static int fs_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)

static int fs_get_ksettings(struct net_device *dev,

			    struct ethtool_link_ksettings *cmd)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	struct phy_device *phydev = fep->phydev;



	if (!fep->phydev)

		return -ENODEV;



	return phy_ethtool_gset(fep->phydev, cmd);

	return phy_ethtool_ksettings_get(phydev, cmd);

}



static int fs_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)

static int fs_set_ksettings(struct net_device *dev,

			    const struct ethtool_link_ksettings *cmd)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	struct phy_device *phydev = fep->phydev;



	if (!fep->phydev)

		return -ENODEV;



	return phy_ethtool_sset(fep->phydev, cmd);

	return phy_ethtool_ksettings_set(phydev, cmd);

}



static int fs_nway_reset(struct net_device *dev)
@@ -887,14 +891,14 @@ static void fs_set_msglevel(struct net_device *dev, u32 value) 
static const struct ethtool_ops fs_ethtool_ops = {

	.get_drvinfo = fs_get_drvinfo,

	.get_regs_len = fs_get_regs_len,

	.get_settings = fs_get_settings,

	.set_settings = fs_set_settings,

	.nway_reset = fs_nway_reset,

	.get_link = ethtool_op_get_link,

	.get_msglevel = fs_get_msglevel,

	.set_msglevel = fs_set_msglevel,

	.get_regs = fs_get_regs,

	.get_ts_info = ethtool_op_get_ts_info,

	.get_link_ksettings = fs_get_ksettings,

	.set_link_ksettings = fs_set_ksettings,

};



static int fs_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)