[NET] drivers/net: statistics cleanup #1 -- save memory and shrink code

We now have struct net_device_stats embedded in struct net_device,
and the default ->get_stats() hook does the obvious thing for us.

Run through drivers/net/* and remove the driver-local storage of
statistics, and driver-local ->get_stats() hook where applicable.

This was just the low-hanging fruit in drivers/net; plenty more drivers
remain to be updated.

[ Resolved conflicts with napi_struct changes and fix sunqe build
  regression... -DaveM ]

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 20 deletions

diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index e5bbcbe8de5f..cebe55440e13 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -579,8 +579,8 @@ out:
         adjust_tx_list();
         current_tx_ptr = current_tx_ptr->next;
         dev->trans_start = jiffies;
-        lp->stats.tx_packets++;
-        lp->stats.tx_bytes += (skb->len);
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes += (skb->len);
         return 0;
 }
 
@@ -596,7 +596,7 @@ static void bf537mac_rx(struct net_device *dev)
         if (!new_skb) {
                 printk(KERN_NOTICE DRV_NAME
                        ": rx: low on mem - packet dropped\n");
-                lp->stats.rx_dropped++;
+                dev->stats.rx_dropped++;
                 goto out;
         }
         /* reserve 2 bytes for RXDWA padding */
@@ -618,8 +618,8 @@ static void bf537mac_rx(struct net_device *dev)
 #endif
 
         netif_rx(skb);
-        lp->stats.rx_packets++;
-        lp->stats.rx_bytes += len;
+        dev->stats.rx_packets++;
+        dev->stats.rx_bytes += len;
         current_rx_ptr->status.status_word = 0x00000000;
         current_rx_ptr = current_rx_ptr->next;
 
@@ -733,20 +733,6 @@ static void bf537mac_timeout(struct net_device *dev)
 }
 
 /*
- * Get the current statistics.
- * This may be called with the card open or closed.
- */
-static struct net_device_stats *bf537mac_query_statistics(struct net_device
-                                                          *dev)
-{
-        struct bf537mac_local *lp = netdev_priv(dev);
-
-        pr_debug("%s: %s\n", dev->name, __FUNCTION__);
-
-        return &lp->stats;
-}
-
-/*
  * This routine will, depending on the values passed to it,
  * either make it accept multicast packets, go into
  * promiscuous mode (for TCPDUMP and cousins) or accept
@@ -891,7 +877,6 @@ static int __init bf537mac_probe(struct net_device *dev)
         dev->stop = bf537mac_close;
         dev->hard_start_xmit = bf537mac_hard_start_xmit;
         dev->tx_timeout = bf537mac_timeout;
-        dev->get_stats = bf537mac_query_statistics;
         dev->set_multicast_list = bf537mac_set_multicast_list;
 #ifdef CONFIG_NET_POLL_CONTROLLER
         dev->poll_controller = bf537mac_poll;