lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 19 Jan 2016 16:43:51 -0800 From: David Decotigny <ddecotig@...il.com> To: "David S. Miller" <davem@...emloft.net>, Ben Hutchings <ben@...adent.org.uk>, linux-kernel@...r.kernel.org, netdev@...r.kernel.org, linux-api@...r.kernel.org, linux-mips@...ux-mips.org, fcoe-devel@...n-fcoe.org, Andrew Morton <akpm@...ux-foundation.org>, Tejun Heo <tj@...nel.org> Cc: Eric Dumazet <edumazet@...gle.com>, Eugenia Emantayev <eugenia@...lanox.co.il>, Or Gerlitz <ogerlitz@...lanox.com>, Ido Shamay <idos@...lanox.com>, Joe Perches <joe@...ches.com>, Saeed Mahameed <saeedm@...lanox.com>, Govindarajulu Varadarajan <_govind@....com>, Venkata Duvvuru <VenkatKumar.Duvvuru@...lex.Com>, Jeff Kirsher <jeffrey.t.kirsher@...el.com>, Pravin B Shelar <pshelar@...ira.com>, Ed Swierk <eswierk@...portsystems.com>, Robert Love <robert.w.love@...el.com>, "James E.J. Bottomley" <JBottomley@...allels.com>, Yuval Mintz <Yuval.Mintz@...gic.com>, Rasmus Villemoes <linux@...musvillemoes.dk>, David Decotigny <decot@...glers.com> Subject: [PATCH net-next v6 06/19] tx4939: use __ethtool_get_ksettings From: David Decotigny <decot@...glers.com> Signed-off-by: David Decotigny <decot@...glers.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
Powered by blists - more mailing lists