From: David Decotigny <ddecotig@gmail.com>
To: "David S. Miller" <davem@davemloft.net>,
Ben Hutchings <ben@decadent.org.uk>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
linux-api@vger.kernel.org, linux-mips@linux-mips.org,
fcoe-devel@open-fcoe.org,
Andrew Morton <akpm@linux-foundation.org>,
Tejun Heo <tj@kernel.org>
Cc: Eric Dumazet <edumazet@google.com>,
Eugenia Emantayev <eugenia@mellanox.co.il>,
Or Gerlitz <ogerlitz@mellanox.com>,
Ido Shamay <idos@mellanox.com>, Joe Perches <joe@perches.com>,
Saeed Mahameed <saeedm@mellanox.com>,
Govindarajulu Varadarajan <_govind@gmx.com>,
Venkata Duvvuru <VenkatKumar.Duvvuru@Emulex.Com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
Pravin B Shelar <pshelar@nicira.com>,
Ed Swierk <eswierk@skyportsystems.com>,
Robert Love <robert.w.love@intel.com>,
"James E.J. Bottomley" <JBottomley@parallels.com>,
Yuval Mintz <Yuval.Mintz@qlogic.com>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
David Decotigny <decot@googlers.com>
Subject: [PATCH net-next v6 11/19] net: team: use __ethtool_get_ksettings
Date: Tue, 19 Jan 2016 16:43:56 -0800 [thread overview]
Message-ID: <1453250644-14796-12-git-send-email-ddecotig@gmail.com> (raw)
In-Reply-To: <1453250644-14796-1-git-send-email-ddecotig@gmail.com>
From: David Decotigny <decot@googlers.com>
Signed-off-by: David Decotigny <decot@googlers.com>
---
drivers/net/team/team.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 2528331..9eac51d 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -2809,12 +2809,12 @@ static void __team_port_change_send(struct team_port *port, bool linkup)
port->state.linkup = linkup;
team_refresh_port_linkup(port);
if (linkup) {
- struct ethtool_cmd ecmd;
+ struct ethtool_ksettings ecmd;
- err = __ethtool_get_settings(port->dev, &ecmd);
+ err = __ethtool_get_ksettings(port->dev, &ecmd);
if (!err) {
- port->state.speed = ethtool_cmd_speed(&ecmd);
- port->state.duplex = ecmd.duplex;
+ port->state.speed = ecmd.parent.speed;
+ port->state.duplex = ecmd.parent.duplex;
goto send_event;
}
}
--
2.7.0.rc3.207.g0ac5344
next prev parent reply other threads:[~2016-01-20 0:43 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-20 0:43 [PATCH net-next v6 00/19] new ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny
2016-01-20 0:43 ` [PATCH net-next v6 02/19] test_bitmap: unit tests for lib/bitmap.c David Decotigny
2016-01-20 0:43 ` [PATCH net-next v6 05/19] net: ethtool: add new ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny
2016-01-20 0:43 ` [PATCH net-next v6 07/19] net: usnic: use __ethtool_get_ksettings David Decotigny
2016-01-20 0:43 ` [PATCH net-next v6 09/19] net: ipvlan: " David Decotigny
2016-01-20 0:43 ` David Decotigny [this message]
2016-01-20 0:43 ` [PATCH net-next v6 13/19] net: rdma: " David Decotigny
2016-01-20 0:44 ` [PATCH net-next v6 15/19] net: bridge: " David Decotigny
2016-01-20 0:44 ` [PATCH net-next v6 16/19] net: core: " David Decotigny
[not found] ` <1453250644-14796-1-git-send-email-ddecotig-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-01-20 0:43 ` [PATCH net-next v6 01/19] lib/bitmap.c: conversion routines to/from u32 array David Decotigny
2016-01-20 0:43 ` [PATCH net-next v6 03/19] net: usnic: remove unused call to ethtool_ops::get_settings David Decotigny
2016-01-20 0:43 ` [PATCH net-next v6 04/19] net: usnic: use __ethtool_get_settings David Decotigny
2016-01-20 0:43 ` [PATCH net-next v6 06/19] tx4939: use __ethtool_get_ksettings David Decotigny
2016-01-20 0:43 ` [PATCH net-next v6 08/19] net: bonding: " David Decotigny
2016-01-20 0:43 ` [PATCH net-next v6 10/19] net: macvlan: " David Decotigny
2016-01-20 0:43 ` [PATCH net-next v6 12/19] net: fcoe: " David Decotigny
2016-01-20 0:43 ` [PATCH net-next v6 14/19] net: 8021q: " David Decotigny
2016-01-20 0:44 ` [PATCH net-next v6 17/19] net: ethtool: remove unused __ethtool_get_settings David Decotigny
2016-01-20 0:44 ` [PATCH net-next v6 18/19] net: mlx4: convenience predicate for debug messages David Decotigny
2016-01-20 0:44 ` [PATCH net-next v6 19/19] net: mlx4: use new ETHTOOL_G/SSETTINGS API David Decotigny
2016-01-28 8:21 ` Eugenia Emantayev
[not found] ` <CABqvoseo5UPNuNDjmP1PDhco7KGja2QzEVd5Aio+GD+UbaV0+g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-01-28 22:38 ` 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=1453250644-14796-12-git-send-email-ddecotig@gmail.com \
--to=ddecotig@gmail.com \
--cc=JBottomley@parallels.com \
--cc=VenkatKumar.Duvvuru@Emulex.Com \
--cc=Yuval.Mintz@qlogic.com \
--cc=_govind@gmx.com \
--cc=akpm@linux-foundation.org \
--cc=ben@decadent.org.uk \
--cc=davem@davemloft.net \
--cc=decot@googlers.com \
--cc=edumazet@google.com \
--cc=eswierk@skyportsystems.com \
--cc=eugenia@mellanox.co.il \
--cc=fcoe-devel@open-fcoe.org \
--cc=idos@mellanox.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=joe@perches.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux@rasmusvillemoes.dk \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=pshelar@nicira.com \
--cc=robert.w.love@intel.com \
--cc=saeedm@mellanox.com \
--cc=tj@kernel.org \
/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 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).