Commit 17605b96 authored by David Decotigny's avatar David Decotigny Committed by David S. Miller

net: rdma: use __ethtool_get_ksettings

Signed-off-by: default avatarDavid Decotigny <decot@googlers.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 008eb736
...@@ -262,24 +262,22 @@ static inline enum ib_mtu iboe_get_mtu(int mtu) ...@@ -262,24 +262,22 @@ static inline enum ib_mtu iboe_get_mtu(int mtu)
static inline int iboe_get_rate(struct net_device *dev) static inline int iboe_get_rate(struct net_device *dev)
{ {
struct ethtool_cmd cmd; struct ethtool_link_ksettings cmd;
u32 speed;
int err; int err;
rtnl_lock(); rtnl_lock();
err = __ethtool_get_settings(dev, &cmd); err = __ethtool_get_link_ksettings(dev, &cmd);
rtnl_unlock(); rtnl_unlock();
if (err) if (err)
return IB_RATE_PORT_CURRENT; return IB_RATE_PORT_CURRENT;
speed = ethtool_cmd_speed(&cmd); if (cmd.base.speed >= 40000)
if (speed >= 40000)
return IB_RATE_40_GBPS; return IB_RATE_40_GBPS;
else if (speed >= 30000) else if (cmd.base.speed >= 30000)
return IB_RATE_30_GBPS; return IB_RATE_30_GBPS;
else if (speed >= 20000) else if (cmd.base.speed >= 20000)
return IB_RATE_20_GBPS; return IB_RATE_20_GBPS;
else if (speed >= 10000) else if (cmd.base.speed >= 10000)
return IB_RATE_10_GBPS; return IB_RATE_10_GBPS;
else else
return IB_RATE_PORT_CURRENT; return IB_RATE_PORT_CURRENT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment