[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1454893743-6285-12-git-send-email-ddecotig@gmail.com>
Date: Sun, 7 Feb 2016 17:08:55 -0800
From: David Decotigny <ddecotig@...il.com>
To: "David S. Miller" <davem@...emloft.net>,
Ben Hutchings <ben@...adent.org.uk>,
linux-kernel@...r.kernel.org, netdev@...r.kernel.org,
linux-api@...r.kernel.org, linux-mips@...ux-mips.org,
fcoe-devel@...n-fcoe.org,
Andrew Morton <akpm@...ux-foundation.org>,
Tejun Heo <tj@...nel.org>
Cc: Eric Dumazet <edumazet@...gle.com>,
Eugenia Emantayev <eugenia@...lanox.co.il>,
Or Gerlitz <ogerlitz@...lanox.com>,
Ido Shamay <idos@...lanox.com>, Joe Perches <joe@...ches.com>,
Saeed Mahameed <saeedm@...lanox.com>,
Govindarajulu Varadarajan <_govind@....com>,
Venkata Duvvuru <VenkatKumar.Duvvuru@...lex.Com>,
Jeff Kirsher <jeffrey.t.kirsher@...el.com>,
Pravin B Shelar <pshelar@...ira.com>,
Ed Swierk <eswierk@...portsystems.com>,
Robert Love <robert.w.love@...el.com>,
"James E.J. Bottomley" <JBottomley@...allels.com>,
Yuval Mintz <Yuval.Mintz@...gic.com>,
Rasmus Villemoes <linux@...musvillemoes.dk>,
David Decotigny <decot@...glers.com>
Subject: [PATCH net-next v7 11/19] net: team: use __ethtool_get_ksettings
From: David Decotigny <decot@...glers.com>
Signed-off-by: David Decotigny <decot@...glers.com>
---
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 00558e1..7f96eca7 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -2813,12 +2813,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
Powered by blists - more mailing lists