Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1603766 > unrolled thread

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

Started byPhilippe Reynes <tremyfr@gmail.com>
First post2017-03-18 12:20 +0100
Last post2017-03-20 22:50 +0100
Articles 3 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] net: veth: use new api ethtool_{get|set}_link_ksettings Philippe Reynes <tremyfr@gmail.com> - 2017-03-18 12:20 +0100
    Re: [PATCH] net: veth: use new api ethtool_{get|set}_link_ksettings Xin Long <lucien.xin@gmail.com> - 2017-03-20 13:30 +0100
      Re: [PATCH] net: veth: use new api ethtool_{get|set}_link_ksettings Philippe Reynes <tremyfr@gmail.com> - 2017-03-20 22:50 +0100

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

FromPhilippe Reynes <tremyfr@gmail.com>
Date2017-03-18 12:20 +0100
Subject[PATCH] net: veth: use new api ethtool_{get|set}_link_ksettings
Message-ID<tmkyR-5qH-5@gated-at.bofh.it>
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>
---
 drivers/net/veth.c |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 8c39d6d..730b133 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -45,18 +45,16 @@ 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;
+	ethtool_link_ksettings_zero_link_mode(cmd, supported);
+	ethtool_link_ksettings_zero_link_mode(cmd, advertising);
+	cmd->base.speed = SPEED_10000;
+	cmd->base.duplex	= DUPLEX_FULL;
+	cmd->base.port		= PORT_TP;
+	cmd->base.phy_address	= 0;
+	cmd->base.autoneg	= AUTONEG_DISABLE;
 	return 0;
 }
 
@@ -95,12 +93,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

[toc] | [next] | [standalone]

#1604465

FromXin Long <lucien.xin@gmail.com>
Date2017-03-20 13:30 +0100
Message-ID<tn4BI-4CH-21@gated-at.bofh.it>
In reply to#1603766
On Sat, Mar 18, 2017 at 7:13 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>
> ---
>  drivers/net/veth.c |   22 ++++++++++------------
>  1 files changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/veth.c b/drivers/net/veth.c
> index 8c39d6d..730b133 100644
> --- a/drivers/net/veth.c
> +++ b/drivers/net/veth.c
> @@ -45,18 +45,16 @@ 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;
> +       ethtool_link_ksettings_zero_link_mode(cmd, supported);
> +       ethtool_link_ksettings_zero_link_mode(cmd, advertising);
> +       cmd->base.speed = SPEED_10000;
> +       cmd->base.duplex        = DUPLEX_FULL;
> +       cmd->base.port          = PORT_TP;
> +       cmd->base.phy_address   = 0;
It seem always:
        memset(&link_ksettings, 0, sizeof(link_ksettings));
        err = dev->ethtool_ops->get_link_ksettings(dev, &link_ksettings);

do we really need:
       ethtool_link_ksettings_zero_link_mode(cmd, supported);
       ethtool_link_ksettings_zero_link_mode(cmd, advertising);
       cmd->base.phy_address   = 0;
?

> +       cmd->base.autoneg       = AUTONEG_DISABLE;
>         return 0;
>  }
>
> @@ -95,12 +93,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
>

[toc] | [prev] | [next] | [standalone]

#1605157

FromPhilippe Reynes <tremyfr@gmail.com>
Date2017-03-20 22:50 +0100
Message-ID<tndlE-2eT-33@gated-at.bofh.it>
In reply to#1604465
Hi Xin Long,

On 3/20/17, Xin Long <lucien.xin@gmail.com> wrote:
> On Sat, Mar 18, 2017 at 7:13 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>
>> ---
>>  drivers/net/veth.c |   22 ++++++++++------------
>>  1 files changed, 10 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/net/veth.c b/drivers/net/veth.c
>> index 8c39d6d..730b133 100644
>> --- a/drivers/net/veth.c
>> +++ b/drivers/net/veth.c
>> @@ -45,18 +45,16 @@ 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;
>> +       ethtool_link_ksettings_zero_link_mode(cmd, supported);
>> +       ethtool_link_ksettings_zero_link_mode(cmd, advertising);
>> +       cmd->base.speed = SPEED_10000;
>> +       cmd->base.duplex        = DUPLEX_FULL;
>> +       cmd->base.port          = PORT_TP;
>> +       cmd->base.phy_address   = 0;
> It seem always:
>         memset(&link_ksettings, 0, sizeof(link_ksettings));
>         err = dev->ethtool_ops->get_link_ksettings(dev, &link_ksettings);

You're right.

> do we really need:
>        ethtool_link_ksettings_zero_link_mode(cmd, supported);
>        ethtool_link_ksettings_zero_link_mode(cmd, advertising);
>        cmd->base.phy_address   = 0;
> ?

As this code is just an api change, I prefer to keep this code.
Of course, if David prefer to remove this code, I'll remove it.

But you're right, there is a lot of function "get_link_ksettings"
that set to 0 some variable. It's useless as done just before
calling the callback.



Regards,
Philippe

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web