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

diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 01560bb67a7..d7c1bfe4b6e 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -2659,15 +2659,15 @@ static int ace_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 
         link = readl(&regs->GigLnkState);
         if (link & LNK_1000MB)
-                ecmd->speed = SPEED_1000;
+                ethtool_cmd_speed_set(ecmd, SPEED_1000);
         else {
                 link = readl(&regs->FastLnkState);
                 if (link & LNK_100MB)
-                        ecmd->speed = SPEED_100;
+                        ethtool_cmd_speed_set(ecmd, SPEED_100);
                 else if (link & LNK_10MB)
-                        ecmd->speed = SPEED_10;
+                        ethtool_cmd_speed_set(ecmd, SPEED_10);
                 else
-                        ecmd->speed = 0;
+                        ethtool_cmd_speed_set(ecmd, 0);
         }
         if (link & LNK_FULL_DUPLEX)
                 ecmd->duplex = DUPLEX_FULL;
@@ -2719,9 +2719,9 @@ static int ace_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                 link |= LNK_TX_FLOW_CTL_Y;
         if (ecmd->autoneg == AUTONEG_ENABLE)
                 link |= LNK_NEGOTIATE;
-        if (ecmd->speed != speed) {
+        if (ethtool_cmd_speed(ecmd) != speed) {
                 link &= ~(LNK_1000MB | LNK_100MB | LNK_10MB);
-                switch (speed) {
+                switch (ethtool_cmd_speed(ecmd)) {
                 case SPEED_1000:
                         link |= LNK_1000MB;
                         break;