renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-29 15:43:59 +08:00
Code

net: micrel: ks8851_mll: 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-09 11:28:25 +01:00 committed by David S. Miller
parent 98f2b09226
commit b6878eaf75
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/micrel/ks8851_mll.c
View File

@ -1311,16 +1311,18 @@ static void ks_set_msglevel(struct net_device *netdev, u32 to)
ks->msg_enable = to;
}
static int ks_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
static int ks_get_link_ksettings(struct net_device *netdev,
struct ethtool_link_ksettings *cmd)
{
struct ks_net *ks = netdev_priv(netdev);
return mii_ethtool_gset(&ks->mii, cmd);
return mii_ethtool_get_link_ksettings(&ks->mii, cmd);
}
static int ks_set_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
static int ks_set_link_ksettings(struct net_device *netdev,
const struct ethtool_link_ksettings *cmd)
{
struct ks_net *ks = netdev_priv(netdev);
return mii_ethtool_sset(&ks->mii, cmd);
return mii_ethtool_set_link_ksettings(&ks->mii, cmd);
}
static u32 ks_get_link(struct net_device *netdev)
@ -1339,10 +1341,10 @@ static const struct ethtool_ops ks_ethtool_ops = {
.get_drvinfo = ks_get_drvinfo,
.get_msglevel = ks_get_msglevel,
.set_msglevel = ks_set_msglevel,
.get_settings = ks_get_settings,
.set_settings = ks_set_settings,
.get_link = ks_get_link,
.nway_reset = ks_nway_reset,
.get_link_ksettings = ks_get_link_ksettings,
.set_link_ksettings = ks_set_link_ksettings,
};
/* MII interface controls */