Patched in Tegra support.

1 files changed, 2 insertions, 6 deletions

diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h
index 99965395c5f..ae8c68f30f1 100644
--- a/include/rdma/ib_addr.h
+++ b/include/rdma/ib_addr.h
@@ -218,12 +218,8 @@ static inline int iboe_get_rate(struct net_device *dev)
 {
         struct ethtool_cmd cmd;
         u32 speed;
-        int err;
 
-        rtnl_lock();
-        err = __ethtool_get_settings(dev, &cmd);
-        rtnl_unlock();
-        if (err)
+        if (dev_ethtool_get_settings(dev, &cmd))
                 return IB_RATE_PORT_CURRENT;
 
         speed = ethtool_cmd_speed(&cmd);
@@ -281,7 +277,7 @@ static inline u16 rdma_get_vlan_id(union ib_gid *dgid)
 static inline struct net_device *rdma_vlan_dev_real_dev(const struct net_device *dev)
 {
         return dev->priv_flags & IFF_802_1Q_VLAN ?
-                vlan_dev_real_dev(dev) : NULL;
+                vlan_dev_real_dev(dev) : 0;
 }
 
 #endif /* IB_ADDR_H */