Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1312611
| Path | csiph.com!eternal-september.org!feeder.eternal-september.org!feeds.phibee-telecom.net!news.panservice.it!bofh.it!news.nic.it!robomod |
|---|---|
| From | David Decotigny <ddecotig@gmail.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH net-next v6 15/19] net: bridge: use __ethtool_get_ksettings |
| Date | Wed, 20 Jan 2016 01:50:02 +0100 |
| Message-ID | <qSP8e-73P-31@gated-at.bofh.it> (permalink) |
| References | <qSP8d-73P-5@gated-at.bofh.it> |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4IpA9nl8IZlK/ByCx1cK2rQrWfMOQ/Wm2UEg6gnOMKA=; b=vRd4+AsVw3Fiy6xG3NCzr9LRgLCOtfwYBKmyEzmgsNAz6/c/TwwWJ5zBB2NTnz993y ET9B15hhrCR0bcIlJpg1zf5ON65qkKwTI/3nHiSuPCfjYqtB4gmTAMAWTr6soFtIsnKT ZVnkLHw8PKG+0REZgouUkCnOO/MC9glmlgwxsvL5QmqWdSK70Z8pALfjAY5uKhEYwit8 GuvxRCv5INVx/nYzOKpTmthwNu+WrkSrgC41RzLkN3gzFrEm1qXLPIXxh8swlXC0vVrP nRvk1pARwzhinx9j4JFPxNaYdYD4S2ZfmXz/1vTzO9zPxH23gU50VEfP3a1WJFHihMz6 sjnQ== |
| X-Google-Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4IpA9nl8IZlK/ByCx1cK2rQrWfMOQ/Wm2UEg6gnOMKA=; b=VZXFdz8hhGwoHT3lsRyixgXOAttAXwBuf5ns0g6Sy4OvpF9dkB9czqpJcDv6BBv4Da Erjm9X1mTlHSIV4XiCc5f5eB8vNdU1WRvCDoIylA7g68gqfglR8t5RO0Ng2QBzacPi2o h0AUoL3lOcfYXKkdB3xDvsXwjvfcc9K9iEuIbouNEs9/ZkQpdc80JVJzf2Mo+qQNGr/8 zd1xxo2FF5SQryFEFLyq8O1XdJNpRZ8wTHpAPq1HApYa/BaJUjN2DWbSYZ4taWIAIqO8 s7AgUbtkNaeiSKYRLBqEMy4QBmDb9ipr5YWqXZFbiF8HegbU5EnVC6ccQABl/ZVuT80v Hjcg== |
| X-Gm-Message-State | ALoCoQl3zAVrUXoKzATwzl59i15hIvNNKKi+ATOJ8FDuNVod5fipYfE4ZRV/eBUkjtgMrRTQ9kFgo+I2Ze9MZ4PmIpQ0EdjKCw== |
| X-Received | by 10.67.7.200 with SMTP id de8mr48946845pad.28.1453250665885; Tue, 19 Jan 2016 16:44:25 -0800 (PST) |
| X-Mailer | git-send-email 2.7.0.rc3.207.g0ac5344 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 27 |
| Organization | linux.* mail to news gateway |
| X-Original-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> |
| X-Original-Date | Tue, 19 Jan 2016 16:44:00 -0800 |
| X-Original-Message-ID | <1453250644-14796-16-git-send-email-ddecotig@gmail.com> |
| X-Original-References | <1453250644-14796-1-git-send-email-ddecotig@gmail.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1312611 |
Show key headers only | View raw
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 c367b3e..cafe4e6 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.7.0.rc3.207.g0ac5344
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
[PATCH net-next v6 15/19] net: bridge: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-01-20 01:50 +0100
csiph-web