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

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

net: sis: sis900: 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.

As I don't have the hardware, I'd be very pleased if
someone may test this patch.

Signed-off-by: default avatarPhilippe Reynes <tremyfr@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fb70eb20

drivers/net/ethernet/sis/sis900.c

+9 −9
Original line number Diff line number Diff line
@@ -2035,23 +2035,23 @@ static u32 sis900_get_link(struct net_device *net_dev) 
	return mii_link_ok(&sis_priv->mii_info);

}



static int sis900_get_settings(struct net_device *net_dev,

				struct ethtool_cmd *cmd)

static int sis900_get_link_ksettings(struct net_device *net_dev,

				     struct ethtool_link_ksettings *cmd)

{

	struct sis900_private *sis_priv = netdev_priv(net_dev);

	spin_lock_irq(&sis_priv->lock);

	mii_ethtool_gset(&sis_priv->mii_info, cmd);

	mii_ethtool_get_link_ksettings(&sis_priv->mii_info, cmd);

	spin_unlock_irq(&sis_priv->lock);

	return 0;

}



static int sis900_set_settings(struct net_device *net_dev,

				struct ethtool_cmd *cmd)

static int sis900_set_link_ksettings(struct net_device *net_dev,

				     const struct ethtool_link_ksettings *cmd)

{

	struct sis900_private *sis_priv = netdev_priv(net_dev);

	int rt;

	spin_lock_irq(&sis_priv->lock);

	rt = mii_ethtool_sset(&sis_priv->mii_info, cmd);

	rt = mii_ethtool_set_link_ksettings(&sis_priv->mii_info, cmd);

	spin_unlock_irq(&sis_priv->lock);

	return rt;

}
@@ -2129,11 +2129,11 @@ static const struct ethtool_ops sis900_ethtool_ops = { 
	.get_msglevel	= sis900_get_msglevel,

	.set_msglevel	= sis900_set_msglevel,

	.get_link	= sis900_get_link,

	.get_settings	= sis900_get_settings,

	.set_settings	= sis900_set_settings,

	.nway_reset	= sis900_nway_reset,

	.get_wol	= sis900_get_wol,

	.set_wol	= sis900_set_wol

	.set_wol	= sis900_set_wol,

	.get_link_ksettings = sis900_get_link_ksettings,

	.set_link_ksettings = sis900_set_link_ksettings,

};



/**