Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.

1 files changed, 7 insertions, 6 deletions

diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h
index b5fc9f39122b..ae8c68f30f1b 100644
--- a/include/rdma/ib_addr.h
+++ b/include/rdma/ib_addr.h
@@ -217,18 +217,19 @@ 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;
 
-        if (!dev->ethtool_ops || !dev->ethtool_ops->get_settings ||
-            dev->ethtool_ops->get_settings(dev, &cmd))
+        if (dev_ethtool_get_settings(dev, &cmd))
                 return IB_RATE_PORT_CURRENT;
 
-        if (cmd.speed >= 40000)
+        speed = ethtool_cmd_speed(&cmd);
+        if (speed >= 40000)
                 return IB_RATE_40_GBPS;
-        else if (cmd.speed >= 30000)
+        else if (speed >= 30000)
                 return IB_RATE_30_GBPS;
-        else if (cmd.speed >= 20000)
+        else if (speed >= 20000)
                 return IB_RATE_20_GBPS;
-        else if (cmd.speed >= 10000)
+        else if (speed >= 10000)
                 return IB_RATE_10_GBPS;
         else
                 return IB_RATE_PORT_CURRENT;