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.

3 files changed, 20 insertions, 12 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)
 {
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
index de764ea7419d..a2a9c7c6c643 100644
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -450,12 +450,13 @@ static struct cxgbi_sock *cxgbi_sock_create(struct cxgbi_device *cdev)
         return csk;
 }
 
-static struct rtable *find_route_ipv4(__be32 saddr, __be32 daddr,
+static struct rtable *find_route_ipv4(struct flowi4 *fl4,
+                                      __be32 saddr, __be32 daddr,
                                       __be16 sport, __be16 dport, u8 tos)
 {
         struct rtable *rt;
 
-        rt = ip_route_output_ports(&init_net, NULL, daddr, saddr,
+        rt = ip_route_output_ports(&init_net, fl4, NULL, daddr, saddr,
                                    dport, sport, IPPROTO_TCP, tos, 0);
         if (IS_ERR(rt))
                 return NULL;
@@ -470,6 +471,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
         struct net_device *ndev;
         struct cxgbi_device *cdev;
         struct rtable *rt = NULL;
+        struct flowi4 fl4;
         struct cxgbi_sock *csk = NULL;
         unsigned int mtu = 0;
         int port = 0xFFFF;
@@ -482,7 +484,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
                 goto err_out;
         }
 
-        rt = find_route_ipv4(0, daddr->sin_addr.s_addr, 0, daddr->sin_port, 0);
+        rt = find_route_ipv4(&fl4, 0, daddr->sin_addr.s_addr, 0, daddr->sin_port, 0);
         if (!rt) {
                 pr_info("no route to ipv4 0x%x, port %u.\n",
                         daddr->sin_addr.s_addr, daddr->sin_port);
@@ -531,7 +533,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
         csk->daddr.sin_addr.s_addr = daddr->sin_addr.s_addr;
         csk->daddr.sin_port = daddr->sin_port;
         csk->daddr.sin_family = daddr->sin_family;
-        csk->saddr.sin_addr.s_addr = rt->rt_src;
+        csk->saddr.sin_addr.s_addr = fl4.saddr;
 
         return csk;
 
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 5d3700dc6f8c..cc23bd9480b2 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -1952,7 +1952,7 @@ out_nodev:
 int fcoe_link_speed_update(struct fc_lport *lport)
 {
         struct net_device *netdev = fcoe_netdev(lport);
-        struct ethtool_cmd ecmd = { ETHTOOL_GSET };
+        struct ethtool_cmd ecmd;
 
         if (!dev_ethtool_get_settings(netdev, &ecmd)) {
                 lport->link_supported_speeds &=
@@ -1963,11 +1963,14 @@ int fcoe_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 0;
         }
         return -1;