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

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

net: adaptec: starfire: 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 35887d32

drivers/net/ethernet/adaptec/starfire.c

+8 −6
Original line number Diff line number Diff line
@@ -1816,21 +1816,23 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) 
	strlcpy(info->bus_info, pci_name(np->pci_dev), sizeof(info->bus_info));

}



static int get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)

static int get_link_ksettings(struct net_device *dev,

			      struct ethtool_link_ksettings *cmd)

{

	struct netdev_private *np = netdev_priv(dev);

	spin_lock_irq(&np->lock);

	mii_ethtool_gset(&np->mii_if, ecmd);

	mii_ethtool_get_link_ksettings(&np->mii_if, cmd);

	spin_unlock_irq(&np->lock);

	return 0;

}



static int set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)

static int set_link_ksettings(struct net_device *dev,

			      const struct ethtool_link_ksettings *cmd)

{

	struct netdev_private *np = netdev_priv(dev);

	int res;

	spin_lock_irq(&np->lock);

	res = mii_ethtool_sset(&np->mii_if, ecmd);

	res = mii_ethtool_set_link_ksettings(&np->mii_if, cmd);

	spin_unlock_irq(&np->lock);

	check_duplex(dev);

	return res;
@@ -1861,12 +1863,12 @@ static void set_msglevel(struct net_device *dev, u32 val) 
static const struct ethtool_ops ethtool_ops = {

	.begin = check_if_running,

	.get_drvinfo = get_drvinfo,

	.get_settings = get_settings,

	.set_settings = set_settings,

	.nway_reset = nway_reset,

	.get_link = get_link,

	.get_msglevel = get_msglevel,

	.set_msglevel = set_msglevel,

	.get_link_ksettings = get_link_ksettings,

	.set_link_ksettings = set_link_ksettings,

};



static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)