net: consolidate and fix ethtool_ops->get_settings calling

[pandora-kernel.git] / include / rdma / ib_addr.h

diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h
index ae8c68f..639a449 100644 (file)
--- a/include/rdma/ib_addr.h
+++ b/include/rdma/ib_addr.h
@@ -218,8 +218,12 @@ static inline int iboe_get_rate(struct net_device *dev)
 {
        struct ethtool_cmd cmd;
        u32 speed;
+       int err;
 
-       if (dev_ethtool_get_settings(dev, &cmd))
+       rtnl_lock();
+       err = __ethtool_get_settings(dev, &cmd);
+       rtnl_unlock();
+       if (err)
                return IB_RATE_PORT_CURRENT;
 
        speed = ethtool_cmd_speed(&cmd);