All of lore.kernel.org
 help / color / mirror / Atom feed
From: Philippe Reynes <tremyfr@gmail.com>
To: Jay Vosburgh <jay.vosburgh@canonical.com>
Cc: vfalico@gmail.com, Andy Gospodarek <andy@greyhouse.net>,
	"David S. Miller" <davem@davemloft.net>,
	netdev@vger.kernel.org,
	linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] net: bonding: use new api ethtool_{get|set}_link_ksettings
Date: Wed, 26 Oct 2016 23:12:34 +0200	[thread overview]
Message-ID: <CAC=8w92Vp0qa_g4hVY701_zmx0tPrae7_MTXmcWVGg6nfPkVZA@mail.gmail.com> (raw)
In-Reply-To: <11572.1477504825@famine>

Hi Jay,

On Wed, Oct 26, 2016 at 8:00 PM, Jay Vosburgh
<jay.vosburgh@canonical.com> wrote:
> 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.
>
>         This is just an API change, i.e., no change to functionality?

Yes, it's juste an API change.


Philippe


>         -J
>
>>Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
>>---
>> drivers/net/bonding/bond_main.c |   16 ++++++++--------
>> 1 files changed, 8 insertions(+), 8 deletions(-)
>>
>>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
>>index c9944d8..5708f17 100644
>>--- a/drivers/net/bonding/bond_main.c
>>+++ b/drivers/net/bonding/bond_main.c
>>@@ -4080,16 +4080,16 @@ static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev)
>>       return ret;
>> }
>>
>>-static int bond_ethtool_get_settings(struct net_device *bond_dev,
>>-                                   struct ethtool_cmd *ecmd)
>>+static int bond_ethtool_get_link_ksettings(struct net_device *bond_dev,
>>+                                         struct ethtool_link_ksettings *cmd)
>> {
>>       struct bonding *bond = netdev_priv(bond_dev);
>>       unsigned long speed = 0;
>>       struct list_head *iter;
>>       struct slave *slave;
>>
>>-      ecmd->duplex = DUPLEX_UNKNOWN;
>>-      ecmd->port = PORT_OTHER;
>>+      cmd->base.duplex = DUPLEX_UNKNOWN;
>>+      cmd->base.port = PORT_OTHER;
>>
>>       /* Since bond_slave_can_tx returns false for all inactive or down slaves, we
>>        * do not need to check mode.  Though link speed might not represent
>>@@ -4100,12 +4100,12 @@ static int bond_ethtool_get_settings(struct net_device *bond_dev,
>>               if (bond_slave_can_tx(slave)) {
>>                       if (slave->speed != SPEED_UNKNOWN)
>>                               speed += slave->speed;
>>-                      if (ecmd->duplex == DUPLEX_UNKNOWN &&
>>+                      if (cmd->base.duplex == DUPLEX_UNKNOWN &&
>>                           slave->duplex != DUPLEX_UNKNOWN)
>>-                              ecmd->duplex = slave->duplex;
>>+                              cmd->base.duplex = slave->duplex;
>>               }
>>       }
>>-      ethtool_cmd_speed_set(ecmd, speed ? : SPEED_UNKNOWN);
>>+      cmd->base.speed = speed ? : SPEED_UNKNOWN;
>>
>>       return 0;
>> }
>>@@ -4121,8 +4121,8 @@ static void bond_ethtool_get_drvinfo(struct net_device *bond_dev,
>>
>> static const struct ethtool_ops bond_ethtool_ops = {
>>       .get_drvinfo            = bond_ethtool_get_drvinfo,
>>-      .get_settings           = bond_ethtool_get_settings,
>>       .get_link               = ethtool_op_get_link,
>>+      .get_link_ksettings     = bond_ethtool_get_link_ksettings,
>> };
>>
>> static const struct net_device_ops bond_netdev_ops = {
>>--
>>1.7.4.4
>
> ---
>         -Jay Vosburgh, jay.vosburgh@canonical.com

  reply	other threads:[~2016-10-26 21:12 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-25 16:41 [PATCH] net: bonding: use new api ethtool_{get|set}_link_ksettings Philippe Reynes
2016-10-26 18:00 ` Jay Vosburgh
2016-10-26 21:12   ` Philippe Reynes [this message]
2016-10-30 21:23 ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAC=8w92Vp0qa_g4hVY701_zmx0tPrae7_MTXmcWVGg6nfPkVZA@mail.gmail.com' \
    --to=tremyfr@gmail.com \
    --cc=andy@greyhouse.net \
    --cc=davem@davemloft.net \
    --cc=jay.vosburgh@canonical.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=vfalico@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.