Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1342356
| From | David Decotigny <ddecotig@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH net-next v9 06/16] net: bonding: use __ethtool_get_ksettings |
| Date | 2016-02-24 20:10 +0100 |
| Message-ID | <r5MYX-wi-37@gated-at.bofh.it> (permalink) |
| References | <r5MPf-cO-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: David Decotigny <decot@googlers.com>
Signed-off-by: David Decotigny <decot@googlers.com>
---
drivers/net/bonding/bond_main.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index a6527d5..b6236ff 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;
}
--
2.7.0.rc3.207.g0ac5344
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
[PATCH net-next v9 00/16] new ETHTOOL_GLINKSETTINGS/SLINKSETTINGS API David Decotigny <ddecotig@gmail.com> - 2016-02-24 20:00 +0100 [PATCH net-next v9 15/16] net: ethtool: remove unused __ethtool_get_settings David Decotigny <ddecotig@gmail.com> - 2016-02-24 20:00 +0100 [PATCH net-next v9 09/16] net: team: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-02-24 20:00 +0100 [PATCH net-next v9 08/16] net: macvlan: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-02-24 20:10 +0100 [PATCH net-next v9 02/16] net: usnic: use __ethtool_get_settings David Decotigny <ddecotig@gmail.com> - 2016-02-24 20:10 +0100 [PATCH net-next v9 10/16] net: fcoe: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-02-24 20:10 +0100 [PATCH net-next v9 14/16] net: core: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-02-24 20:10 +0100 [PATCH net-next v9 07/16] net: ipvlan: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-02-24 20:10 +0100 [PATCH net-next v9 13/16] net: bridge: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-02-24 20:10 +0100 [PATCH net-next v9 04/16] tx4939: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-02-24 20:10 +0100 [PATCH net-next v9 11/16] net: rdma: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-02-24 20:10 +0100 [PATCH net-next v9 06/16] net: bonding: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-02-24 20:10 +0100
csiph-web