korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: sis: sis190: use new api ethtool_{get|set}_link_ksettings

Browse Source 
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: Philippe Reynes <tremyfr@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Philippe Reynes 2017-02-27 23:06:41 +01:00 committed by David S. Miller
parent a972c3062f
commit fb70eb20fe
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/sis/sis190.c
View File

@ -1734,18 +1734,20 @@ static void sis190_set_speed_auto(struct net_device *dev)
BMCR_ANENABLE | BMCR_ANRESTART | BMCR_RESET); BMCR_ANENABLE | BMCR_ANRESTART | BMCR_RESET);
} }
static int sis190_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int sis190_get_link_ksettings(struct net_device *dev,
struct ethtool_link_ksettings *cmd)
{ {
struct sis190_private *tp = netdev_priv(dev); struct sis190_private *tp = netdev_priv(dev);
return mii_ethtool_gset(&tp->mii_if, cmd); return mii_ethtool_get_link_ksettings(&tp->mii_if, cmd);
} }
static int sis190_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int sis190_set_link_ksettings(struct net_device *dev,
const struct ethtool_link_ksettings *cmd)
{ {
struct sis190_private *tp = netdev_priv(dev); struct sis190_private *tp = netdev_priv(dev);
return mii_ethtool_sset(&tp->mii_if, cmd); return mii_ethtool_set_link_ksettings(&tp->mii_if, cmd);
} }
static void sis190_get_drvinfo(struct net_device *dev, static void sis190_get_drvinfo(struct net_device *dev,
@ -1797,8 +1799,6 @@ static void sis190_set_msglevel(struct net_device *dev, u32 value)
} }
static const struct ethtool_ops sis190_ethtool_ops = { static const struct ethtool_ops sis190_ethtool_ops = {
.get_settings = sis190_get_settings,
.set_settings = sis190_set_settings,
.get_drvinfo = sis190_get_drvinfo, .get_drvinfo = sis190_get_drvinfo,
.get_regs_len = sis190_get_regs_len, .get_regs_len = sis190_get_regs_len,
.get_regs = sis190_get_regs, .get_regs = sis190_get_regs,
@ -1806,6 +1806,8 @@ static const struct ethtool_ops sis190_ethtool_ops = {
.get_msglevel = sis190_get_msglevel, .get_msglevel = sis190_get_msglevel,
.set_msglevel = sis190_set_msglevel, .set_msglevel = sis190_set_msglevel,
.nway_reset = sis190_nway_reset, .nway_reset = sis190_nway_reset,
.get_link_ksettings = sis190_get_link_ksettings,
.set_link_ksettings = sis190_set_link_ksettings,
}; };
static int sis190_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) static int sis190_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)