[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, 19 insertions, 29 deletions

diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index ee157f5a5dbc..2761441f6644 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -75,7 +75,6 @@ struct bmac_data {
         int tx_fill;
         int tx_empty;
         unsigned char tx_fullup;
-        struct net_device_stats stats;
         struct timer_list tx_timeout;
         int timeout_active;
         int sleeping;
@@ -145,7 +144,6 @@ static unsigned char *bmac_emergency_rxbuf;
 static int bmac_open(struct net_device *dev);
 static int bmac_close(struct net_device *dev);
 static int bmac_transmit_packet(struct sk_buff *skb, struct net_device *dev);
-static struct net_device_stats *bmac_stats(struct net_device *dev);
 static void bmac_set_multicast(struct net_device *dev);
 static void bmac_reset_and_enable(struct net_device *dev);
 static void bmac_start_chip(struct net_device *dev);
@@ -668,7 +666,7 @@ static int bmac_transmit_packet(struct sk_buff *skb, struct net_device *dev)
         bp->tx_bufs[bp->tx_fill] = skb;
         bp->tx_fill = i;
 
-        bp->stats.tx_bytes += skb->len;
+        dev->stats.tx_bytes += skb->len;
 
         dbdma_continue(td);
 
@@ -707,8 +705,8 @@ static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id)
                 nb = RX_BUFLEN - residual - 2;
                 if (nb < (ETHERMINPACKET - ETHERCRC)) {
                         skb = NULL;
-                        bp->stats.rx_length_errors++;
-                        bp->stats.rx_errors++;
+                        dev->stats.rx_length_errors++;
+                        dev->stats.rx_errors++;
                 } else {
                         skb = bp->rx_bufs[i];
                         bp->rx_bufs[i] = NULL;
@@ -719,10 +717,10 @@ static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id)
                         skb->protocol = eth_type_trans(skb, dev);
                         netif_rx(skb);
                         dev->last_rx = jiffies;
-                        ++bp->stats.rx_packets;
-                        bp->stats.rx_bytes += nb;
+                        ++dev->stats.rx_packets;
+                        dev->stats.rx_bytes += nb;
                 } else {
-                        ++bp->stats.rx_dropped;
+                        ++dev->stats.rx_dropped;
                 }
                 dev->last_rx = jiffies;
                 if ((skb = bp->rx_bufs[i]) == NULL) {
@@ -785,7 +783,7 @@ static irqreturn_t bmac_txdma_intr(int irq, void *dev_id)
                 }
 
                 if (bp->tx_bufs[bp->tx_empty]) {
-                        ++bp->stats.tx_packets;
+                        ++dev->stats.tx_packets;
                         dev_kfree_skb_irq(bp->tx_bufs[bp->tx_empty]);
                 }
                 bp->tx_bufs[bp->tx_empty] = NULL;
@@ -807,13 +805,6 @@ static irqreturn_t bmac_txdma_intr(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static struct net_device_stats *bmac_stats(struct net_device *dev)
-{
-        struct bmac_data *p = netdev_priv(dev);
-
-        return &p->stats;
-}
-
 #ifndef SUNHME_MULTICAST
 /* Real fast bit-reversal algorithm, 6-bit values */
 static int reverse6[64] = {
@@ -1080,17 +1071,17 @@ static irqreturn_t bmac_misc_intr(int irq, void *dev_id)
         }
         /* XXDEBUG(("bmac_misc_intr, status=%#08x\n", status)); */
         /*     bmac_txdma_intr_inner(irq, dev_id); */
-        /*   if (status & FrameReceived) bp->stats.rx_dropped++; */
-        if (status & RxErrorMask) bp->stats.rx_errors++;
-        if (status & RxCRCCntExp) bp->stats.rx_crc_errors++;
-        if (status & RxLenCntExp) bp->stats.rx_length_errors++;
-        if (status & RxOverFlow) bp->stats.rx_over_errors++;
-        if (status & RxAlignCntExp) bp->stats.rx_frame_errors++;
-
-        /*   if (status & FrameSent) bp->stats.tx_dropped++; */
-        if (status & TxErrorMask) bp->stats.tx_errors++;
-        if (status & TxUnderrun) bp->stats.tx_fifo_errors++;
-        if (status & TxNormalCollExp) bp->stats.collisions++;
+        /*   if (status & FrameReceived) dev->stats.rx_dropped++; */
+        if (status & RxErrorMask) dev->stats.rx_errors++;
+        if (status & RxCRCCntExp) dev->stats.rx_crc_errors++;
+        if (status & RxLenCntExp) dev->stats.rx_length_errors++;
+        if (status & RxOverFlow) dev->stats.rx_over_errors++;
+        if (status & RxAlignCntExp) dev->stats.rx_frame_errors++;
+
+        /*   if (status & FrameSent) dev->stats.tx_dropped++; */
+        if (status & TxErrorMask) dev->stats.tx_errors++;
+        if (status & TxUnderrun) dev->stats.tx_fifo_errors++;
+        if (status & TxNormalCollExp) dev->stats.collisions++;
         return IRQ_HANDLED;
 }
 
@@ -1324,7 +1315,6 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
         dev->stop = bmac_close;
         dev->ethtool_ops = &bmac_ethtool_ops;
         dev->hard_start_xmit = bmac_output;
-        dev->get_stats = bmac_stats;
         dev->set_multicast_list = bmac_set_multicast;
         dev->set_mac_address = bmac_set_address;
 
@@ -1542,7 +1532,7 @@ static void bmac_tx_timeout(unsigned long data)
         XXDEBUG((KERN_DEBUG "bmac: tx empty=%d fill=%d fullup=%d\n",
                  bp->tx_empty, bp->tx_fill, bp->tx_fullup));
         i = bp->tx_empty;
-        ++bp->stats.tx_errors;
+        ++dev->stats.tx_errors;
         if (i != bp->tx_fill) {
                 dev_kfree_skb(bp->tx_bufs[i]);
                 bp->tx_bufs[i] = NULL;