From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Decotigny Subject: [PATCH net-next v6 11/19] net: team: use __ethtool_get_ksettings Date: Tue, 19 Jan 2016 16:43:56 -0800 Message-ID: <1453250644-14796-12-git-send-email-ddecotig@gmail.com> References: <1453250644-14796-1-git-send-email-ddecotig@gmail.com> 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 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 Return-path: Received: from mail-pa0-f66.google.com ([209.85.220.66]:36661 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933388AbcATAoV (ORCPT ); Tue, 19 Jan 2016 19:44:21 -0500 In-Reply-To: <1453250644-14796-1-git-send-email-ddecotig@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: From: David Decotigny Signed-off-by: David Decotigny --- drivers/net/team/team.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 2528331..9eac51d 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -2809,12 +2809,12 @@ static void __team_port_change_send(struct team_port *port, bool linkup) port->state.linkup = linkup; team_refresh_port_linkup(port); if (linkup) { - struct ethtool_cmd ecmd; + struct ethtool_ksettings ecmd; - err = __ethtool_get_settings(port->dev, &ecmd); + err = __ethtool_get_ksettings(port->dev, &ecmd); if (!err) { - port->state.speed = ethtool_cmd_speed(&ecmd); - port->state.duplex = ecmd.duplex; + port->state.speed = ecmd.parent.speed; + port->state.duplex = ecmd.parent.duplex; goto send_event; } } -- 2.7.0.rc3.207.g0ac5344