Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1342355
| From | David Decotigny <ddecotig@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH net-next v9 11/16] net: rdma: use __ethtool_get_ksettings |
| Date | 2016-02-24 20:10 +0100 |
| Message-ID | <r5MYX-wi-43@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>
---
include/rdma/ib_addr.h | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h
index c34c900..931a47b 100644
--- a/include/rdma/ib_addr.h
+++ b/include/rdma/ib_addr.h
@@ -262,24 +262,22 @@ static inline enum ib_mtu iboe_get_mtu(int mtu)
static inline int iboe_get_rate(struct net_device *dev)
{
- struct ethtool_cmd cmd;
- u32 speed;
+ struct ethtool_link_ksettings cmd;
int err;
rtnl_lock();
- err = __ethtool_get_settings(dev, &cmd);
+ err = __ethtool_get_link_ksettings(dev, &cmd);
rtnl_unlock();
if (err)
return IB_RATE_PORT_CURRENT;
- speed = ethtool_cmd_speed(&cmd);
- if (speed >= 40000)
+ if (cmd.base.speed >= 40000)
return IB_RATE_40_GBPS;
- else if (speed >= 30000)
+ else if (cmd.base.speed >= 30000)
return IB_RATE_30_GBPS;
- else if (speed >= 20000)
+ else if (cmd.base.speed >= 20000)
return IB_RATE_20_GBPS;
- else if (speed >= 10000)
+ else if (cmd.base.speed >= 10000)
return IB_RATE_10_GBPS;
else
return IB_RATE_PORT_CURRENT;
--
2.7.0.rc3.207.g0ac5344
Back to linux.kernel | Previous | Next — Previous in thread | Next 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