Home » Mailing list archives » linux-kernel » 2008 » July » 17

[patch 02/29] ariadne: use netstats in net_device structure

Previous thread: [patch 01/29] m68k: remove CVS keywords by Geert Uytterhoeven on Thursday, July 17, 2008 - 12:16 pm. (1 message)

Next thread: [patch 04/29] m68k: vmlinux-std/sun3.lds.S cleanup - use PAGE_SIZE macro by Geert Uytterhoeven on Thursday, July 17, 2008 - 12:16 pm. (1 message)
[view original message]
From: Geert Uytterhoeven
Subject: [patch 02/29] ariadne: use netstats in net_device structure
Date: Thursday, July 17, 2008 - 12:16 pm

From: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>

Use net_device_stats from net_device structure instead of local.

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 drivers/net/ariadne.c |   47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -98,7 +98,6 @@ struct ariadne_private {
     volatile u_short *rx_buff[RX_RING_SIZE];
     int cur_tx, cur_rx;			/* The next free ring entry */
     int dirty_tx;			/* The ring entries to be free()ed. */
-    struct net_device_stats stats;
     char tx_full;
 };
 
@@ -378,20 +377,19 @@ static void ariadne_init_ring(struct net
 
 static int ariadne_close(struct net_device *dev)
 {
-    struct ariadne_private *priv = netdev_priv(dev);
     volatile struct Am79C960 *lance = (struct Am79C960*)dev->base_addr;
 
     netif_stop_queue(dev);
 
     lance->RAP = CSR112;	/* Missed Frame Count */
-    priv->stats.rx_missed_errors = swapw(lance->RDP);
+    dev->stats.rx_missed_errors = swapw(lance->RDP);
     lance->RAP = CSR0;		/* PCnet-ISA Controller Status */
 
     if (ariadne_debug > 1) {
 	printk(KERN_DEBUG "%s: Shutting down ethercard, status was %2.2x.\n",
 	       dev->name, lance->RDP);
 	printk(KERN_DEBUG "%s: %lu packets missed\n", dev->name,
-	       priv->stats.rx_missed_errors);
+	       dev->stats.rx_missed_errors);
     }
 
     /* We stop the LANCE here -- it occasionally polls memory if we don't. */
@@ -502,16 +500,16 @@ static irqreturn_t ariadne_interrupt(int
 		if (status & TF_ERR) {
 		    /* There was an major error, log it. */
 		    int err_status = priv->tx_ring[entry]->TMD3;
-		    priv->stats.tx_errors++;
+		    dev->stats.tx_errors++;
 		    if (err_status & EF_RTRY)
-			priv->stats.tx_aborted_errors++;
+			dev->stats.tx_aborted_errors++;
 		    if (err_status & ...
[ message continues ]
[view original message]
From: Jeff Garzik
Subject: Re: [patch 02/29] ariadne: use netstats in net_device structure
Date: Thursday, July 17, 2008 - 12:45 pm

Acked-by: Jeff Garzik <jgarzik@redhat.com>


--


[ message continues ]
Previous thread: [patch 01/29] m68k: remove CVS keywords by Geert Uytterhoeven on Thursday, July 17, 2008 - 12:16 pm. (1 message)

Next thread: [patch 04/29] m68k: vmlinux-std/sun3.lds.S cleanup - use PAGE_SIZE macro by Geert Uytterhoeven on Thursday, July 17, 2008 - 12:16 pm. (1 message)