From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752525AbcBKA6g (ORCPT ); Wed, 10 Feb 2016 19:58:36 -0500 Received: from mail-pa0-f50.google.com ([209.85.220.50]:35202 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750760AbcBKA6e (ORCPT ); Wed, 10 Feb 2016 19:58:34 -0500 Date: Wed, 10 Feb 2016 16:58:46 -0800 From: Stephen Hemminger To: David Decotigny Cc: "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 , 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 Subject: Re: [PATCH net-next v7 15/19] net: bridge: use __ethtool_get_ksettings Message-ID: <20160210165846.0e7ae670@xeon-e3> In-Reply-To: <1454893743-6285-16-git-send-email-ddecotig@gmail.com> References: <1454893743-6285-1-git-send-email-ddecotig@gmail.com> <1454893743-6285-16-git-send-email-ddecotig@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 7 Feb 2016 17:08:59 -0800 David Decotigny wrote: > 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: Sure looks fine for bridge. This reminds me that bridge code needs to transition to this decade and do latest STP. Acked-by: Stephen Hemminger