7 files changed, 53 insertions, 91 deletions

diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index 8c496fb1ac9e..62f21106efec 100644
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -300,8 +300,6 @@ am79c961_open(struct net_device *dev)
         struct dev_priv *priv = netdev_priv(dev);
         int ret;
 
-        memset (&priv->stats, 0, sizeof (priv->stats));
-
         ret = request_irq(dev->irq, am79c961_interrupt, 0, dev->name, dev);
         if (ret)
                 return ret;
@@ -347,8 +345,7 @@ am79c961_close(struct net_device *dev)
  */
 static struct net_device_stats *am79c961_getstats (struct net_device *dev)
 {
-        struct dev_priv *priv = netdev_priv(dev);
-        return &priv->stats;
+        return &dev->stats;
 }
 
 static void am79c961_mc_hash(char *addr, unsigned short *hash)
@@ -510,14 +507,14 @@ am79c961_rx(struct net_device *dev, struct dev_priv *priv)
 
                 if ((status & (RMD_ERR|RMD_STP|RMD_ENP)) != (RMD_STP|RMD_ENP)) {
                         am_writeword (dev, hdraddr + 2, RMD_OWN);
-                        priv->stats.rx_errors ++;
+                        dev->stats.rx_errors++;
                         if (status & RMD_ERR) {
                                 if (status & RMD_FRAM)
-                                        priv->stats.rx_frame_errors ++;
+                                        dev->stats.rx_frame_errors++;
                                 if (status & RMD_CRC)
-                                        priv->stats.rx_crc_errors ++;
+                                        dev->stats.rx_crc_errors++;
                         } else if (status & RMD_STP)
-                                priv->stats.rx_length_errors ++;
+                                dev->stats.rx_length_errors++;
                         continue;
                 }
 
@@ -531,12 +528,12 @@ am79c961_rx(struct net_device *dev, struct dev_priv *priv)
                         am_writeword(dev, hdraddr + 2, RMD_OWN);
                         skb->protocol = eth_type_trans(skb, dev);
                         netif_rx(skb);
-                        priv->stats.rx_bytes += len;
-                        priv->stats.rx_packets ++;
+                        dev->stats.rx_bytes += len;
+                        dev->stats.rx_packets++;
                 } else {
                         am_writeword (dev, hdraddr + 2, RMD_OWN);
                         printk (KERN_WARNING "%s: memory squeeze, dropping packet.\n", dev->name);
-                        priv->stats.rx_dropped ++;
+                        dev->stats.rx_dropped++;
                         break;
                 }
         } while (1);
@@ -565,7 +562,7 @@ am79c961_tx(struct net_device *dev, struct dev_priv *priv)
                 if (status & TMD_ERR) {
                         u_int status2;
 
-                        priv->stats.tx_errors ++;
+                        dev->stats.tx_errors++;
 
                         status2 = am_readword (dev, hdraddr + 6);
 
@@ -575,18 +572,18 @@ am79c961_tx(struct net_device *dev, struct dev_priv *priv)
                         am_writeword (dev, hdraddr + 6, 0);
 
                         if (status2 & TST_RTRY)
-                                priv->stats.collisions += 16;
+                                dev->stats.collisions += 16;
                         if (status2 & TST_LCOL)
-                                priv->stats.tx_window_errors ++;
+                                dev->stats.tx_window_errors++;
                         if (status2 & TST_LCAR)
-                                priv->stats.tx_carrier_errors ++;
+                                dev->stats.tx_carrier_errors++;
                         if (status2 & TST_UFLO)
-                                priv->stats.tx_fifo_errors ++;
+                                dev->stats.tx_fifo_errors++;
                         continue;
                 }
-                priv->stats.tx_packets ++;
+                dev->stats.tx_packets++;
                 len = am_readword (dev, hdraddr + 4);
-                priv->stats.tx_bytes += -len;
+                dev->stats.tx_bytes += -len;
         } while (priv->txtail != priv->txhead);
 
         netif_wake_queue(dev);
@@ -616,7 +613,7 @@ am79c961_interrupt(int irq, void *dev_id)
                 }
                 if (status & CSR0_MISS) {
                         handled = 1;
-                        priv->stats.rx_dropped ++;
+                        dev->stats.rx_dropped++;
                 }
                 if (status & CSR0_CERR) {
                         handled = 1;
diff --git a/drivers/net/arm/am79c961a.h b/drivers/net/arm/am79c961a.h
index 483009fe6ec2..fd634d32756b 100644
--- a/drivers/net/arm/am79c961a.h
+++ b/drivers/net/arm/am79c961a.h
@@ -130,7 +130,6 @@
 #define ISALED0_LNKST   0x8000
 
 struct dev_priv {
-    struct net_device_stats stats;
     unsigned long       rxbuffer[RX_BUFFERS];
     unsigned long       txbuffer[TX_BUFFERS];
     unsigned char       txhead;
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c
index 4a5ec9470aa1..5a77001b6d10 100644
--- a/drivers/net/arm/ep93xx_eth.c
+++ b/drivers/net/arm/ep93xx_eth.c
@@ -175,8 +175,6 @@ struct ep93xx_priv
         struct net_device       *dev;
         struct napi_struct      napi;
 
-        struct net_device_stats stats;
-
         struct mii_if_info      mii;
         u8                      mdc_divisor;
 };
@@ -230,12 +228,6 @@ static void ep93xx_mdio_write(struct net_device *dev, int phy_id, int reg, int d
                 pr_info("mdio write timed out\n");
 }
 
-static struct net_device_stats *ep93xx_get_stats(struct net_device *dev)
-{
-        struct ep93xx_priv *ep = netdev_priv(dev);
-        return &(ep->stats);
-}
-
 static int ep93xx_rx(struct net_device *dev, int processed, int budget)
 {
         struct ep93xx_priv *ep = netdev_priv(dev);
@@ -267,15 +259,15 @@ static int ep93xx_rx(struct net_device *dev, int processed, int budget)
                         pr_crit("entry mismatch %.8x %.8x\n", rstat0, rstat1);
 
                 if (!(rstat0 & RSTAT0_RWE)) {
-                        ep->stats.rx_errors++;
+                        dev->stats.rx_errors++;
                         if (rstat0 & RSTAT0_OE)
-                                ep->stats.rx_fifo_errors++;
+                                dev->stats.rx_fifo_errors++;
                         if (rstat0 & RSTAT0_FE)
-                                ep->stats.rx_frame_errors++;
+                                dev->stats.rx_frame_errors++;
                         if (rstat0 & (RSTAT0_RUNT | RSTAT0_EDATA))
-                                ep->stats.rx_length_errors++;
+                                dev->stats.rx_length_errors++;
                         if (rstat0 & RSTAT0_CRCE)
-                                ep->stats.rx_crc_errors++;
+                                dev->stats.rx_crc_errors++;
                         goto err;
                 }
 
@@ -300,10 +292,10 @@ static int ep93xx_rx(struct net_device *dev, int processed, int budget)
 
                         netif_receive_skb(skb);
 
-                        ep->stats.rx_packets++;
-                        ep->stats.rx_bytes += length;
+                        dev->stats.rx_packets++;
+                        dev->stats.rx_bytes += length;
                 } else {
-                        ep->stats.rx_dropped++;
+                        dev->stats.rx_dropped++;
                 }
 
 err:
@@ -359,7 +351,7 @@ static int ep93xx_xmit(struct sk_buff *skb, struct net_device *dev)
         int entry;
 
         if (unlikely(skb->len > MAX_PKT_SIZE)) {
-                ep->stats.tx_dropped++;
+                dev->stats.tx_dropped++;
                 dev_kfree_skb(skb);
                 return NETDEV_TX_OK;
         }
@@ -415,17 +407,17 @@ static void ep93xx_tx_complete(struct net_device *dev)
                 if (tstat0 & TSTAT0_TXWE) {
                         int length = ep->descs->tdesc[entry].tdesc1 & 0xfff;
 
-                        ep->stats.tx_packets++;
-                        ep->stats.tx_bytes += length;
+                        dev->stats.tx_packets++;
+                        dev->stats.tx_bytes += length;
                 } else {
-                        ep->stats.tx_errors++;
+                        dev->stats.tx_errors++;
                 }
 
                 if (tstat0 & TSTAT0_OW)
-                        ep->stats.tx_window_errors++;
+                        dev->stats.tx_window_errors++;
                 if (tstat0 & TSTAT0_TXU)
-                        ep->stats.tx_fifo_errors++;
-                ep->stats.collisions += (tstat0 >> 16) & 0x1f;
+                        dev->stats.tx_fifo_errors++;
+                dev->stats.collisions += (tstat0 >> 16) & 0x1f;
 
                 ep->tx_clean_pointer = (entry + 1) & (TX_QUEUE_ENTRIES - 1);
                 if (ep->tx_pending == TX_QUEUE_ENTRIES)
@@ -758,7 +750,6 @@ static const struct net_device_ops ep93xx_netdev_ops = {
         .ndo_open               = ep93xx_open,
         .ndo_stop               = ep93xx_close,
         .ndo_start_xmit         = ep93xx_xmit,
-        .ndo_get_stats          = ep93xx_get_stats,
         .ndo_do_ioctl           = ep93xx_ioctl,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_change_mtu         = eth_change_mtu,
diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c
index b17ab5153f51..b00781c02d5d 100644
--- a/drivers/net/arm/ether1.c
+++ b/drivers/net/arm/ether1.c
@@ -68,7 +68,6 @@ static int ether1_open(struct net_device *dev);
 static int ether1_sendpacket(struct sk_buff *skb, struct net_device *dev);
 static irqreturn_t ether1_interrupt(int irq, void *dev_id);
 static int ether1_close(struct net_device *dev);
-static struct net_device_stats *ether1_getstats(struct net_device *dev);
 static void ether1_setmulticastlist(struct net_device *dev);
 static void ether1_timeout(struct net_device *dev);
 
@@ -649,8 +648,6 @@ ether1_open (struct net_device *dev)
         if (request_irq(dev->irq, ether1_interrupt, 0, "ether1", dev))
                 return -EAGAIN;
 
-        memset (&priv(dev)->stats, 0, sizeof (struct net_device_stats));
-
         if (ether1_init_for_open (dev)) {
                 free_irq (dev->irq, dev);
                 return -EAGAIN;
@@ -673,7 +670,7 @@ ether1_timeout(struct net_device *dev)
         if (ether1_init_for_open (dev))
                 printk (KERN_ERR "%s: unable to restart interface\n", dev->name);
 
-        priv(dev)->stats.tx_errors++;
+        dev->stats.tx_errors++;
         netif_wake_queue(dev);
 }
 
@@ -802,21 +799,21 @@ again:
 
         while (nop.nop_status & STAT_COMPLETE) {
                 if (nop.nop_status & STAT_OK) {
-                        priv(dev)->stats.tx_packets ++;
-                        priv(dev)->stats.collisions += (nop.nop_status & STAT_COLLISIONS);
+                        dev->stats.tx_packets++;
+                        dev->stats.collisions += (nop.nop_status & STAT_COLLISIONS);
                 } else {
-                        priv(dev)->stats.tx_errors ++;
+                        dev->stats.tx_errors++;
 
                         if (nop.nop_status & STAT_COLLAFTERTX)
-                                priv(dev)->stats.collisions ++;
+                                dev->stats.collisions++;
                         if (nop.nop_status & STAT_NOCARRIER)
-                                priv(dev)->stats.tx_carrier_errors ++;
+                                dev->stats.tx_carrier_errors++;
                         if (nop.nop_status & STAT_TXLOSTCTS)
                                 printk (KERN_WARNING "%s: cts lost\n", dev->name);
                         if (nop.nop_status & STAT_TXSLOWDMA)
-                                priv(dev)->stats.tx_fifo_errors ++;
+                                dev->stats.tx_fifo_errors++;
                         if (nop.nop_status & STAT_COLLEXCESSIVE)
-                                priv(dev)->stats.collisions += 16;
+                                dev->stats.collisions += 16;
                 }
 
                 if (nop.nop_link == caddr) {
@@ -879,13 +876,13 @@ ether1_recv_done (struct net_device *dev)
 
                                 skb->protocol = eth_type_trans (skb, dev);
                                 netif_rx (skb);
-                                priv(dev)->stats.rx_packets ++;
+                                dev->stats.rx_packets++;
                         } else
-                                priv(dev)->stats.rx_dropped ++;
+                                dev->stats.rx_dropped++;
                 } else {
                         printk(KERN_WARNING "%s: %s\n", dev->name,
                                 (rbd.rbd_status & RBD_EOF) ? "oversized packet" : "acnt not valid");
-                        priv(dev)->stats.rx_dropped ++;
+                        dev->stats.rx_dropped++;
                 }
 
                 nexttail = ether1_readw(dev, priv(dev)->rx_tail, rfd_t, rfd_link, NORMALIRQS);
@@ -939,7 +936,7 @@ ether1_interrupt (int irq, void *dev_id)
                                 printk (KERN_WARNING "%s: RU went not ready: RU suspended\n", dev->name);
                                 ether1_writew(dev, SCB_CMDRXRESUME, SCB_ADDR, scb_t, scb_command, NORMALIRQS);
                                 writeb(CTRL_CA, REG_CONTROL);
-                                priv(dev)->stats.rx_dropped ++; /* we suspended due to lack of buffer space */
+                                dev->stats.rx_dropped++;        /* we suspended due to lack of buffer space */
                         } else
                                 printk(KERN_WARNING "%s: RU went not ready: %04X\n", dev->name,
                                         ether1_readw(dev, SCB_ADDR, scb_t, scb_status, NORMALIRQS));
@@ -962,12 +959,6 @@ ether1_close (struct net_device *dev)
         return 0;
 }
 
-static struct net_device_stats *
-ether1_getstats (struct net_device *dev)
-{
-        return &priv(dev)->stats;
-}
-
 /*
  * Set or clear the multicast filter for this adaptor.
  * num_addrs == -1      Promiscuous mode, receive all packets.
@@ -994,7 +985,6 @@ static const struct net_device_ops ether1_netdev_ops = {
         .ndo_open               = ether1_open,
         .ndo_stop               = ether1_close,
         .ndo_start_xmit         = ether1_sendpacket,
-        .ndo_get_stats          = ether1_getstats,
         .ndo_set_multicast_list = ether1_setmulticastlist,
         .ndo_tx_timeout         = ether1_timeout,
         .ndo_validate_addr      = eth_validate_addr,
diff --git a/drivers/net/arm/ether1.h b/drivers/net/arm/ether1.h
index c8a4b2389d85..3a5830ab3dc7 100644
--- a/drivers/net/arm/ether1.h
+++ b/drivers/net/arm/ether1.h
@@ -38,7 +38,6 @@
 
 struct ether1_priv {
         void __iomem *base;
-        struct net_device_stats stats;
         unsigned int tx_link;
         unsigned int tx_head;
         volatile unsigned int tx_tail;
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c
index 1361b7367c28..44a8746f4014 100644
--- a/drivers/net/arm/ether3.c
+++ b/drivers/net/arm/ether3.c
@@ -81,7 +81,6 @@ static int	ether3_open (struct net_device *dev);
 static int      ether3_sendpacket (struct sk_buff *skb, struct net_device *dev);
 static irqreturn_t ether3_interrupt (int irq, void *dev_id);
 static int      ether3_close (struct net_device *dev);
-static struct net_device_stats *ether3_getstats (struct net_device *dev);
 static void     ether3_setmulticastlist (struct net_device *dev);
 static void     ether3_timeout(struct net_device *dev);
 
@@ -323,8 +322,6 @@ ether3_init_for_open(struct net_device *dev)
 {
         int i;
 
-        memset(&priv(dev)->stats, 0, sizeof(struct net_device_stats));
-
         /* Reset the chip */
         ether3_outw(CFG2_RESET, REG_CONFIG2);
         udelay(4);
@@ -442,15 +439,6 @@ ether3_close(struct net_device *dev)
 }
 
 /*
- * Get the current statistics.  This may be called with the card open or
- * closed.
- */
-static struct net_device_stats *ether3_getstats(struct net_device *dev)
-{
-        return &priv(dev)->stats;
-}
-
-/*
  * Set or clear promiscuous/multicast mode filter for this adaptor.
  *
  * We don't attempt any packet filtering.  The card may have a SEEQ 8004
@@ -490,7 +478,7 @@ static void ether3_timeout(struct net_device *dev)
         local_irq_restore(flags);
 
         priv(dev)->regs.config2 |= CFG2_CTRLO;
-        priv(dev)->stats.tx_errors += 1;
+        dev->stats.tx_errors += 1;
         ether3_outw(priv(dev)->regs.config2, REG_CONFIG2);
         priv(dev)->tx_head = priv(dev)->tx_tail = 0;
 
@@ -509,7 +497,7 @@ ether3_sendpacket(struct sk_buff *skb, struct net_device *dev)
 
         if (priv(dev)->broken) {
                 dev_kfree_skb(skb);
-                priv(dev)->stats.tx_dropped ++;
+                dev->stats.tx_dropped++;
                 netif_start_queue(dev);
                 return NETDEV_TX_OK;
         }
@@ -673,7 +661,7 @@ if (next_ptr < RX_START || next_ptr >= RX_END) {
                         } else
                                 goto dropping;
                 } else {
-                        struct net_device_stats *stats = &priv(dev)->stats;
+                        struct net_device_stats *stats = &dev->stats;
                         ether3_outw(next_ptr >> 8, REG_RECVEND);
                         if (status & RXSTAT_OVERSIZE)     stats->rx_over_errors ++;
                         if (status & RXSTAT_CRCERROR)     stats->rx_crc_errors ++;
@@ -685,14 +673,14 @@ if (next_ptr < RX_START || next_ptr >= RX_END) {
         while (-- maxcnt);
 
 done:
-        priv(dev)->stats.rx_packets += received;
+        dev->stats.rx_packets += received;
         priv(dev)->rx_head = next_ptr;
         /*
          * If rx went off line, then that means that the buffer may be full.  We
          * have dropped at least one packet.
          */
         if (!(ether3_inw(REG_STATUS) & STAT_RXON)) {
-                priv(dev)->stats.rx_dropped ++;
+                dev->stats.rx_dropped++;
                 ether3_outw(next_ptr, REG_RECVPTR);
                 ether3_outw(priv(dev)->regs.command | CMD_RXON, REG_COMMAND);
         }
@@ -710,7 +698,7 @@ dropping:{
                 last_warned = jiffies;
                 printk("%s: memory squeeze, dropping packet.\n", dev->name);
         }
-        priv(dev)->stats.rx_dropped ++;
+        dev->stats.rx_dropped++;
         goto done;
         }
 }
@@ -743,13 +731,13 @@ static void ether3_tx(struct net_device *dev)
                  * Update errors
                  */
                 if (!(status & (TXSTAT_BABBLED | TXSTAT_16COLLISIONS)))
-                        priv(dev)->stats.tx_packets++;
+                        dev->stats.tx_packets++;
                 else {
-                        priv(dev)->stats.tx_errors ++;
+                        dev->stats.tx_errors++;
                         if (status & TXSTAT_16COLLISIONS)
-                                priv(dev)->stats.collisions += 16;
+                                dev->stats.collisions += 16;
                         if (status & TXSTAT_BABBLED)
-                                priv(dev)->stats.tx_fifo_errors ++;
+                                dev->stats.tx_fifo_errors++;
                 }
 
                 tx_tail = (tx_tail + 1) & 15;
@@ -773,7 +761,6 @@ static const struct net_device_ops ether3_netdev_ops = {
         .ndo_open               = ether3_open,
         .ndo_stop               = ether3_close,
         .ndo_start_xmit         = ether3_sendpacket,
-        .ndo_get_stats          = ether3_getstats,
         .ndo_set_multicast_list = ether3_setmulticastlist,
         .ndo_tx_timeout         = ether3_timeout,
         .ndo_validate_addr      = eth_validate_addr,
diff --git a/drivers/net/arm/ether3.h b/drivers/net/arm/ether3.h
index 1921a3a07da7..2db63b08bdf3 100644
--- a/drivers/net/arm/ether3.h
+++ b/drivers/net/arm/ether3.h
@@ -164,7 +164,6 @@ struct dev_priv {
     unsigned char tx_head;              /* buffer nr to insert next packet       */
     unsigned char tx_tail;              /* buffer nr of transmitting packet      */
     unsigned int rx_head;               /* address to fetch next packet from     */
-    struct net_device_stats stats;
     struct timer_list timer;
     int broken;                         /* 0 = ok, 1 = something went wrong      */
 };