summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid Decotigny <decot@googlers.com>2016-02-24 10:58:05 -0800
committerDavid S. Miller <davem@davemloft.net>2016-02-25 22:06:46 -0500
commit0ab6b544c185de913fa662c7565d78bdeccb54c4 (patch)
tree26552272ea4a80a7de1021d73df9592a9ab18c46 /drivers
parent85f9581975dc0315b1b47c5323a8ee497ebd6a8f (diff)
downloadblackbird-obmc-linux-0ab6b544c185de913fa662c7565d78bdeccb54c4.tar.gz
blackbird-obmc-linux-0ab6b544c185de913fa662c7565d78bdeccb54c4.zip
net: team: use __ethtool_get_ksettings
Signed-off-by: David Decotigny <decot@googlers.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/team/team.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 00558e139584..2769835f48ca 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_link_ksettings ecmd;
- err = __ethtool_get_settings(port->dev, &ecmd);
+ err = __ethtool_get_link_ksettings(port->dev, &ecmd);
if (!err) {
- port->state.speed = ethtool_cmd_speed(&ecmd);
- port->state.duplex = ecmd.duplex;
+ port->state.speed = ecmd.base.speed;
+ port->state.duplex = ecmd.base.duplex;
goto send_event;
}
}
OpenPOWER on IntegriCloud