2 files changed, 13 insertions, 4 deletions

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index d05c6a06da44..574fe9785f3c 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -364,7 +364,6 @@ static const struct {
         { "dma_write_prioq_full" },
         { "rxbds_empty" },
         { "rx_discards" },
-        { "mbuf_lwm_thresh_hit" },
         { "rx_errors" },
         { "rx_threshold_hit" },
 
@@ -376,7 +375,9 @@ static const struct {
         { "ring_status_update" },
         { "nic_irqs" },
         { "nic_avoided_irqs" },
-        { "nic_tx_threshold_hit" }
+        { "nic_tx_threshold_hit" },
+
+        { "mbuf_lwm_thresh_hit" },
 };
 
 #define TG3_NUM_STATS   ARRAY_SIZE(ethtool_stats_keys)
@@ -9546,6 +9547,8 @@ static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *tp)
         ESTAT_ADD(nic_avoided_irqs);
         ESTAT_ADD(nic_tx_threshold_hit);
 
+        ESTAT_ADD(mbuf_lwm_thresh_hit);
+
         return estats;
 }
 
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index 83f45bf0a08e..5b3d2f34da7a 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2620,7 +2620,6 @@ struct tg3_hw_stats {
         tg3_stat64_t                    dma_write_prioq_full;
         tg3_stat64_t                    rxbds_empty;
         tg3_stat64_t                    rx_discards;
-        tg3_stat64_t                    mbuf_lwm_thresh_hit;
         tg3_stat64_t                    rx_errors;
         tg3_stat64_t                    rx_threshold_hit;
 
@@ -2639,7 +2638,12 @@ struct tg3_hw_stats {
         tg3_stat64_t                    nic_avoided_irqs;
         tg3_stat64_t                    nic_tx_threshold_hit;
 
-        u8                              __reserved4[0xb00-0x9c0];
+        /* NOT a part of the hardware statistics block format.
+         * These stats are here as storage for tg3_periodic_fetch_stats().
+         */
+        tg3_stat64_t                    mbuf_lwm_thresh_hit;
+
+        u8                              __reserved4[0xb00-0x9c8];
 };
 
 /* 'mapping' is superfluous as the chip does not write into
@@ -2771,6 +2775,8 @@ struct tg3_ethtool_stats {
         u64             nic_irqs;
         u64             nic_avoided_irqs;
         u64             nic_tx_threshold_hit;
+
+        u64             mbuf_lwm_thresh_hit;
 };
 
 struct tg3_rx_prodring_set {