From patchwork Tue Jan 27 01:36:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: david decotigny X-Patchwork-Id: 433144 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 DC8AD140185 for ; Tue, 27 Jan 2015 12:39:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758076AbbA0Bjs (ORCPT ); Mon, 26 Jan 2015 20:39:48 -0500 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 Received: by mail-ie0-f170.google.com with SMTP id y20so12488652ier.1; Mon, 26 Jan 2015 17:37:04 -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=OQUWN4c4AZ1C6EFzp+jUhCrtUNmcsZYYPmZ10+YT8K7wtXCXkHEaHAK6Ll6QplP91F 38Ln9uF8OYs1G1MPOYEmidIesAwYuy581KVTtaC3X3K0+nTqVika8s8/CBlc1HzFz+Iq rKjKm4iFiUea3OlB2ZcJ6hsG9ViPGKCT87jwEOBYFraGdzCEiMd7FIZq8fBnQ/H4VNHC eX4sJlUj72usbrheEulyfzN0PtKIx6rNmXRTMoqH6r69CAfHmMdoCUw61+ZnWHLLL2Go j+lrO+77Dl2RA4ZVphICMyqeoyXBpIwDXrW8CvX/AZqnURSvbBKxI1mWTOUUtLckUhVU SlDA== X-Received: by 10.42.200.82 with SMTP id ev18mr453114icb.44.1422322623931; Mon, 26 Jan 2015 17:37:03 -0800 (PST) Received: from decotigny.mtv.corp.google.com ([172.18.64.159]) by mx.google.com with ESMTPSA id yq1sm68372igb.21.2015.01.26.17.37.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Jan 2015 17:37:03 -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 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 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> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1422322574-6188-1-git-send-email-ddecotig@gmail.com> References: <1422322574-6188-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;