Messages in this thread Patch in this message | | | From | David Decotigny <> | Subject | [PATCH net-next v3 11/17] net: rdma: use __ethtool_get_ksettings | Date | Mon, 30 Nov 2015 14:05:49 -0800 |
| |
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 1152859..1820f26 100644 --- a/include/rdma/ib_addr.h +++ b/include/rdma/ib_addr.h @@ -254,24 +254,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_ksettings cmd; int err; rtnl_lock(); - err = __ethtool_get_settings(dev, &cmd); + err = __ethtool_get_ksettings(dev, &cmd); rtnl_unlock(); if (err) return IB_RATE_PORT_CURRENT; - speed = ethtool_cmd_speed(&cmd); - if (speed >= 40000) + if (cmd.parent.speed >= 40000) return IB_RATE_40_GBPS; - else if (speed >= 30000) + else if (cmd.parent.speed >= 30000) return IB_RATE_30_GBPS; - else if (speed >= 20000) + else if (cmd.parent.speed >= 20000) return IB_RATE_20_GBPS; - else if (speed >= 10000) + else if (cmd.parent.speed >= 10000) return IB_RATE_10_GBPS; else return IB_RATE_PORT_CURRENT; -- 2.6.0.rc2.230.g3dd15c0
| |