From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757886AbbA0BhT (ORCPT ); Mon, 26 Jan 2015 20:37:19 -0500 Received: from mail-ig0-f181.google.com ([209.85.213.181]:45615 "EHLO mail-ig0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757794AbbA0BhH (ORCPT ); Mon, 26 Jan 2015 20:37:07 -0500 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 14/18] net: bridge: use __ethtool_get_ksettings Date: Mon, 26 Jan 2015 17:36:10 -0800 Message-Id: <1422322574-6188-15-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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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: -- 2.2.0.rc0.207.ga3a616c