[PATCH net-next v6 11/19] net: team: use __ethtool_get_ksettings

From	David Decotigny <ddecotig@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH net-next v6 11/19] net: team: use __ethtool_get_ksettings
Date	2016-01-20 01:50 +0100
Message-ID	<qSP8e-73P-19@gated-at.bofh.it> (permalink)
References	<qSP8d-73P-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: David Decotigny <decot@googlers.com>

Signed-off-by: David Decotigny <decot@googlers.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 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

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH net-next v6 11/19] net: team: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-01-20 01:50 +0100

csiph-web