diff options
| author |   David Decotigny <decot@googlers.com> | 2016-02-24 10:58:07 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-02-25 22:06:46 -0500 |
| commit | 17605b961f766757fddec20810453fc51b266e77 (patch) | |
| tree | 91c518e8a83a3e9226b4d6f77ea0b554016bc000 | |
| parent | net: fcoe: use __ethtool_get_ksettings (diff) | |
| download | linux-dev-17605b961f766757fddec20810453fc51b266e77.tar.xz linux-dev-17605b961f766757fddec20810453fc51b266e77.zip | |
net: rdma: use __ethtool_get_ksettings
Signed-off-by: David Decotigny <decot@googlers.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/rdma/ib_addr.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h index c34c9002460c..931a47ba4571 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; |