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

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

fec: move to new ethtool api {get|set}_link_ksettings 



The ethtool api {get|set}_settings is deprecated.
We move the fec driver to new api {get|set}_link_ksettings.

Signed-off-by: default avatarPhilippe Reynes <tremyfr@gmail.com>
Acked-by: default avatarFugang Duan <fugang.duan@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d55173e

drivers/net/ethernet/freescale/fec_main.c

+8 −8
Original line number Diff line number Diff line
@@ -2058,8 +2058,8 @@ static void fec_enet_mii_remove(struct fec_enet_private *fep) 
	}

}



static int fec_enet_get_settings(struct net_device *ndev,

				  struct ethtool_cmd *cmd)

static int fec_enet_get_link_ksettings(struct net_device *ndev,

				       struct ethtool_link_ksettings *cmd)

{

	struct fec_enet_private *fep = netdev_priv(ndev);

	struct phy_device *phydev = fep->phy_dev;
@@ -2067,11 +2067,11 @@ static int fec_enet_get_settings(struct net_device *ndev, 
	if (!phydev)

		return -ENODEV;



	return phy_ethtool_gset(phydev, cmd);

	return phy_ethtool_ksettings_get(phydev, cmd);

}



static int fec_enet_set_settings(struct net_device *ndev,

				 struct ethtool_cmd *cmd)

static int fec_enet_set_link_ksettings(struct net_device *ndev,

				       const struct ethtool_link_ksettings *cmd)

{

	struct fec_enet_private *fep = netdev_priv(ndev);

	struct phy_device *phydev = fep->phy_dev;
@@ -2079,7 +2079,7 @@ static int fec_enet_set_settings(struct net_device *ndev, 
	if (!phydev)

		return -ENODEV;



	return phy_ethtool_sset(phydev, cmd);

	return phy_ethtool_ksettings_set(phydev, cmd);

}



static void fec_enet_get_drvinfo(struct net_device *ndev,
@@ -2562,8 +2562,6 @@ fec_enet_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol) 
}



static const struct ethtool_ops fec_enet_ethtool_ops = {

	.get_settings		= fec_enet_get_settings,

	.set_settings		= fec_enet_set_settings,

	.get_drvinfo		= fec_enet_get_drvinfo,

	.get_regs_len		= fec_enet_get_regs_len,

	.get_regs		= fec_enet_get_regs,
@@ -2583,6 +2581,8 @@ static const struct ethtool_ops fec_enet_ethtool_ops = { 
	.set_tunable		= fec_enet_set_tunable,

	.get_wol		= fec_enet_get_wol,

	.set_wol		= fec_enet_set_wol,

	.get_link_ksettings	= fec_enet_get_link_ksettings,

	.set_link_ksettings	= fec_enet_set_link_ksettings,

};



static int fec_enet_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)