From 2c2207cdcf94397944a2281d60180d3359f1ba6b Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Mon, 12 Sep 2005 14:43:18 -0700
Subject: [PATCH] --- yaml --- r: 8711 b: refs/heads/master c:
 4f63b877726135b19ae73108acf9e0ebb4323dda h: refs/heads/master i:   8709:
 6cea0256c78c65da852cfd13529174d265fa3a1b   8707:
 24fe48979298fb35d6a220725524aca5445b33c3   8703:
 c1fcf537ef35906171bb1e1fc1344bd5220bd83a v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 09f15e051c96..bb0f38a98912 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b88a762b6062f06d431af0045de4854a758646c0
+refs/heads/master: 4f63b877726135b19ae73108acf9e0ebb4323dda
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index dc57352e5a97..8da555416858 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -6893,8 +6893,7 @@ static struct net_device_stats *tg3_get_stats(struct net_device *dev)
 		get_stat64(&hw_stats->tx_octets);
 
 	stats->rx_errors = old_stats->rx_errors +
-		get_stat64(&hw_stats->rx_errors) +
-		get_stat64(&hw_stats->rx_discards);
+		get_stat64(&hw_stats->rx_errors);
 	stats->tx_errors = old_stats->tx_errors +
 		get_stat64(&hw_stats->tx_errors) +
 		get_stat64(&hw_stats->tx_mac_errors) +
@@ -6922,6 +6921,9 @@ static struct net_device_stats *tg3_get_stats(struct net_device *dev)
 	stats->rx_crc_errors = old_stats->rx_crc_errors +
 		calc_crc_errors(tp);
 
+	stats->rx_missed_errors = old_stats->rx_missed_errors +
+		get_stat64(&hw_stats->rx_discards);
+
 	return stats;
 }