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

net: dsa: slave: 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 6e76510e

net/dsa/slave.c

+8 −6
Original line number Diff line number Diff line
@@ -641,7 +641,8 @@ static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev) 


/* ethtool operations *******************************************************/

static int

dsa_slave_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)

dsa_slave_get_link_ksettings(struct net_device *dev,

			     struct ethtool_link_ksettings *cmd)

{

	struct dsa_slave_priv *p = netdev_priv(dev);

	int err;
@@ -650,19 +651,20 @@ dsa_slave_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
	if (p->phy != NULL) {

		err = phy_read_status(p->phy);

		if (err == 0)

			err = phy_ethtool_gset(p->phy, cmd);

			err = phy_ethtool_ksettings_get(p->phy, cmd);

	}



	return err;

}



static int

dsa_slave_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)

dsa_slave_set_link_ksettings(struct net_device *dev,

			     const struct ethtool_link_ksettings *cmd)

{

	struct dsa_slave_priv *p = netdev_priv(dev);



	if (p->phy != NULL)

		return phy_ethtool_sset(p->phy, cmd);

		return phy_ethtool_ksettings_set(p->phy, cmd);



	return -EOPNOTSUPP;

}
@@ -990,8 +992,6 @@ void dsa_cpu_port_ethtool_init(struct ethtool_ops *ops) 
}



static const struct ethtool_ops dsa_slave_ethtool_ops = {

	.get_settings		= dsa_slave_get_settings,

	.set_settings		= dsa_slave_set_settings,

	.get_drvinfo		= dsa_slave_get_drvinfo,

	.get_regs_len		= dsa_slave_get_regs_len,

	.get_regs		= dsa_slave_get_regs,
@@ -1007,6 +1007,8 @@ static const struct ethtool_ops dsa_slave_ethtool_ops = { 
	.get_wol		= dsa_slave_get_wol,

	.set_eee		= dsa_slave_set_eee,

	.get_eee		= dsa_slave_get_eee,

	.get_link_ksettings	= dsa_slave_get_link_ksettings,

	.set_link_ksettings	= dsa_slave_set_link_ksettings,

};



static const struct net_device_ops dsa_slave_netdev_ops = {