From 1f91ef545374deba6e4232f126286294b3bf8ef4 Mon Sep 17 00:00:00 2001
From: Satyam Sharma <satyam@infradead.org>
Date: Wed, 26 Sep 2007 22:29:02 -0700
Subject: [PATCH] --- yaml --- r: 66749 b: refs/heads/master c:
 7a876fae9da2b1417246a3eac0ac83889f12fa27 h: refs/heads/master i:   66747:
 3ecab01febdf23cf2b989d552f4eae021a2c76ed v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/net/spider_net_ethtool.c | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index d298f06f0ce5..9e6ef7235366 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0aa4f3331b1df09a500e1fda84145255303af573
+refs/heads/master: 7a876fae9da2b1417246a3eac0ac83889f12fa27
diff --git a/trunk/drivers/net/spider_net_ethtool.c b/trunk/drivers/net/spider_net_ethtool.c
index 94273037102f..85691d2a0be2 100644
--- a/trunk/drivers/net/spider_net_ethtool.c
+++ b/trunk/drivers/net/spider_net_ethtool.c
@@ -28,8 +28,6 @@
 #include "spider_net.h"
 
 
-#define SPIDER_NET_NUM_STATS 13
-
 static struct {
 	const char str[ETH_GSTRING_LEN];
 } ethtool_stats_keys[] = {
@@ -151,7 +149,7 @@ static int spider_net_get_sset_count(struct net_device *netdev, int sset)
 {
 	switch (sset) {
 	case ETH_SS_STATS:
-		return SPIDER_NET_NUM_STATS;
+		return ARRAY_SIZE(ethtool_stats_keys);
 	default:
 		return -EOPNOTSUPP;
 	}
@@ -162,13 +160,13 @@ static void spider_net_get_ethtool_stats(struct net_device *netdev,
 {
 	struct spider_net_card *card = netdev->priv;
 
-	data[0] = card->netdev_stats.tx_packets;
-	data[1] = card->netdev_stats.tx_bytes;
-	data[2] = card->netdev_stats.rx_packets;
-	data[3] = card->netdev_stats.rx_bytes;
-	data[4] = card->netdev_stats.tx_errors;
-	data[5] = card->netdev_stats.tx_dropped;
-	data[6] = card->netdev_stats.rx_dropped;
+	data[0] = netdev->stats.tx_packets;
+	data[1] = netdev->stats.tx_bytes;
+	data[2] = netdev->stats.rx_packets;
+	data[3] = netdev->stats.rx_bytes;
+	data[4] = netdev->stats.tx_errors;
+	data[5] = netdev->stats.tx_dropped;
+	data[6] = netdev->stats.rx_dropped;
 	data[7] = card->spider_stats.rx_desc_error;
 	data[8] = card->spider_stats.tx_timeouts;
 	data[9] = card->spider_stats.alloc_rx_skb_error;