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

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

net: ethernet: broadcom: bcmgenet: 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 639cfa9e

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+8 −8
Original line number Diff line number Diff line
@@ -450,8 +450,8 @@ static inline void bcmgenet_rdma_ring_writel(struct bcmgenet_priv *priv, 
			genet_dma_ring_regs[r]);

}



static int bcmgenet_get_settings(struct net_device *dev,

				 struct ethtool_cmd *cmd)

static int bcmgenet_get_link_ksettings(struct net_device *dev,

				       struct ethtool_link_ksettings *cmd)

{

	if (!netif_running(dev))

		return -EINVAL;
@@ -459,11 +459,11 @@ static int bcmgenet_get_settings(struct net_device *dev, 
	if (!dev->phydev)

		return -ENODEV;



	return phy_ethtool_gset(dev->phydev, cmd);

	return phy_ethtool_ksettings_get(dev->phydev, cmd);

}



static int bcmgenet_set_settings(struct net_device *dev,

				 struct ethtool_cmd *cmd)

static int bcmgenet_set_link_ksettings(struct net_device *dev,

				       const struct ethtool_link_ksettings *cmd)

{

	if (!netif_running(dev))

		return -EINVAL;
@@ -471,7 +471,7 @@ static int bcmgenet_set_settings(struct net_device *dev, 
	if (!dev->phydev)

		return -ENODEV;



	return phy_ethtool_sset(dev->phydev, cmd);

	return phy_ethtool_ksettings_set(dev->phydev, cmd);

}



static int bcmgenet_set_rx_csum(struct net_device *dev,
@@ -977,8 +977,6 @@ static const struct ethtool_ops bcmgenet_ethtool_ops = { 
	.get_strings		= bcmgenet_get_strings,

	.get_sset_count		= bcmgenet_get_sset_count,

	.get_ethtool_stats	= bcmgenet_get_ethtool_stats,

	.get_settings		= bcmgenet_get_settings,

	.set_settings		= bcmgenet_set_settings,

	.get_drvinfo		= bcmgenet_get_drvinfo,

	.get_link		= ethtool_op_get_link,

	.get_msglevel		= bcmgenet_get_msglevel,
@@ -990,6 +988,8 @@ static const struct ethtool_ops bcmgenet_ethtool_ops = { 
	.nway_reset		= bcmgenet_nway_reset,

	.get_coalesce		= bcmgenet_get_coalesce,

	.set_coalesce		= bcmgenet_set_coalesce,

	.get_link_ksettings	= bcmgenet_get_link_ksettings,

	.set_link_ksettings	= bcmgenet_set_link_ksettings,

};



/* Power down the unimac, based on mode. */