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.

2 files changed, 21 insertions, 29 deletions

diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ehea/ehea_ethtool.c
index f3bbdcef338c..7f642aef5e82 100644
--- a/drivers/net/ehea/ehea_ethtool.c
+++ b/drivers/net/ehea/ehea_ethtool.c
@@ -34,6 +34,7 @@
 static int ehea_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct ehea_port *port = netdev_priv(dev);
+        u32 speed;
         int ret;
 
         ret = ehea_sense_port_attr(port);
@@ -43,17 +44,29 @@ static int ehea_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
         if (netif_carrier_ok(dev)) {
                 switch (port->port_speed) {
-                case EHEA_SPEED_10M: cmd->speed = SPEED_10; break;
-                case EHEA_SPEED_100M: cmd->speed = SPEED_100; break;
-                case EHEA_SPEED_1G: cmd->speed = SPEED_1000; break;
-                case EHEA_SPEED_10G: cmd->speed = SPEED_10000; break;
+                case EHEA_SPEED_10M:
+                        speed = SPEED_10;
+                        break;
+                case EHEA_SPEED_100M:
+                        speed = SPEED_100;
+                        break;
+                case EHEA_SPEED_1G:
+                        speed = SPEED_1000;
+                        break;
+                case EHEA_SPEED_10G:
+                        speed = SPEED_10000;
+                        break;
+                default:
+                        speed = -1;
+                        break; /* BUG */
                 }
                 cmd->duplex = port->full_duplex == 1 ?
                                                      DUPLEX_FULL : DUPLEX_HALF;
         } else {
-                cmd->speed = -1;
+                speed = ~0;
                 cmd->duplex = -1;
         }
+        ethtool_cmd_speed_set(cmd, speed);
 
         if (cmd->speed == SPEED_10000) {
                 cmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE);
@@ -167,11 +180,6 @@ static void ehea_set_msglevel(struct net_device *dev, u32 value)
         port->msg_enable = value;
 }
 
-static u32 ehea_get_rx_csum(struct net_device *dev)
-{
-        return 1;
-}
-
 static char ehea_ethtool_stats_keys[][ETH_GSTRING_LEN] = {
         {"sig_comp_iv"},
         {"swqe_refill_th"},
@@ -268,34 +276,16 @@ static void ehea_get_ethtool_stats(struct net_device *dev,
 
 }
 
-static int ehea_set_flags(struct net_device *dev, u32 data)
-{
-        /* Avoid changing the VLAN flags */
-        if ((data & (ETH_FLAG_RXVLAN | ETH_FLAG_TXVLAN)) !=
-            (ethtool_op_get_flags(dev) & (ETH_FLAG_RXVLAN |
-                                          ETH_FLAG_TXVLAN))){
-                return -EINVAL;
-        }
-
-        return ethtool_op_set_flags(dev, data, ETH_FLAG_LRO
-                                        | ETH_FLAG_TXVLAN
-                                        | ETH_FLAG_RXVLAN);
-}
-
 const struct ethtool_ops ehea_ethtool_ops = {
         .get_settings = ehea_get_settings,
         .get_drvinfo = ehea_get_drvinfo,
         .get_msglevel = ehea_get_msglevel,
         .set_msglevel = ehea_set_msglevel,
         .get_link = ethtool_op_get_link,
-        .set_tso = ethtool_op_set_tso,
         .get_strings = ehea_get_strings,
         .get_sset_count = ehea_get_sset_count,
         .get_ethtool_stats = ehea_get_ethtool_stats,
-        .get_rx_csum = ehea_get_rx_csum,
         .set_settings = ehea_set_settings,
-        .get_flags = ethtool_op_get_flags,
-        .set_flags = ehea_set_flags,
         .nway_reset = ehea_nway_reset,          /* Restart autonegotiation */
 };
 
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 2c60435f2beb..6a0a8fca62bc 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -3263,10 +3263,12 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
         dev->netdev_ops = &ehea_netdev_ops;
         ehea_set_ethtool_ops(dev);
 
+        dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO
+                      | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX | NETIF_F_LRO;
         dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO
                       | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX
                       | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER
-                      | NETIF_F_LLTX;
+                      | NETIF_F_LLTX | NETIF_F_RXCSUM;
         dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT;
 
         if (use_lro)