Commit b6878eaf authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller

net: micrel: ks8851_mll: 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 98f2b092
...@@ -1311,16 +1311,18 @@ static void ks_set_msglevel(struct net_device *netdev, u32 to) ...@@ -1311,16 +1311,18 @@ static void ks_set_msglevel(struct net_device *netdev, u32 to)
ks->msg_enable = 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); 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); 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) static u32 ks_get_link(struct net_device *netdev)
...@@ -1339,10 +1341,10 @@ static const struct ethtool_ops ks_ethtool_ops = { ...@@ -1339,10 +1341,10 @@ static const struct ethtool_ops ks_ethtool_ops = {
.get_drvinfo = ks_get_drvinfo, .get_drvinfo = ks_get_drvinfo,
.get_msglevel = ks_get_msglevel, .get_msglevel = ks_get_msglevel,
.set_msglevel = ks_set_msglevel, .set_msglevel = ks_set_msglevel,
.get_settings = ks_get_settings,
.set_settings = ks_set_settings,
.get_link = ks_get_link, .get_link = ks_get_link,
.nway_reset = ks_nway_reset, .nway_reset = ks_nway_reset,
.get_link_ksettings = ks_get_link_ksettings,
.set_link_ksettings = ks_set_link_ksettings,
}; };
/* MII interface controls */ /* MII interface controls */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment