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

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

net: nuvoton: w90p910: 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 08041ff2

drivers/net/ethernet/nuvoton/w90p910_ether.c

+8 −6
Original line number Diff line number Diff line
@@ -874,16 +874,18 @@ static void w90p910_get_drvinfo(struct net_device *dev, 
	strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version));

}



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

static int w90p910_get_link_ksettings(struct net_device *dev,

				      struct ethtool_link_ksettings *cmd)

{

	struct w90p910_ether *ether = netdev_priv(dev);

	return mii_ethtool_gset(&ether->mii, cmd);

	return mii_ethtool_get_link_ksettings(&ether->mii, cmd);

}



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

static int w90p910_set_link_ksettings(struct net_device *dev,

				      const struct ethtool_link_ksettings *cmd)

{

	struct w90p910_ether *ether = netdev_priv(dev);

	return mii_ethtool_sset(&ether->mii, cmd);

	return mii_ethtool_set_link_ksettings(&ether->mii, cmd);

}



static int w90p910_nway_reset(struct net_device *dev)
@@ -899,11 +901,11 @@ static u32 w90p910_get_link(struct net_device *dev) 
}



static const struct ethtool_ops w90p910_ether_ethtool_ops = {

	.get_settings	= w90p910_get_settings,

	.set_settings	= w90p910_set_settings,

	.get_drvinfo	= w90p910_get_drvinfo,

	.nway_reset	= w90p910_nway_reset,

	.get_link	= w90p910_get_link,

	.get_link_ksettings = w90p910_get_link_ksettings,

	.set_link_ksettings = w90p910_set_link_ksettings,

};



static const struct net_device_ops w90p910_ether_netdev_ops = {