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 v4 15/19] net: bridge: use __ethtool_get_ksettings
Date: Wed, 9 Dec 2015 09:59:25 -0800 [thread overview]
Message-ID: <1449683969-7305-16-git-send-email-ddecotig@gmail.com> (raw)
In-Reply-To: <1449683969-7305-1-git-send-email-ddecotig@gmail.com>
From: David Decotigny <decot@googlers.com>
Signed-off-by: David Decotigny <decot@googlers.com>
---
net/bridge/br_if.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 8d1d4a2..d1022fd 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -36,10 +36,10 @@
*/
static int port_cost(struct net_device *dev)
{
- struct ethtool_cmd ecmd;
+ struct ethtool_ksettings ecmd;
- if (!__ethtool_get_settings(dev, &ecmd)) {
- switch (ethtool_cmd_speed(&ecmd)) {
+ if (!__ethtool_get_ksettings(dev, &ecmd)) {
+ switch (ecmd.parent.speed) {
case SPEED_10000:
return 2;
case SPEED_1000:
--
2.6.0.rc2.230.g3dd15c0
next prev parent reply other threads:[~2015-12-09 17:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-09 17:59 [PATCH net-next v4 00/19] RFC: new ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 01/19] lib/bitmap.c: conversion routines to/from u32 array David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 02/19] test_bitmap: unit tests for lib/bitmap.c David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 03/19] net: usnic: remove unused call to ethtool_ops::get_settings David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 04/19] net: usnic: use __ethtool_get_settings David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 05/19] net: ethtool: add new ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 06/19] tx4939: use __ethtool_get_ksettings David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 07/19] net: usnic: " David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 08/19] net: bonding: " David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 09/19] net: ipvlan: " David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 10/19] net: macvlan: " David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 11/19] net: team: " David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 12/19] net: fcoe: " David Decotigny
2015-12-09 19:18 ` kbuild test robot
2015-12-10 4:01 ` David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 13/19] net: rdma: " David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 14/19] net: 8021q: " David Decotigny
2015-12-09 17:59 ` David Decotigny [this message]
2015-12-09 17:59 ` [PATCH net-next v4 16/19] net: core: " David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 17/19] net: ethtool: remove unused __ethtool_get_settings David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 18/19] net: mlx4: convenience predicate for debug messages David Decotigny
2015-12-09 17:59 ` [PATCH net-next v4 19/19] net: mlx4: use new ETHTOOL_G/SSETTINGS API David Decotigny
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=1449683969-7305-16-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).