From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Decotigny Subject: [PATCH net-next v1 12/18] net: rdma: use __ethtool_get_ksettings Date: Mon, 26 Jan 2015 17:36:08 -0800 Message-ID: <1422322574-6188-13-git-send-email-ddecotig@gmail.com> References: <1422322574-6188-1-git-send-email-ddecotig@gmail.com> Cc: Eric Dumazet , Eugenia Emantayev , Or Gerlitz , Ido Shamay , Joe Perches , Saeed Mahameed , Govindarajulu Varadarajan <_govind@gmx.com>, Venkata Duvvuru , Jeff Kirsher , Eyal Perry , Pravin B Shelar , Ed Swierk , David Decotigny To: "David S. Miller" , Ben Hutchings , Amir Vadai , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-api@vger.kernel.org Return-path: Received: from mail-ie0-f170.google.com ([209.85.223.170]:35710 "EHLO mail-ie0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757749AbbA0BhE (ORCPT ); Mon, 26 Jan 2015 20:37:04 -0500 In-Reply-To: <1422322574-6188-1-git-send-email-ddecotig@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: From: David Decotigny Signed-off-by: David Decotigny --- 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 ce55906..782bb8c 100644 --- a/include/rdma/ib_addr.h +++ b/include/rdma/ib_addr.h @@ -241,24 +241,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.2.0.rc0.207.ga3a616c