From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757846AbbA0BhM (ORCPT ); Mon, 26 Jan 2015 20:37:12 -0500 Received: from mail-ig0-f170.google.com ([209.85.213.170]:53300 "EHLO mail-ig0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757591AbbA0BhB (ORCPT ); Mon, 26 Jan 2015 20:37:01 -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 10/18] net: team: use __ethtool_get_ksettings Date: Mon, 26 Jan 2015 17:36:06 -0800 Message-Id: <1422322574-6188-11-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 --- 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 4b2bfc5..77576d1 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -2767,12 +2767,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.2.0.rc0.207.ga3a616c