From patchwork Wed Feb 4 19:53:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: david decotigny X-Patchwork-Id: 436468 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 1BD16140271 for ; Thu, 5 Feb 2015 06:54:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161724AbbBDTyZ (ORCPT ); Wed, 4 Feb 2015 14:54:25 -0500 Received: from mail-ig0-f182.google.com ([209.85.213.182]:59621 "EHLO mail-ig0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161642AbbBDTyV (ORCPT ); Wed, 4 Feb 2015 14:54:21 -0500 Received: by mail-ig0-f182.google.com with SMTP id h15so6606448igd.3; Wed, 04 Feb 2015 11:54:20 -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=FZkHYbVO69IW03ULRI+FNsXAi2lnuGhTANVc25ueBus=; b=D3K8NIWmEXdCa488CQZw+pScn4WrJKAixZKu5mg8namf+s4e0q0pSMvIDvztJjqgl1 kbWKQ38sblUfL1wL/th0YrI64LQId3CshN11x+FkHGUoAXB+LZTBg/iX8YyolFgxGc17 BvmSHkI/NpsGeBWlIskpRsmWsyjO6CPgUI7/deM/UVhdPZqSG3BV1sadz3Z6hqYdtzZq HoZbwaNYTi86zlsIJOzX3hAkNpjUr+/JO8ge6E8nagazRtI2JkdycKYwpDfAbeE4vZn9 7U1ziRziMsHpG2GBXBZLaB4U7h+oow3rioSBCcVgAqVAwOue9yTFz2OFQJtZlGaOs1it Q7Bg== X-Received: by 10.107.8.67 with SMTP id 64mr37716536ioi.67.1423079660314; Wed, 04 Feb 2015 11:54:20 -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.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Feb 2015 11:54:19 -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 13/17] net: bridge: use __ethtool_get_ksettings Date: Wed, 4 Feb 2015 11:53:37 -0800 Message-Id: <1423079621-1374-14-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 --- net/bridge/br_if.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index b087d27..57282a5 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -35,10 +35,10 @@ */ static int port_cost(struct net_device *dev) { - struct ethtool_cmd ecmd; + struct ethtool_ksettings ecmd; - if (!__ethtool_get_settings(dev, &ecmd)) { - switch (ethtool_cmd_speed(&ecmd)) { + if (!__ethtool_get_ksettings(dev, &ecmd)) { + switch (ecmd.parent.speed) { case SPEED_10000: return 2; case SPEED_1000: