From patchwork Wed Feb 4 19:53:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: david decotigny X-Patchwork-Id: 436477 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 16B6114017D for ; Thu, 5 Feb 2015 06:57:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162039AbbBDT5f (ORCPT ); Wed, 4 Feb 2015 14:57:35 -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 Received: by mail-ie0-f178.google.com with SMTP id rd18so4762705iec.9; Wed, 04 Feb 2015 11:54:16 -0800 (PST) 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=mMTSQiMFrwr5wbhHf8JpvxVChdjYWO7p7Czhlhfg17Y=; b=kLoDnpfEJqo7nVQIA7L+3QTxoY44ae13yG9Dxx3GAVNlAVilNYwRqHeTjs0NS5UWky BaBKq6ShxeWqZ3IRZjgIVuMncHfmVcoGISDhnYvuiovXAIW/j8xS1txRF4CHC/d7/myp Yt6n5JC9YlT1Avadv+2dEO1w2bNvpn536+DIiGaEDxCh36TL98LXsfhOk7DXKmf1rzi6 jj4H+vlzFu9zqT5/R9Jwo34RZ10gNwhg1KGBxjcU2T+MTuPahg1G1c0+93uDfWInxaid on0YezEb3cCESYbdbW2nMIynUrpPK4w51FJMa2PXE5XWZ6LVvJ0I329J4yDZe0CQn9BQ 25qQ== X-Received: by 10.107.155.197 with SMTP id d188mr36653194ioe.29.1423079656873; Wed, 04 Feb 2015 11:54:16 -0800 (PST) Received: from decotigny.mtv.corp.google.com ([172.18.64.159]) by mx.google.com with ESMTPSA id e70sm1348825ioe.6.2015.02.04.11.54.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Feb 2015 11:54:16 -0800 (PST) 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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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;