From patchwork Tue Jan 27 01:36:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: david decotigny X-Patchwork-Id: 433147 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 EA882140185 for ; Tue, 27 Jan 2015 12:41:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757704AbbA0BhA (ORCPT ); Mon, 26 Jan 2015 20:37:00 -0500 Received: from mail-ie0-f178.google.com ([209.85.223.178]:39117 "EHLO mail-ie0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757665AbbA0Bg4 (ORCPT ); Mon, 26 Jan 2015 20:36:56 -0500 Received: by mail-ie0-f178.google.com with SMTP id rp18so12425311iec.9; Mon, 26 Jan 2015 17:36:55 -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=LETS+A0fow6hWhA2HV3hQ6xOj47Jn33txvHZ1Z7voPA=; b=C5WoqodobdzaJXY6nDzvsjUiljjUOx9x3GbZXdWoLIuqjFn7U+MLB4bGIbbw3/fwCr lqLIELtWEY0kP3mvNTF5b1bi1BK6goCB1FInQCnrePiB+TpqXmqYn7aYUaIDfi0s04TV yqPhZwk5dGzMv2FhGddXch9uxYmin608quZJUzW5YscjThT4Nw1ESNRuboywno1VsWN8 w28Kqpgmz24LZ0wJmyDY7gP/pzM4vbBc/BIQ+jwvyUdDdMfeVZDBuThV1esB/9aLNqGC 4MPK8NBXRIUxTkuq+3IUROkB8FA1GacEk5zc3HYdFHdyVEC37SU5JBcaP+BGHe1SVODz AhWQ== X-Received: by 10.50.32.7 with SMTP id e7mr509248igi.21.1422322615391; Mon, 26 Jan 2015 17:36:55 -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.36.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Jan 2015 17:36:54 -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 06/18] net: usnic: use __ethtool_get_ksettings Date: Mon, 26 Jan 2015 17:36:02 -0800 Message-Id: <1422322574-6188-7-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 --- drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c index d71ba62..f6f67c9 100644 --- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c +++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c @@ -305,12 +305,12 @@ int usnic_ib_query_port(struct ib_device *ibdev, u8 port, struct ib_port_attr *props) { struct usnic_ib_dev *us_ibdev = to_usdev(ibdev); - struct ethtool_cmd cmd; + struct ethtool_ksettings cmd; usnic_dbg("\n"); mutex_lock(&us_ibdev->usdev_lock); - __ethtool_get_settings(us_ibdev->netdev, &cmd); + __ethtool_get_ksettings(us_ibdev->netdev, &cmd); memset(props, 0, sizeof(*props)); props->lid = 0; @@ -334,8 +334,8 @@ int usnic_ib_query_port(struct ib_device *ibdev, u8 port, props->pkey_tbl_len = 1; props->bad_pkey_cntr = 0; props->qkey_viol_cntr = 0; - eth_speed_to_ib_speed(cmd.speed, &props->active_speed, - &props->active_width); + eth_speed_to_ib_speed(cmd.parent.speed, &props->active_speed, + &props->active_width); props->max_mtu = IB_MTU_4096; props->active_mtu = iboe_get_mtu(us_ibdev->ufdev->mtu); /* Userspace will adjust for hdrs */