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, 7 insertions, 5 deletions

diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index fbfb5b47c506..03e217a868d4 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -591,10 +591,11 @@ static void etherh_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i
 static int etherh_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         cmd->supported  = etherh_priv(dev)->supported;
-        cmd->speed      = SPEED_10;
+        ethtool_cmd_speed_set(cmd, SPEED_10);
         cmd->duplex     = DUPLEX_HALF;
         cmd->port       = dev->if_port == IF_PORT_10BASET ? PORT_TP : PORT_BNC;
-        cmd->autoneg    = dev->flags & IFF_AUTOMEDIA ? AUTONEG_ENABLE : AUTONEG_DISABLE;
+        cmd->autoneg    = (dev->flags & IFF_AUTOMEDIA ?
+                           AUTONEG_ENABLE : AUTONEG_DISABLE);
         return 0;
 }
 
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c
index aa07657744c3..a7b0caa18179 100644
--- a/drivers/net/arm/ks8695net.c
+++ b/drivers/net/arm/ks8695net.c
@@ -891,15 +891,16 @@ ks8695_wan_get_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
                         cmd->advertising |= ADVERTISED_Pause;
                 cmd->autoneg = AUTONEG_ENABLE;
 
-                cmd->speed = (ctrl & WMC_WSS) ? SPEED_100 : SPEED_10;
+                ethtool_cmd_speed_set(cmd,
+                                      (ctrl & WMC_WSS) ? SPEED_100 : SPEED_10);
                 cmd->duplex = (ctrl & WMC_WDS) ?
                         DUPLEX_FULL : DUPLEX_HALF;
         } else {
                 /* auto-negotiation is disabled */
                 cmd->autoneg = AUTONEG_DISABLE;
 
-                cmd->speed = (ctrl & WMC_WANF100) ?
-                        SPEED_100 : SPEED_10;
+                ethtool_cmd_speed_set(cmd, ((ctrl & WMC_WANF100) ?
+                                            SPEED_100 : SPEED_10));
                 cmd->duplex = (ctrl & WMC_WANFF) ?
                         DUPLEX_FULL : DUPLEX_HALF;
         }