* [PATCH v2] net: veth: use new api ethtool_{get|set}_link_ksettings
@ 2017-03-29 6:24 Philippe Reynes
2017-03-29 11:06 ` Xin Long
2017-03-29 21:07 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Philippe Reynes @ 2017-03-29 6:24 UTC (permalink / raw)
To: davem, lucien.xin, jarod, stephen, dsa, aduyck
Cc: netdev, linux-kernel, Philippe Reynes
The ethtool api {get|set}_settings is deprecated.
We move this driver to new api {get|set}_link_ksettings.
Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
---
Changelog:
v2:
- avoid useless initiazation to zero (thanks Xin Long)
drivers/net/veth.c | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 8c39d6d..3171036 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -45,18 +45,13 @@ struct veth_priv {
{ "peer_ifindex" },
};
-static int veth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+static int veth_get_link_ksettings(struct net_device *dev,
+ struct ethtool_link_ksettings *cmd)
{
- cmd->supported = 0;
- cmd->advertising = 0;
- ethtool_cmd_speed_set(cmd, SPEED_10000);
- cmd->duplex = DUPLEX_FULL;
- cmd->port = PORT_TP;
- cmd->phy_address = 0;
- cmd->transceiver = XCVR_INTERNAL;
- cmd->autoneg = AUTONEG_DISABLE;
- cmd->maxtxpkt = 0;
- cmd->maxrxpkt = 0;
+ cmd->base.speed = SPEED_10000;
+ cmd->base.duplex = DUPLEX_FULL;
+ cmd->base.port = PORT_TP;
+ cmd->base.autoneg = AUTONEG_DISABLE;
return 0;
}
@@ -95,12 +90,12 @@ static void veth_get_ethtool_stats(struct net_device *dev,
}
static const struct ethtool_ops veth_ethtool_ops = {
- .get_settings = veth_get_settings,
.get_drvinfo = veth_get_drvinfo,
.get_link = ethtool_op_get_link,
.get_strings = veth_get_strings,
.get_sset_count = veth_get_sset_count,
.get_ethtool_stats = veth_get_ethtool_stats,
+ .get_link_ksettings = veth_get_link_ksettings,
};
static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
--
1.7.4.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] net: veth: use new api ethtool_{get|set}_link_ksettings
2017-03-29 6:24 [PATCH v2] net: veth: use new api ethtool_{get|set}_link_ksettings Philippe Reynes
@ 2017-03-29 11:06 ` Xin Long
2017-03-29 21:07 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Xin Long @ 2017-03-29 11:06 UTC (permalink / raw)
To: Philippe Reynes
Cc: davem, jarod, Stephen Hemminger, dsa, aduyck, network dev, LKML
On Wed, Mar 29, 2017 at 2:24 PM, Philippe Reynes <tremyfr@gmail.com> wrote:
> The ethtool api {get|set}_settings is deprecated.
> We move this driver to new api {get|set}_link_ksettings.
>
> Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
> ---
> Changelog:
> v2:
> - avoid useless initiazation to zero (thanks Xin Long)
>
Reviewed-by: Xin Long <lucien.xin@gmail.com>
> drivers/net/veth.c | 19 +++++++------------
> 1 files changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/veth.c b/drivers/net/veth.c
> index 8c39d6d..3171036 100644
> --- a/drivers/net/veth.c
> +++ b/drivers/net/veth.c
> @@ -45,18 +45,13 @@ struct veth_priv {
> { "peer_ifindex" },
> };
>
> -static int veth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
> +static int veth_get_link_ksettings(struct net_device *dev,
> + struct ethtool_link_ksettings *cmd)
> {
> - cmd->supported = 0;
> - cmd->advertising = 0;
> - ethtool_cmd_speed_set(cmd, SPEED_10000);
> - cmd->duplex = DUPLEX_FULL;
> - cmd->port = PORT_TP;
> - cmd->phy_address = 0;
> - cmd->transceiver = XCVR_INTERNAL;
> - cmd->autoneg = AUTONEG_DISABLE;
> - cmd->maxtxpkt = 0;
> - cmd->maxrxpkt = 0;
> + cmd->base.speed = SPEED_10000;
> + cmd->base.duplex = DUPLEX_FULL;
> + cmd->base.port = PORT_TP;
> + cmd->base.autoneg = AUTONEG_DISABLE;
> return 0;
> }
>
> @@ -95,12 +90,12 @@ static void veth_get_ethtool_stats(struct net_device *dev,
> }
>
> static const struct ethtool_ops veth_ethtool_ops = {
> - .get_settings = veth_get_settings,
> .get_drvinfo = veth_get_drvinfo,
> .get_link = ethtool_op_get_link,
> .get_strings = veth_get_strings,
> .get_sset_count = veth_get_sset_count,
> .get_ethtool_stats = veth_get_ethtool_stats,
> + .get_link_ksettings = veth_get_link_ksettings,
> };
>
> static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
> --
> 1.7.4.4
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] net: veth: use new api ethtool_{get|set}_link_ksettings
2017-03-29 6:24 [PATCH v2] net: veth: use new api ethtool_{get|set}_link_ksettings Philippe Reynes
2017-03-29 11:06 ` Xin Long
@ 2017-03-29 21:07 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-03-29 21:07 UTC (permalink / raw)
To: tremyfr; +Cc: lucien.xin, jarod, stephen, dsa, aduyck, netdev, linux-kernel
From: Philippe Reynes <tremyfr@gmail.com>
Date: Wed, 29 Mar 2017 08:24:21 +0200
> The ethtool api {get|set}_settings is deprecated.
> We move this driver to new api {get|set}_link_ksettings.
>
> Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
> ---
> Changelog:
> v2:
> - avoid useless initiazation to zero (thanks Xin Long)
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-29 21:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-29 6:24 [PATCH v2] net: veth: use new api ethtool_{get|set}_link_ksettings Philippe Reynes
2017-03-29 11:06 ` Xin Long
2017-03-29 21:07 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).