From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Decotigny Subject: [PATCH net-next v8 15/19] net: bridge: use __ethtool_get_ksettings Date: Tue, 9 Feb 2016 16:29:24 -0800 Message-ID: <1455064168-5102-16-git-send-email-ddecotig@gmail.com> References: <1455064168-5102-1-git-send-email-ddecotig@gmail.com> Return-path: In-Reply-To: <1455064168-5102-1-git-send-email-ddecotig@gmail.com> Sender: linux-kernel-owner@vger.kernel.org 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 List-Id: linux-api@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 c367b3e..cafe4e6 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -36,10 +36,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.7.0.rc3.207.g0ac5344