From patchwork Mon Dec 14 21:04:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: david decotigny X-Patchwork-Id: 556640 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 C84231402C4 for ; Tue, 15 Dec 2015 08:07:46 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=bQL36Lqk; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932640AbbLNVEw (ORCPT ); Mon, 14 Dec 2015 16:04:52 -0500 Received: from mail-pa0-f66.google.com ([209.85.220.66]:33641 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932587AbbLNVEt (ORCPT ); Mon, 14 Dec 2015 16:04:49 -0500 Received: by pacwq6 with SMTP id wq6so11290376pac.0; Mon, 14 Dec 2015 13:04:48 -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=GUlwB4qrbLFrCSqynrfBIefqDqFARwUXcbBAgHj2CsM=; b=bQL36Lqkq62tYmfvoHVd/bmpmp+eyT/bh6Z45fsOyWLc/W5gtlggG2h8zbWnXkTkG1 EmAqiplhB1/Wp09s9rwn/oYVj0xsg12SvnfI3s8faGRowBZkU/FCvoR+sfOzkbQQTsb7 AMLtSfoNDWEiMXPn9z5impzTk45xjC6u8oU2rEP5ASdhIgldYbiiFJyvsTNe26kduz+M 32hsipckMgKSO+ADtJRA/s7XkLpoIsAYOAhQ4Jq9drmP7KtLNlhxXdHoVs3yCFoCBYKS WnDhfP0/LF/vY6zFPIkCNEB0RKWq002uTj2PxypFUH8V5vEouMe4iTn9vUAnClUed86W 2umQ== X-Received: by 10.66.220.196 with SMTP id py4mr27393755pac.135.1450127088418; Mon, 14 Dec 2015 13:04:48 -0800 (PST) Received: from decotigny.mtv.corp.google.com ([172.18.64.159]) by smtp.gmail.com with ESMTPSA id 68sm13096148pfp.62.2015.12.14.13.04.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Dec 2015 13:04:47 -0800 (PST) From: David Decotigny To: "David S. Miller" , Ben Hutchings , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-api@vger.kernel.org, linux-mips@linux-mips.org, fcoe-devel@open-fcoe.org, Andrew Morton , Tejun Heo Cc: Eric Dumazet , Eugenia Emantayev , Or Gerlitz , Ido Shamay , Joe Perches , Saeed Mahameed , Govindarajulu Varadarajan <_govind@gmx.com>, Venkata Duvvuru , Jeff Kirsher , Pravin B Shelar , Ed Swierk , Robert Love , "James E.J. Bottomley" , Yuval Mintz , Rasmus Villemoes , David Decotigny Subject: [PATCH net-next v5 13/19] net: rdma: use __ethtool_get_ksettings Date: Mon, 14 Dec 2015 13:04:00 -0800 Message-Id: <1450127046-4573-14-git-send-email-ddecotig@gmail.com> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1450127046-4573-1-git-send-email-ddecotig@gmail.com> References: <1450127046-4573-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 1152859..1820f26 100644 --- a/include/rdma/ib_addr.h +++ b/include/rdma/ib_addr.h @@ -254,24 +254,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;