1 files changed, 47 insertions, 11 deletions

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 490b2b7cd3ab..c67e93117271 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -31,14 +31,22 @@
 #include "e1000.h"
 #include <asm/uaccess.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) FIELD_SIZEOF(struct e1000_adapter, 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) },
@@ -50,19 +58,19 @@ static const struct e1000_stats e1000_gstrings_stats[] = {
         { "tx_multicast", E1000_STAT(stats.mptc) },
         { "rx_errors", E1000_STAT(stats.rxerrc) },
         { "tx_errors", E1000_STAT(stats.txerrc) },
-        { "tx_dropped", E1000_STAT(net_stats.tx_dropped) },
+        { "tx_dropped", E1000_NETDEV_STAT(stats.tx_dropped) },
         { "multicast", E1000_STAT(stats.mprc) },
         { "collisions", E1000_STAT(stats.colc) },
         { "rx_length_errors", E1000_STAT(stats.rlerrc) },
-        { "rx_over_errors", E1000_STAT(net_stats.rx_over_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) },
@@ -207,6 +215,23 @@ static int e1000_set_settings(struct net_device *netdev,
         return 0;
 }
 
+static u32 e1000_get_link(struct net_device *netdev)
+{
+        struct e1000_adapter *adapter = netdev_priv(netdev);
+
+        /*
+         * 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))
+                adapter->hw.get_link_status = 1;
+
+        return e1000_has_link(adapter);
+}
+
 static void e1000_get_pauseparam(struct net_device *netdev,
                                  struct ethtool_pauseparam *pause)
 {
@@ -861,10 +886,10 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
 
         /* NOTE: we don't test MSI interrupts here, yet */
         /* 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 = false;
-        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;
                 return -1;
@@ -1830,10 +1855,21 @@ static void e1000_get_ethtool_stats(struct net_device *netdev,
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         int i;
+        char *p = NULL;
 
         e1000_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;
         }
@@ -1873,7 +1909,7 @@ static const struct ethtool_ops e1000_ethtool_ops = {
         .get_msglevel           = e1000_get_msglevel,
         .set_msglevel           = e1000_set_msglevel,
         .nway_reset             = e1000_nway_reset,
-        .get_link               = ethtool_op_get_link,
+        .get_link               = e1000_get_link,
         .get_eeprom_len         = e1000_get_eeprom_len,
         .get_eeprom             = e1000_get_eeprom,
         .set_eeprom             = e1000_set_eeprom,