Re: [PATCH v2] net: veth: use new api ethtool_{get|set}_link_ksettings

[David Miller]

From: Philippe Reynes 
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 
> ---
> Changelog:
> v2:
> - avoid useless initiazation to zero (thanks Xin Long)

Applied.

Re: [PATCH v2] net: veth: use new api ethtool_{get|set}_link_ksettings

[Xin Long]

On Wed, Mar 29, 2017 at 2:24 PM, Philippe Reynes  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 
> ---
> Changelog:
> v2:
> - avoid useless initiazation to zero (thanks Xin Long)
>
Reviewed-by: 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_1);
> -   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_1;
> +   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
>

[PATCH v2] net: veth: use new api ethtool_{get|set}_link_ksettings

[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 
---
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_1);
-   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_1;
+   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