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

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

net: tundra: tsi108: 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 01461abe

drivers/net/ethernet/tundra/tsi108_eth.c

+8 −6
Original line number Diff line number Diff line
@@ -1499,27 +1499,29 @@ static void tsi108_init_mac(struct net_device *dev) 
	TSI_WRITE(TSI108_EC_INTMASK, ~0);

}



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

static int tsi108_get_link_ksettings(struct net_device *dev,

				     struct ethtool_link_ksettings *cmd)

{

	struct tsi108_prv_data *data = netdev_priv(dev);

	unsigned long flags;

	int rc;



	spin_lock_irqsave(&data->txlock, flags);

	rc = mii_ethtool_gset(&data->mii_if, cmd);

	rc = mii_ethtool_get_link_ksettings(&data->mii_if, cmd);

	spin_unlock_irqrestore(&data->txlock, flags);



	return rc;

}



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

static int tsi108_set_link_ksettings(struct net_device *dev,

				     const struct ethtool_link_ksettings *cmd)

{

	struct tsi108_prv_data *data = netdev_priv(dev);

	unsigned long flags;

	int rc;



	spin_lock_irqsave(&data->txlock, flags);

	rc = mii_ethtool_sset(&data->mii_if, cmd);

	rc = mii_ethtool_set_link_ksettings(&data->mii_if, cmd);

	spin_unlock_irqrestore(&data->txlock, flags);



	return rc;
@@ -1535,8 +1537,8 @@ static int tsi108_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 


static const struct ethtool_ops tsi108_ethtool_ops = {

	.get_link 	= ethtool_op_get_link,

	.get_settings	= tsi108_get_settings,

	.set_settings	= tsi108_set_settings,

	.get_link_ksettings	= tsi108_get_link_ksettings,

	.set_link_ksettings	= tsi108_set_link_ksettings,

};



static const struct net_device_ops tsi108_netdev_ops = {