dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

lib8390: use netstats in net_device structure

Browse source 
Use net_device_stats from net_device structure instead of local.

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Paulius Zaleckas 2008-05-07 02:20:40 +03:00 committed by Jeff Garzik
parent 8e2691658f
commit 244d74ff20
1 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
drivers/net/lib8390.c
View file

@ -265,7 +265,7 @@ static void ei_tx_timeout(struct net_device *dev)
int txsr, isr, tickssofar = jiffies - dev->trans_start; int txsr, isr, tickssofar = jiffies - dev->trans_start;
unsigned long flags; unsigned long flags;
ei_local->stat.tx_errors++; dev->stats.tx_errors++;
spin_lock_irqsave(&ei_local->page_lock, flags); spin_lock_irqsave(&ei_local->page_lock, flags);
txsr = ei_inb(e8390_base+EN0_TSR); txsr = ei_inb(e8390_base+EN0_TSR);
@ -276,7 +276,7 @@ static void ei_tx_timeout(struct net_device *dev)
dev->name, (txsr & ENTSR_ABT) ? "excess collisions." : dev->name, (txsr & ENTSR_ABT) ? "excess collisions." :
(isr) ? "lost interrupt?" : "cable problem?", txsr, isr, tickssofar); (isr) ? "lost interrupt?" : "cable problem?", txsr, isr, tickssofar);
if (!isr && !ei_local->stat.tx_packets) if (!isr && !dev->stats.tx_packets)
{ {
/* The 8390 probably hasn't gotten on the cable yet. */ /* The 8390 probably hasn't gotten on the cable yet. */
ei_local->interface_num ^= 1; /* Try a different xcvr. */ ei_local->interface_num ^= 1; /* Try a different xcvr. */
@ -374,7 +374,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
ei_outb_p(ENISR_ALL, e8390_base + EN0_IMR); ei_outb_p(ENISR_ALL, e8390_base + EN0_IMR);
spin_unlock(&ei_local->page_lock); spin_unlock(&ei_local->page_lock);
enable_irq_lockdep_irqrestore(dev->irq, &flags); enable_irq_lockdep_irqrestore(dev->irq, &flags);
ei_local->stat.tx_errors++; dev->stats.tx_errors++;
return 1; return 1;
} }
@ -417,7 +417,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
enable_irq_lockdep_irqrestore(dev->irq, &flags); enable_irq_lockdep_irqrestore(dev->irq, &flags);
dev_kfree_skb (skb); dev_kfree_skb (skb);
ei_local->stat.tx_bytes += send_length; dev->stats.tx_bytes += send_length;
return 0; return 0;
} }
@ -493,9 +493,9 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id)
if (interrupts & ENISR_COUNTERS) if (interrupts & ENISR_COUNTERS)
{ {
ei_local->stat.rx_frame_errors += ei_inb_p(e8390_base + EN0_COUNTER0); dev->stats.rx_frame_errors += ei_inb_p(e8390_base + EN0_COUNTER0);
ei_local->stat.rx_crc_errors += ei_inb_p(e8390_base + EN0_COUNTER1); dev->stats.rx_crc_errors += ei_inb_p(e8390_base + EN0_COUNTER1);
ei_local->stat.rx_missed_errors+= ei_inb_p(e8390_base + EN0_COUNTER2); dev->stats.rx_missed_errors+= ei_inb_p(e8390_base + EN0_COUNTER2);
ei_outb_p(ENISR_COUNTERS, e8390_base + EN0_ISR); /* Ack intr. */ ei_outb_p(ENISR_COUNTERS, e8390_base + EN0_ISR); /* Ack intr. */
} }
@ -578,10 +578,10 @@ static void ei_tx_err(struct net_device *dev)
ei_tx_intr(dev); ei_tx_intr(dev);
else else
{ {
ei_local->stat.tx_errors++; dev->stats.tx_errors++;
if (txsr & ENTSR_CRS) ei_local->stat.tx_carrier_errors++; if (txsr & ENTSR_CRS) dev->stats.tx_carrier_errors++;
if (txsr & ENTSR_CDH) ei_local->stat.tx_heartbeat_errors++; if (txsr & ENTSR_CDH) dev->stats.tx_heartbeat_errors++;
if (txsr & ENTSR_OWC) ei_local->stat.tx_window_errors++; if (txsr & ENTSR_OWC) dev->stats.tx_window_errors++;
} }
} }
@ -645,25 +645,25 @@ static void ei_tx_intr(struct net_device *dev)
/* Minimize Tx latency: update the statistics after we restart TXing. */ /* Minimize Tx latency: update the statistics after we restart TXing. */
if (status & ENTSR_COL) if (status & ENTSR_COL)
ei_local->stat.collisions++; dev->stats.collisions++;
if (status & ENTSR_PTX) if (status & ENTSR_PTX)
ei_local->stat.tx_packets++; dev->stats.tx_packets++;
else else
{ {
ei_local->stat.tx_errors++; dev->stats.tx_errors++;
if (status & ENTSR_ABT) if (status & ENTSR_ABT)
{ {
ei_local->stat.tx_aborted_errors++; dev->stats.tx_aborted_errors++;
ei_local->stat.collisions += 16; dev->stats.collisions += 16;
} }
if (status & ENTSR_CRS) if (status & ENTSR_CRS)
ei_local->stat.tx_carrier_errors++; dev->stats.tx_carrier_errors++;
if (status & ENTSR_FU) if (status & ENTSR_FU)
ei_local->stat.tx_fifo_errors++; dev->stats.tx_fifo_errors++;
if (status & ENTSR_CDH) if (status & ENTSR_CDH)
ei_local->stat.tx_heartbeat_errors++; dev->stats.tx_heartbeat_errors++;
if (status & ENTSR_OWC) if (status & ENTSR_OWC)
ei_local->stat.tx_window_errors++; dev->stats.tx_window_errors++;
} }
netif_wake_queue(dev); netif_wake_queue(dev);
} }
@ -730,7 +730,7 @@ static void ei_receive(struct net_device *dev)
&& rx_frame.next != next_frame + 1 - num_rx_pages) { && rx_frame.next != next_frame + 1 - num_rx_pages) {
ei_local->current_page = rxing_page; ei_local->current_page = rxing_page;
ei_outb(ei_local->current_page-1, e8390_base+EN0_BOUNDARY); ei_outb(ei_local->current_page-1, e8390_base+EN0_BOUNDARY);
ei_local->stat.rx_errors++; dev->stats.rx_errors++;
continue; continue;
} }
@ -740,8 +740,8 @@ static void ei_receive(struct net_device *dev)
printk(KERN_DEBUG "%s: bogus packet size: %d, status=%#2x nxpg=%#2x.\n", printk(KERN_DEBUG "%s: bogus packet size: %d, status=%#2x nxpg=%#2x.\n",
dev->name, rx_frame.count, rx_frame.status, dev->name, rx_frame.count, rx_frame.status,
rx_frame.next); rx_frame.next);
ei_local->stat.rx_errors++; dev->stats.rx_errors++;
ei_local->stat.rx_length_errors++; dev->stats.rx_length_errors++;
} }
else if ((pkt_stat & 0x0F) == ENRSR_RXOK) else if ((pkt_stat & 0x0F) == ENRSR_RXOK)
{ {
@ -753,7 +753,7 @@ static void ei_receive(struct net_device *dev)
if (ei_debug > 1) if (ei_debug > 1)
printk(KERN_DEBUG "%s: Couldn't allocate a sk_buff of size %d.\n", printk(KERN_DEBUG "%s: Couldn't allocate a sk_buff of size %d.\n",
dev->name, pkt_len); dev->name, pkt_len);
ei_local->stat.rx_dropped++; dev->stats.rx_dropped++;
break; break;
} }
else else
@ -764,10 +764,10 @@ static void ei_receive(struct net_device *dev)
skb->protocol=eth_type_trans(skb,dev); skb->protocol=eth_type_trans(skb,dev);
netif_rx(skb); netif_rx(skb);
dev->last_rx = jiffies; dev->last_rx = jiffies;
ei_local->stat.rx_packets++; dev->stats.rx_packets++;
ei_local->stat.rx_bytes += pkt_len; dev->stats.rx_bytes += pkt_len;
if (pkt_stat & ENRSR_PHY) if (pkt_stat & ENRSR_PHY)
ei_local->stat.multicast++; dev->stats.multicast++;
} }
} }
else else
@ -776,10 +776,10 @@ static void ei_receive(struct net_device *dev)
printk(KERN_DEBUG "%s: bogus packet: status=%#2x nxpg=%#2x size=%d\n", printk(KERN_DEBUG "%s: bogus packet: status=%#2x nxpg=%#2x size=%d\n",
dev->name, rx_frame.status, rx_frame.next, dev->name, rx_frame.status, rx_frame.next,
rx_frame.count); rx_frame.count);
ei_local->stat.rx_errors++; dev->stats.rx_errors++;
/* NB: The NIC counts CRC, frame and missed errors. */ /* NB: The NIC counts CRC, frame and missed errors. */
if (pkt_stat & ENRSR_FO) if (pkt_stat & ENRSR_FO)
ei_local->stat.rx_fifo_errors++; dev->stats.rx_fifo_errors++;
} }
next_frame = rx_frame.next; next_frame = rx_frame.next;
@ -827,7 +827,7 @@ static void ei_rx_overrun(struct net_device *dev)
if (ei_debug > 1) if (ei_debug > 1)
printk(KERN_DEBUG "%s: Receiver overrun.\n", dev->name); printk(KERN_DEBUG "%s: Receiver overrun.\n", dev->name);
ei_local->stat.rx_over_errors++; dev->stats.rx_over_errors++;
/* /*
* Wait a full Tx time (1.2ms) + some guard time, NS says 1.6ms total. * Wait a full Tx time (1.2ms) + some guard time, NS says 1.6ms total.
@ -889,16 +889,16 @@ static struct net_device_stats *get_stats(struct net_device *dev)
/* If the card is stopped, just return the present stats. */ /* If the card is stopped, just return the present stats. */
if (!netif_running(dev)) if (!netif_running(dev))
return &ei_local->stat; return &dev->stats;
spin_lock_irqsave(&ei_local->page_lock,flags); spin_lock_irqsave(&ei_local->page_lock,flags);
/* Read the counter registers, assuming we are in page 0. */ /* Read the counter registers, assuming we are in page 0. */
ei_local->stat.rx_frame_errors += ei_inb_p(ioaddr + EN0_COUNTER0); dev->stats.rx_frame_errors += ei_inb_p(ioaddr + EN0_COUNTER0);
ei_local->stat.rx_crc_errors += ei_inb_p(ioaddr + EN0_COUNTER1); dev->stats.rx_crc_errors += ei_inb_p(ioaddr + EN0_COUNTER1);
ei_local->stat.rx_missed_errors+= ei_inb_p(ioaddr + EN0_COUNTER2); dev->stats.rx_missed_errors+= ei_inb_p(ioaddr + EN0_COUNTER2);
spin_unlock_irqrestore(&ei_local->page_lock, flags); spin_unlock_irqrestore(&ei_local->page_lock, flags);
return &ei_local->stat; return &dev->stats;
} }
/* /*