Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 62 insertions, 22 deletions

diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index e82638ecae88..983493f2330c 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
+  Copyright(c) 1999 - 2009 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -31,18 +31,27 @@
 #include <linux/netdevice.h>
 #include <linux/ethtool.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 
 #include "e1000.h"
 
+enum {NETDEV_STATS, E1000_STATS};
+
 struct e1000_stats {
         char stat_string[ETH_GSTRING_LEN];
+        int type;
         int sizeof_stat;
         int stat_offset;
 };
 
-#define E1000_STAT(m) sizeof(((struct e1000_adapter *)0)->m), \
-                      offsetof(struct e1000_adapter, m)
+#define E1000_STAT(m)           E1000_STATS, \
+                                sizeof(((struct e1000_adapter *)0)->m), \
+                                offsetof(struct e1000_adapter, m)
+#define E1000_NETDEV_STAT(m)    NETDEV_STATS, \
+                                sizeof(((struct net_device *)0)->m), \
+                                offsetof(struct net_device, m)
+
 static const struct e1000_stats e1000_gstrings_stats[] = {
         { "rx_packets", E1000_STAT(stats.gprc) },
         { "tx_packets", E1000_STAT(stats.gptc) },
@@ -52,21 +61,21 @@ static const struct e1000_stats e1000_gstrings_stats[] = {
         { "tx_broadcast", E1000_STAT(stats.bptc) },
         { "rx_multicast", E1000_STAT(stats.mprc) },
         { "tx_multicast", E1000_STAT(stats.mptc) },
-        { "rx_errors", E1000_STAT(net_stats.rx_errors) },
-        { "tx_errors", E1000_STAT(net_stats.tx_errors) },
-        { "tx_dropped", E1000_STAT(net_stats.tx_dropped) },
+        { "rx_errors", E1000_NETDEV_STAT(stats.rx_errors) },
+        { "tx_errors", E1000_NETDEV_STAT(stats.tx_errors) },
+        { "tx_dropped", E1000_NETDEV_STAT(stats.tx_dropped) },
         { "multicast", E1000_STAT(stats.mprc) },
         { "collisions", E1000_STAT(stats.colc) },
-        { "rx_length_errors", E1000_STAT(net_stats.rx_length_errors) },
-        { "rx_over_errors", E1000_STAT(net_stats.rx_over_errors) },
+        { "rx_length_errors", E1000_NETDEV_STAT(stats.rx_length_errors) },
+        { "rx_over_errors", E1000_NETDEV_STAT(stats.rx_over_errors) },
         { "rx_crc_errors", E1000_STAT(stats.crcerrs) },
-        { "rx_frame_errors", E1000_STAT(net_stats.rx_frame_errors) },
+        { "rx_frame_errors", E1000_NETDEV_STAT(stats.rx_frame_errors) },
         { "rx_no_buffer_count", E1000_STAT(stats.rnbc) },
         { "rx_missed_errors", E1000_STAT(stats.mpc) },
         { "tx_aborted_errors", E1000_STAT(stats.ecol) },
         { "tx_carrier_errors", E1000_STAT(stats.tncrs) },
-        { "tx_fifo_errors", E1000_STAT(net_stats.tx_fifo_errors) },
-        { "tx_heartbeat_errors", E1000_STAT(net_stats.tx_heartbeat_errors) },
+        { "tx_fifo_errors", E1000_NETDEV_STAT(stats.tx_fifo_errors) },
+        { "tx_heartbeat_errors", E1000_NETDEV_STAT(stats.tx_heartbeat_errors) },
         { "tx_window_errors", E1000_STAT(stats.latecol) },
         { "tx_abort_late_coll", E1000_STAT(stats.latecol) },
         { "tx_deferred_ok", E1000_STAT(stats.dc) },
@@ -182,8 +191,19 @@ static int e1000_get_settings(struct net_device *netdev,
 static u32 e1000_get_link(struct net_device *netdev)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
+        struct e1000_mac_info *mac = &adapter->hw.mac;
+
+        /*
+         * If the link is not reported up to netdev, interrupts are disabled,
+         * and so the physical link state may have changed since we last
+         * looked. Set get_link_status to make sure that the true link
+         * state is interrogated, rather than pulling a cached and possibly
+         * stale link state from the driver.
+         */
+        if (!netif_carrier_ok(netdev))
+                mac->get_link_status = 1;
 
-        return e1000_has_link(adapter);
+        return e1000e_has_link(adapter);
 }
 
 static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)
@@ -516,7 +536,8 @@ static int e1000_get_eeprom(struct net_device *netdev,
 
         if (ret_val) {
                 /* a read error occurred, throw away the result */
-                memset(eeprom_buff, 0xff, sizeof(eeprom_buff));
+                memset(eeprom_buff, 0xff, sizeof(u16) *
+                       (last_word - first_word + 1));
         } else {
                 /* Device's eeprom is always little-endian, word addressable */
                 for (i = 0; i < last_word - first_word + 1; i++)
@@ -596,7 +617,9 @@ static int e1000_set_eeprom(struct net_device *netdev,
          * and flush shadow RAM for applicable controllers
          */
         if ((first_word <= NVM_CHECKSUM_REG) ||
-            (hw->mac.type == e1000_82574) || (hw->mac.type == e1000_82573))
+            (hw->mac.type == e1000_82583) ||
+            (hw->mac.type == e1000_82574) ||
+            (hw->mac.type == e1000_82573))
                 ret_val = e1000e_update_nvm_checksum(hw);
 
 out:
@@ -929,10 +952,10 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
                 e1000e_set_interrupt_capability(adapter);
         }
         /* Hook up test interrupt handler just for this test */
-        if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,
+        if (!request_irq(irq, e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,
                          netdev)) {
                 shared_int = 0;
-        } else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
+        } else if (request_irq(irq, e1000_test_intr, IRQF_SHARED,
                  netdev->name, netdev)) {
                 *data = 1;
                 ret_val = -1;
@@ -1239,6 +1262,10 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
 
         hw->mac.autoneg = 0;
 
+        /* Workaround: K1 must be disabled for stable 1Gbps operation */
+        if (hw->mac.type == e1000_pchlan)
+                e1000_configure_k1_ich8lan(hw, false);
+
         if (hw->phy.type == e1000_phy_m88) {
                 /* Auto-MDI/MDIX Off */
                 e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL, 0x0808);
@@ -1769,12 +1796,11 @@ static int e1000_set_wol(struct net_device *netdev,
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
 
-        if (wol->wolopts & WAKE_MAGICSECURE)
-                return -EOPNOTSUPP;
-
         if (!(adapter->flags & FLAG_HAS_WOL) ||
-            !device_can_wakeup(&adapter->pdev->dev))
-                return wol->wolopts ? -EOPNOTSUPP : 0;
+            !device_can_wakeup(&adapter->pdev->dev) ||
+            (wol->wolopts & ~(WAKE_UCAST | WAKE_MCAST | WAKE_BCAST |
+                              WAKE_MAGIC | WAKE_PHY | WAKE_ARP)))
+                return -EOPNOTSUPP;
 
         /* these settings will always override what we currently have */
         adapter->wol = 0;
@@ -1832,6 +1858,7 @@ static int e1000_phys_id(struct net_device *netdev, u32 data)
 
         if ((hw->phy.type == e1000_phy_ife) ||
             (hw->mac.type == e1000_pchlan) ||
+            (hw->mac.type == e1000_82583) ||
             (hw->mac.type == e1000_82574)) {
                 INIT_WORK(&adapter->led_blink_task, e1000e_led_blink_task);
                 if (!adapter->blink_timer.function) {
@@ -1912,10 +1939,21 @@ static void e1000_get_ethtool_stats(struct net_device *netdev,
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         int i;
+        char *p = NULL;
 
         e1000e_update_stats(adapter);
         for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
-                char *p = (char *)adapter+e1000_gstrings_stats[i].stat_offset;
+                switch (e1000_gstrings_stats[i].type) {
+                case NETDEV_STATS:
+                        p = (char *) netdev +
+                                        e1000_gstrings_stats[i].stat_offset;
+                        break;
+                case E1000_STATS:
+                        p = (char *) adapter +
+                                        e1000_gstrings_stats[i].stat_offset;
+                        break;
+                }
+
                 data[i] = (e1000_gstrings_stats[i].sizeof_stat ==
                         sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
         }
@@ -1975,6 +2013,8 @@ static const struct ethtool_ops e1000_ethtool_ops = {
         .get_sset_count         = e1000e_get_sset_count,
         .get_coalesce           = e1000_get_coalesce,
         .set_coalesce           = e1000_set_coalesce,
+        .get_flags              = ethtool_op_get_flags,
+        .set_flags              = ethtool_op_set_flags,
 };
 
 void e1000e_set_ethtool_ops(struct net_device *netdev)