[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>
This commit is contained in:
Jeff Garzik
committed by
David S. Miller
David S. Miller
parent
ff8ac60948
commit
09f75cd7bf
@@ -152,7 +152,6 @@ struct lance_private {
|
||||
struct lance_memory *mem;
|
||||
int new_rx, new_tx; /* The next free ring entry */
|
||||
int old_tx, old_rx; /* ring entry to be processed */
|
||||
struct net_device_stats stats;
|
||||
/* These two must be longs for set_bit() */
|
||||
long tx_full;
|
||||
long lock;
|
||||
@@ -241,7 +240,6 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev );
|
||||
static irqreturn_t lance_interrupt( int irq, void *dev_id);
|
||||
static int lance_rx( struct net_device *dev );
|
||||
static int lance_close( struct net_device *dev );
|
||||
static struct net_device_stats *lance_get_stats( struct net_device *dev );
|
||||
static void set_multicast_list( struct net_device *dev );
|
||||
|
||||
/************************* End of Prototypes **************************/
|
||||
@@ -401,15 +399,12 @@ static int __init lance_probe( struct net_device *dev)
|
||||
dev->open = &lance_open;
|
||||
dev->hard_start_xmit = &lance_start_xmit;
|
||||
dev->stop = &lance_close;
|
||||
dev->get_stats = &lance_get_stats;
|
||||
dev->set_multicast_list = &set_multicast_list;
|
||||
dev->set_mac_address = NULL;
|
||||
// KLUDGE -- REMOVE ME
|
||||
set_bit(__LINK_STATE_PRESENT, &dev->state);
|
||||
|
||||
|
||||
memset( &lp->stats, 0, sizeof(lp->stats) );
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -534,7 +529,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
|
||||
* little endian mode.
|
||||
*/
|
||||
REGA(CSR3) = CSR3_BSWP;
|
||||
lp->stats.tx_errors++;
|
||||
dev->stats.tx_errors++;
|
||||
|
||||
if(lance_debug >= 2) {
|
||||
int i;
|
||||
@@ -634,7 +629,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
|
||||
|
||||
head->flag = TMD1_OWN_CHIP | TMD1_ENP | TMD1_STP;
|
||||
lp->new_tx = (lp->new_tx + 1) & TX_RING_MOD_MASK;
|
||||
lp->stats.tx_bytes += skb->len;
|
||||
dev->stats.tx_bytes += skb->len;
|
||||
|
||||
/* Trigger an immediate send poll. */
|
||||
REGA(CSR0) = CSR0_INEA | CSR0_TDMD | CSR0_STRT;
|
||||
@@ -712,12 +707,12 @@ static irqreturn_t lance_interrupt( int irq, void *dev_id)
|
||||
|
||||
if (head->flag & TMD1_ERR) {
|
||||
int status = head->misc;
|
||||
lp->stats.tx_errors++;
|
||||
if (status & TMD3_RTRY) lp->stats.tx_aborted_errors++;
|
||||
if (status & TMD3_LCAR) lp->stats.tx_carrier_errors++;
|
||||
if (status & TMD3_LCOL) lp->stats.tx_window_errors++;
|
||||
dev->stats.tx_errors++;
|
||||
if (status & TMD3_RTRY) dev->stats.tx_aborted_errors++;
|
||||
if (status & TMD3_LCAR) dev->stats.tx_carrier_errors++;
|
||||
if (status & TMD3_LCOL) dev->stats.tx_window_errors++;
|
||||
if (status & (TMD3_UFLO | TMD3_BUFF)) {
|
||||
lp->stats.tx_fifo_errors++;
|
||||
dev->stats.tx_fifo_errors++;
|
||||
printk("%s: Tx FIFO error\n",
|
||||
dev->name);
|
||||
REGA(CSR0) = CSR0_STOP;
|
||||
@@ -730,9 +725,9 @@ static irqreturn_t lance_interrupt( int irq, void *dev_id)
|
||||
|
||||
head->flag &= ~(TMD1_ENP | TMD1_STP);
|
||||
if(head->flag & (TMD1_ONE | TMD1_MORE))
|
||||
lp->stats.collisions++;
|
||||
dev->stats.collisions++;
|
||||
|
||||
lp->stats.tx_packets++;
|
||||
dev->stats.tx_packets++;
|
||||
DPRINTK(3, ("cleared tx ring %d\n", old_tx));
|
||||
}
|
||||
old_tx = (old_tx +1) & TX_RING_MOD_MASK;
|
||||
@@ -752,8 +747,8 @@ static irqreturn_t lance_interrupt( int irq, void *dev_id)
|
||||
lance_rx( dev );
|
||||
|
||||
/* Log misc errors. */
|
||||
if (csr0 & CSR0_BABL) lp->stats.tx_errors++; /* Tx babble. */
|
||||
if (csr0 & CSR0_MISS) lp->stats.rx_errors++; /* Missed a Rx frame. */
|
||||
if (csr0 & CSR0_BABL) dev->stats.tx_errors++; /* Tx babble. */
|
||||
if (csr0 & CSR0_MISS) dev->stats.rx_errors++; /* Missed a Rx frame. */
|
||||
if (csr0 & CSR0_MERR) {
|
||||
DPRINTK( 1, ( "%s: Bus master arbitration failure (?!?), "
|
||||
"status %04x.\n", dev->name, csr0 ));
|
||||
@@ -799,11 +794,11 @@ static int lance_rx( struct net_device *dev )
|
||||
full-sized buffers it's possible for a jabber packet to use two
|
||||
buffers, with only the last correctly noting the error. */
|
||||
if (status & RMD1_ENP) /* Only count a general error at the */
|
||||
lp->stats.rx_errors++; /* end of a packet.*/
|
||||
if (status & RMD1_FRAM) lp->stats.rx_frame_errors++;
|
||||
if (status & RMD1_OFLO) lp->stats.rx_over_errors++;
|
||||
if (status & RMD1_CRC) lp->stats.rx_crc_errors++;
|
||||
if (status & RMD1_BUFF) lp->stats.rx_fifo_errors++;
|
||||
dev->stats.rx_errors++; /* end of a packet.*/
|
||||
if (status & RMD1_FRAM) dev->stats.rx_frame_errors++;
|
||||
if (status & RMD1_OFLO) dev->stats.rx_over_errors++;
|
||||
if (status & RMD1_CRC) dev->stats.rx_crc_errors++;
|
||||
if (status & RMD1_BUFF) dev->stats.rx_fifo_errors++;
|
||||
head->flag &= (RMD1_ENP|RMD1_STP);
|
||||
} else {
|
||||
/* Malloc up new buffer, compatible with net-3. */
|
||||
@@ -813,7 +808,7 @@ static int lance_rx( struct net_device *dev )
|
||||
|
||||
if (pkt_len < 60) {
|
||||
printk( "%s: Runt packet!\n", dev->name );
|
||||
lp->stats.rx_errors++;
|
||||
dev->stats.rx_errors++;
|
||||
}
|
||||
else {
|
||||
skb = dev_alloc_skb( pkt_len+2 );
|
||||
@@ -821,7 +816,7 @@ static int lance_rx( struct net_device *dev )
|
||||
DPRINTK( 1, ( "%s: Memory squeeze, deferring packet.\n",
|
||||
dev->name ));
|
||||
|
||||
lp->stats.rx_dropped++;
|
||||
dev->stats.rx_dropped++;
|
||||
head->msg_length = 0;
|
||||
head->flag |= RMD1_OWN_CHIP;
|
||||
lp->new_rx = (lp->new_rx+1) &
|
||||
@@ -859,8 +854,8 @@ static int lance_rx( struct net_device *dev )
|
||||
skb->protocol = eth_type_trans( skb, dev );
|
||||
netif_rx( skb );
|
||||
dev->last_rx = jiffies;
|
||||
lp->stats.rx_packets++;
|
||||
lp->stats.rx_bytes += pkt_len;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += pkt_len;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -897,14 +892,6 @@ static int lance_close( struct net_device *dev )
|
||||
}
|
||||
|
||||
|
||||
static struct net_device_stats *lance_get_stats( struct net_device *dev )
|
||||
{
|
||||
struct lance_private *lp = netdev_priv(dev);
|
||||
|
||||
return &lp->stats;
|
||||
}
|
||||
|
||||
|
||||
/* Set or clear the multicast filter for this adaptor.
|
||||
num_addrs == -1 Promiscuous mode, receive all packets
|
||||
num_addrs == 0 Normal mode, clear multicast list
|
||||
|
||||
Reference in New Issue
Block a user