Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1312616
| Path | csiph.com!news.mixmin.net!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod |
|---|---|
| From | David Decotigny <ddecotig@gmail.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH net-next v6 06/19] tx4939: use __ethtool_get_ksettings |
| Date | Wed, 20 Jan 2016 01:50:03 +0100 |
| Message-ID | <qSP8f-73P-55@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=zMoutD4K4abopHMoPWMLnSXDq2EdilqE7/cUUP2P36A=; b=S4qy9Z0lTELtGEApoKxNrli4Px4t30ruUDbIgeHzEyuB+au3JxaghitcBB66wxUH4I EY1FXdnwJ64jglHwH3cx7Fl5m/CTJUPk66pwIlBOGIz6lv1CoTKFh5I7IqCYQLDyBZjn 7duuAtl8rGX7yYrlQvwRsKPKY79CjSzwyaXLqTxRFXVF8HQz46jYLJCqVK3JwBLmFGKb 9oNerO+9ArJmYdJVVyHFzmKVPYmuW0MPHc3+ltCtQzrWq01Hbbu0x+3/jGpVtxNfyM6l v37WSgZJIVb1ZOUg/rF0R8uq1/9IMxhO6lC1OwkfsBVvzyH9k2VDQuwHoypDgpbx+FX+ 0v1A== |
| 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=zMoutD4K4abopHMoPWMLnSXDq2EdilqE7/cUUP2P36A=; b=eXc//zlCTxXSGmpV+vayW1+SajfFcWZOcD8O4fPYfGcB52WUhj2Y1zOrhK6CKtTSqh vD1QbPDtgprMw/kqg2tkq7tC5DnZ/9Id8f9VxQeTkkMUYAjCpOh7SXXKbrhlMubFQJB8 BQsjlskz7ORLN8Ysw4Fi7/9/wb9szj4PwXQfY4S/ddsf/P6UBWZDV29YJvn/f1LoCPbn M+Jojg4OjNc3hcw8S/Y9C3+qquXDYdbwl/OUltVQGUPEdzLPktMUoJv7z0dqwPBhMcfa TO3Tj9nPhisl+Mkz31U4QREfSuydeSm0y3RVexuh17BO/H25+1u5XeDS8eVtYYp83YHm U2hw== |
| X-Gm-Message-State | ALoCoQl5onM9UsKOiA4FEyT1csxGThzaFZilXQYP91sRp1NCrSpxvsk9689GVpsMGAr6A0lyNHXOqBaUENbYQrctJBS5YFNizA== |
| X-Received | by 10.66.63.104 with SMTP id f8mr48815037pas.41.1453250655492; Tue, 19 Jan 2016 16:44:15 -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 | 29 |
| 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:43:51 -0800 |
| X-Original-Message-ID | <1453250644-14796-7-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:1312616 |
Show key headers only | View raw
From: David Decotigny <decot@googlers.com>
Signed-off-by: David Decotigny <decot@googlers.com>
---
arch/mips/txx9/generic/setup_tx4939.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c
index e3733cd..4a3ebf6 100644
--- a/arch/mips/txx9/generic/setup_tx4939.c
+++ b/arch/mips/txx9/generic/setup_tx4939.c
@@ -320,11 +320,12 @@ void __init tx4939_sio_init(unsigned int sclk, unsigned int cts_mask)
#if IS_ENABLED(CONFIG_TC35815)
static u32 tx4939_get_eth_speed(struct net_device *dev)
{
- struct ethtool_cmd cmd;
- if (__ethtool_get_settings(dev, &cmd))
+ struct ethtool_ksettings cmd;
+
+ if (__ethtool_get_ksettings(dev, &cmd))
return 100; /* default 100Mbps */
- return ethtool_cmd_speed(&cmd);
+ return cmd.parent.speed;
}
static int tx4939_netdev_event(struct notifier_block *this,
--
2.7.0.rc3.207.g0ac5344
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
[PATCH net-next v6 06/19] tx4939: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-01-20 01:50 +0100
csiph-web