[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, 10 insertions, 21 deletions

diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index 41f877d482c7..03facba05259 100644
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -126,7 +126,6 @@ static int __devinit rr_init_one(struct pci_dev *pdev,
         dev->open = &rr_open;
         dev->hard_start_xmit = &rr_start_xmit;
         dev->stop = &rr_close;
-        dev->get_stats = &rr_get_stats;
         dev->do_ioctl = &rr_ioctl;
 
         dev->base_addr = pci_resource_start(pdev, 0);
@@ -808,7 +807,7 @@ static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
                 case E_CON_REJ:
                         printk(KERN_WARNING "%s: Connection rejected\n",
                                dev->name);
-                        rrpriv->stats.tx_aborted_errors++;
+                        dev->stats.tx_aborted_errors++;
                         break;
                 case E_CON_TMOUT:
                         printk(KERN_WARNING "%s: Connection timeout\n",
@@ -817,7 +816,7 @@ static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
                 case E_DISC_ERR:
                         printk(KERN_WARNING "%s: HIPPI disconnect error\n",
                                dev->name);
-                        rrpriv->stats.tx_aborted_errors++;
+                        dev->stats.tx_aborted_errors++;
                         break;
                 case E_INT_PRTY:
                         printk(KERN_ERR "%s: HIPPI Internal Parity error\n",
@@ -833,7 +832,7 @@ static u32 rr_handle_event(struct net_device *dev, u32 prodidx, u32 eidx)
                 case E_TX_LINK_DROP:
                         printk(KERN_WARNING "%s: Link lost during transmit\n",
                                dev->name);
-                        rrpriv->stats.tx_aborted_errors++;
+                        dev->stats.tx_aborted_errors++;
                         writel(readl(&regs->HostCtrl)|HALT_NIC|RR_CLEAR_INT,
                                &regs->HostCtrl);
                         wmb();
@@ -973,7 +972,7 @@ static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
                 printk("len %x, mode %x\n", pkt_len, desc->mode);
 #endif
                 if ( (rrpriv->rx_ring[index].mode & PACKET_BAD) == PACKET_BAD){
-                        rrpriv->stats.rx_dropped++;
+                        dev->stats.rx_dropped++;
                         goto defer;
                 }
 
@@ -986,7 +985,7 @@ static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
                                 skb = alloc_skb(pkt_len, GFP_ATOMIC);
                                 if (skb == NULL){
                                         printk(KERN_WARNING "%s: Unable to allocate skb (%i bytes), deferring packet\n", dev->name, pkt_len);
-                                        rrpriv->stats.rx_dropped++;
+                                        dev->stats.rx_dropped++;
                                         goto defer;
                                 } else {
                                         pci_dma_sync_single_for_cpu(rrpriv->pci_dev,
@@ -1024,7 +1023,7 @@ static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
                                 } else {
                                         printk("%s: Out of memory, deferring "
                                                "packet\n", dev->name);
-                                        rrpriv->stats.rx_dropped++;
+                                        dev->stats.rx_dropped++;
                                         goto defer;
                                 }
                         }
@@ -1033,8 +1032,8 @@ static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
                         netif_rx(skb);          /* send it up */
 
                         dev->last_rx = jiffies;
-                        rrpriv->stats.rx_packets++;
-                        rrpriv->stats.rx_bytes += pkt_len;
+                        dev->stats.rx_packets++;
+                        dev->stats.rx_bytes += pkt_len;
                 }
         defer:
                 desc->mode = 0;
@@ -1102,8 +1101,8 @@ static irqreturn_t rr_interrupt(int irq, void *dev_id)
                                 desc = &(rrpriv->tx_ring[txcon]);
                                 skb = rrpriv->tx_skbuff[txcon];
 
-                                rrpriv->stats.tx_packets++;
-                                rrpriv->stats.tx_bytes += skb->len;
+                                dev->stats.tx_packets++;
+                                dev->stats.tx_bytes += skb->len;
 
                                 pci_unmap_single(rrpriv->pci_dev,
                                                  desc->addr.addrlo, skb->len,
@@ -1491,16 +1490,6 @@ static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev)
 }
 
 
-static struct net_device_stats *rr_get_stats(struct net_device *dev)
-{
-        struct rr_private *rrpriv;
-
-        rrpriv = netdev_priv(dev);
-
-        return(&rrpriv->stats);
-}
-
-
 /*
  * Read the firmware out of the EEPROM and put it into the SRAM
  * (or from user space - later)