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, 4 deletions

diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 662365676689..ab255fbc7f36 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -664,7 +664,7 @@ static void bnx2fc_link_speed_update(struct fc_lport *lport)
         struct fcoe_port *port = lport_priv(lport);
         struct bnx2fc_hba *hba = port->priv;
         struct net_device *netdev = hba->netdev;
-        struct ethtool_cmd ecmd = { ETHTOOL_GSET };
+        struct ethtool_cmd ecmd;
 
         if (!dev_ethtool_get_settings(netdev, &ecmd)) {
                 lport->link_supported_speeds &=
@@ -675,12 +675,15 @@ static void bnx2fc_link_speed_update(struct fc_lport *lport)
                 if (ecmd.supported & SUPPORTED_10000baseT_Full)
                         lport->link_supported_speeds |= FC_PORTSPEED_10GBIT;
 
-                if (ecmd.speed == SPEED_1000)
+                switch (ethtool_cmd_speed(&ecmd)) {
+                case SPEED_1000:
                         lport->link_speed = FC_PORTSPEED_1GBIT;
-                if (ecmd.speed == SPEED_10000)
+                        break;
+                case SPEED_10000:
                         lport->link_speed = FC_PORTSPEED_10GBIT;
+                        break;
+                }
         }
-        return;
 }
 static int bnx2fc_link_ok(struct fc_lport *lport)
 {