diff options
| author |   David Decotigny <decot@googlers.com> | 2016-02-24 10:58:02 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-02-25 22:06:46 -0500 |
| commit | 9856909c2abb32a795d9782bff2ce987696ffb9b (patch) | |
| tree | bfc775a56c3221eeb9d10127a7f06c40e537d2cd /drivers/net/bonding/bond_main.c | |
| parent | net: usnic: use __ethtool_get_ksettings (diff) | |
| download | linux-dev-9856909c2abb32a795d9782bff2ce987696ffb9b.tar.xz linux-dev-9856909c2abb32a795d9782bff2ce987696ffb9b.zip | |
net: bonding: use __ethtool_get_ksettings
Signed-off-by: David Decotigny <decot@googlers.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index a6527d5b3269..b6236ff3dbdd 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -376,22 +376,20 @@ down: static void bond_update_speed_duplex(struct slave *slave) { struct net_device *slave_dev = slave->dev; - struct ethtool_cmd ecmd; - u32 slave_speed; + struct ethtool_link_ksettings ecmd; int res; slave->speed = SPEED_UNKNOWN; slave->duplex = DUPLEX_UNKNOWN; - res = __ethtool_get_settings(slave_dev, &ecmd); + res = __ethtool_get_link_ksettings(slave_dev, &ecmd); if (res < 0) return; - slave_speed = ethtool_cmd_speed(&ecmd); - if (slave_speed == 0 || slave_speed == ((__u32) -1)) + if (ecmd.base.speed == 0 || ecmd.base.speed == ((__u32)-1)) return; - switch (ecmd.duplex) { + switch (ecmd.base.duplex) { case DUPLEX_FULL: case DUPLEX_HALF: break; @@ -399,8 +397,8 @@ static void bond_update_speed_duplex(struct slave *slave) return; } - slave->speed = slave_speed; - slave->duplex = ecmd.duplex; + slave->speed = ecmd.base.speed; + slave->duplex = ecmd.base.duplex; return; } |