Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162031AbbBDT5e (ORCPT ); Wed, 4 Feb 2015 14:57:34 -0500 Received: from mail-ie0-f178.google.com ([209.85.223.178]:32857 "EHLO mail-ie0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161762AbbBDTyR (ORCPT ); Wed, 4 Feb 2015 14:54:17 -0500 From: David Decotigny To: "David S. Miller" , Ben Hutchings , Amir Vadai , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-api@vger.kernel.org, linux-mips@linux-mips.org, fcoe-devel@open-fcoe.org 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 , Upinder Malhi , Robert Love , "James E.J. Bottomley" , David Decotigny Subject: [PATCH net-next v2 11/17] net: rdma: use __ethtool_get_ksettings Date: Wed, 4 Feb 2015 11:53:35 -0800 Message-Id: <1423079621-1374-12-git-send-email-ddecotig@gmail.com> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1423079621-1374-1-git-send-email-ddecotig@gmail.com> References: <1423079621-1374-1-git-send-email-ddecotig@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1428 Lines: 50 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/