|
@@ -1558,25 +1558,27 @@ static void ioc3_get_drvinfo (struct net_device *dev,
|
|
|
strlcpy(info->bus_info, pci_name(ip->pdev), sizeof(info->bus_info));
|
|
|
}
|
|
|
|
|
|
-static int ioc3_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
|
|
+static int ioc3_get_link_ksettings(struct net_device *dev,
|
|
|
+ struct ethtool_link_ksettings *cmd)
|
|
|
{
|
|
|
struct ioc3_private *ip = netdev_priv(dev);
|
|
|
int rc;
|
|
|
|
|
|
spin_lock_irq(&ip->ioc3_lock);
|
|
|
- rc = mii_ethtool_gset(&ip->mii, cmd);
|
|
|
+ rc = mii_ethtool_get_link_ksettings(&ip->mii, cmd);
|
|
|
spin_unlock_irq(&ip->ioc3_lock);
|
|
|
|
|
|
return rc;
|
|
|
}
|
|
|
|
|
|
-static int ioc3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
|
|
+static int ioc3_set_link_ksettings(struct net_device *dev,
|
|
|
+ const struct ethtool_link_ksettings *cmd)
|
|
|
{
|
|
|
struct ioc3_private *ip = netdev_priv(dev);
|
|
|
int rc;
|
|
|
|
|
|
spin_lock_irq(&ip->ioc3_lock);
|
|
|
- rc = mii_ethtool_sset(&ip->mii, cmd);
|
|
|
+ rc = mii_ethtool_set_link_ksettings(&ip->mii, cmd);
|
|
|
spin_unlock_irq(&ip->ioc3_lock);
|
|
|
|
|
|
return rc;
|
|
@@ -1608,10 +1610,10 @@ static u32 ioc3_get_link(struct net_device *dev)
|
|
|
|
|
|
static const struct ethtool_ops ioc3_ethtool_ops = {
|
|
|
.get_drvinfo = ioc3_get_drvinfo,
|
|
|
- .get_settings = ioc3_get_settings,
|
|
|
- .set_settings = ioc3_set_settings,
|
|
|
.nway_reset = ioc3_nway_reset,
|
|
|
.get_link = ioc3_get_link,
|
|
|
+ .get_link_ksettings = ioc3_get_link_ksettings,
|
|
|
+ .set_link_ksettings = ioc3_set_link_ksettings,
|
|
|
};
|
|
|
|
|
|
static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
|