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: Sun, 7 Feb 2016 17:08:57 -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 v7 13/19] net: rdma: use __ethtool_get_ksettings From: David Decotigny <decot@...glers.com> Signed-off-by: David Decotigny <decot@...glers.com> --- include/rdma/ib_addr.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h index c34c900..f669751 100644 --- a/include/rdma/ib_addr.h +++ b/include/rdma/ib_addr.h @@ -262,24 +262,22 @@ static inline enum ib_mtu iboe_get_mtu(int mtu) static inline int iboe_get_rate(struct net_device *dev) { - struct ethtool_cmd cmd; - u32 speed; + struct ethtool_ksettings cmd; int err; rtnl_lock(); - err = __ethtool_get_settings(dev, &cmd); + err = __ethtool_get_ksettings(dev, &cmd); rtnl_unlock(); if (err) return IB_RATE_PORT_CURRENT; - speed = ethtool_cmd_speed(&cmd); - if (speed >= 40000) + if (cmd.parent.speed >= 40000) return IB_RATE_40_GBPS; - else if (speed >= 30000) + else if (cmd.parent.speed >= 30000) return IB_RATE_30_GBPS; - else if (speed >= 20000) + else if (cmd.parent.speed >= 20000) return IB_RATE_20_GBPS; - else if (speed >= 10000) + else if (cmd.parent.speed >= 10000) return IB_RATE_10_GBPS; else return IB_RATE_PORT_CURRENT; -- 2.7.0.rc3.207.g0ac5344
Powered by blists - more mailing lists