Commit f8f2bc17 authored by Roger Luethi's avatar Roger Luethi Committed by Jeff Garzik

Remove ancient ETHER_STATS statistics from various net drivers, that haven't been

compile-enabled nor compileable in ages.
parent 45e39485
...@@ -1746,10 +1746,6 @@ static void rtl8139_tx_interrupt (struct net_device *dev, ...@@ -1746,10 +1746,6 @@ static void rtl8139_tx_interrupt (struct net_device *dev,
tp->stats.tx_carrier_errors++; tp->stats.tx_carrier_errors++;
if (txstatus & TxOutOfWindow) if (txstatus & TxOutOfWindow)
tp->stats.tx_window_errors++; tp->stats.tx_window_errors++;
#ifdef ETHER_STATS
if ((txstatus & 0x0f000000) == 0x0f000000)
tp->stats.collisions16++;
#endif
} else { } else {
if (txstatus & TxUnderrun) { if (txstatus & TxUnderrun) {
/* Add 64 to the Tx FIFO threshold. */ /* Add 64 to the Tx FIFO threshold. */
......
...@@ -809,13 +809,8 @@ tx_error (struct net_device *dev, int tx_status) ...@@ -809,13 +809,8 @@ tx_error (struct net_device *dev, int tx_status)
/* Let TxStartThresh stay default value */ /* Let TxStartThresh stay default value */
} }
/* Maximum Collisions */ /* Maximum Collisions */
#ifdef ETHER_STATS
if (tx_status & 0x08)
np->stats.collisions16++;
#else
if (tx_status & 0x08) if (tx_status & 0x08)
np->stats.collisions++; np->stats.collisions++;
#endif
/* Restart the Tx */ /* Restart the Tx */
writel (readw (dev->base_addr + MACCtrl) | TxEnable, ioaddr + MACCtrl); writel (readw (dev->base_addr + MACCtrl) | TxEnable, ioaddr + MACCtrl);
} }
......
...@@ -1072,13 +1072,7 @@ static void epic_interrupt(int irq, void *dev_instance, struct pt_regs *regs) ...@@ -1072,13 +1072,7 @@ static void epic_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
if (txstatus & 0x0008) ep->stats.tx_carrier_errors++; if (txstatus & 0x0008) ep->stats.tx_carrier_errors++;
if (txstatus & 0x0040) ep->stats.tx_window_errors++; if (txstatus & 0x0040) ep->stats.tx_window_errors++;
if (txstatus & 0x0010) ep->stats.tx_fifo_errors++; if (txstatus & 0x0010) ep->stats.tx_fifo_errors++;
#ifdef ETHER_STATS
if (txstatus & 0x1000) ep->stats.collisions16++;
#endif
} else { } else {
#ifdef ETHER_STATS
if ((txstatus & 0x0002) != 0) ep->stats.tx_deferred++;
#endif
ep->stats.collisions += (txstatus >> 8) & 15; ep->stats.collisions += (txstatus >> 8) & 15;
ep->stats.tx_packets++; ep->stats.tx_packets++;
ep->stats.tx_bytes += ep->tx_skbuff[entry]->len; ep->stats.tx_bytes += ep->tx_skbuff[entry]->len;
......
...@@ -1493,16 +1493,7 @@ static void intr_handler(int irq, void *dev_instance, struct pt_regs *rgs) ...@@ -1493,16 +1493,7 @@ static void intr_handler(int irq, void *dev_instance, struct pt_regs *rgs)
if ((tx_status & HF) && np->mii.full_duplex == 0) if ((tx_status & HF) && np->mii.full_duplex == 0)
np->stats.tx_heartbeat_errors++; np->stats.tx_heartbeat_errors++;
#ifdef ETHER_STATS
if (tx_status & EC)
np->stats.collisions16++;
#endif
} else { } else {
#ifdef ETHER_STATS
if (tx_status & DFR)
np->stats.tx_deferred++;
#endif
np->stats.tx_bytes += np->stats.tx_bytes +=
((tx_control & PKTSMask) >> PKTSShift); ((tx_control & PKTSMask) >> PKTSShift);
...@@ -1544,9 +1535,6 @@ static void intr_handler(int irq, void *dev_instance, struct pt_regs *rgs) ...@@ -1544,9 +1535,6 @@ static void intr_handler(int irq, void *dev_instance, struct pt_regs *rgs)
np->stats.tx_errors += (data & 0xff000000) >> 24; np->stats.tx_errors += (data & 0xff000000) >> 24;
np->stats.tx_aborted_errors += (data & 0xff000000) >> 24; np->stats.tx_aborted_errors += (data & 0xff000000) >> 24;
np->stats.tx_window_errors += (data & 0x00ff0000) >> 16; np->stats.tx_window_errors += (data & 0x00ff0000) >> 16;
#ifdef ETHER_STATS
np->stats.collisions16 += (data & 0xff000000) >> 24;
#endif
np->stats.collisions += (data & 0x0000ffff); np->stats.collisions += (data & 0x0000ffff);
} }
......
...@@ -1411,10 +1411,6 @@ static void netdrv_tx_interrupt (struct net_device *dev, ...@@ -1411,10 +1411,6 @@ static void netdrv_tx_interrupt (struct net_device *dev,
tp->stats.tx_carrier_errors++; tp->stats.tx_carrier_errors++;
if (txstatus & TxOutOfWindow) if (txstatus & TxOutOfWindow)
tp->stats.tx_window_errors++; tp->stats.tx_window_errors++;
#ifdef ETHER_STATS
if ((txstatus & 0x0f000000) == 0x0f000000)
tp->stats.collisions16++;
#endif
} else { } else {
if (txstatus & TxUnderrun) { if (txstatus & TxUnderrun) {
/* Add 64 to the Tx FIFO threshold. */ /* Add 64 to the Tx FIFO threshold. */
......
...@@ -1112,13 +1112,8 @@ static void intr_handler(int irq, void *dev_instance, struct pt_regs *rgs) ...@@ -1112,13 +1112,8 @@ static void intr_handler(int irq, void *dev_instance, struct pt_regs *rgs)
np->stats.tx_errors++; np->stats.tx_errors++;
if (tx_status & 0x10) if (tx_status & 0x10)
np->stats.tx_fifo_errors++; np->stats.tx_fifo_errors++;
#ifdef ETHER_STATS
if (tx_status & 0x08)
np->stats.collisions16++;
#else
if (tx_status & 0x08) if (tx_status & 0x08)
np->stats.collisions++; np->stats.collisions++;
#endif
if (tx_status & 0x02) if (tx_status & 0x02)
np->stats.tx_window_errors++; np->stats.tx_window_errors++;
/* This reset has not been verified!. */ /* This reset has not been verified!. */
......
...@@ -1136,13 +1136,7 @@ static void netdev_tx_done(struct net_device *dev) ...@@ -1136,13 +1136,7 @@ static void netdev_tx_done(struct net_device *dev)
if (tx_status & 0x0002) np->stats.tx_fifo_errors++; if (tx_status & 0x0002) np->stats.tx_fifo_errors++;
if ((tx_status & 0x0080) && np->mii_if.full_duplex == 0) if ((tx_status & 0x0080) && np->mii_if.full_duplex == 0)
np->stats.tx_heartbeat_errors++; np->stats.tx_heartbeat_errors++;
#ifdef ETHER_STATS
if (tx_status & 0x0100) np->stats.collisions16++;
#endif
} else { } else {
#ifdef ETHER_STATS
if (tx_status & 0x0001) np->stats.tx_deferred++;
#endif
#ifndef final_version #ifndef final_version
if (debug > 3) if (debug > 3)
printk(KERN_DEBUG "%s: Transmit slot %d ok, Tx status %8.8x.\n", printk(KERN_DEBUG "%s: Transmit slot %d ok, Tx status %8.8x.\n",
......
...@@ -1105,9 +1105,6 @@ static void xircom_interrupt(int irq, void *dev_instance, struct pt_regs *regs) ...@@ -1105,9 +1105,6 @@ static void xircom_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
tp->stats.tx_errors++; tp->stats.tx_errors++;
if (status & Tx0ManyColl) { if (status & Tx0ManyColl) {
tp->stats.tx_aborted_errors++; tp->stats.tx_aborted_errors++;
#ifdef ETHER_STATS
tp->stats.collisions16++;
#endif
} }
if (status & Tx0NoCarrier) tp->stats.tx_carrier_errors++; if (status & Tx0NoCarrier) tp->stats.tx_carrier_errors++;
if (status & Tx0LateColl) tp->stats.tx_window_errors++; if (status & Tx0LateColl) tp->stats.tx_window_errors++;
......
...@@ -1025,17 +1025,11 @@ static void yellowfin_interrupt(int irq, void *dev_instance, struct pt_regs *reg ...@@ -1025,17 +1025,11 @@ static void yellowfin_interrupt(int irq, void *dev_instance, struct pt_regs *reg
if (tx_errs & 0x0800) yp->stats.tx_carrier_errors++; if (tx_errs & 0x0800) yp->stats.tx_carrier_errors++;
if (tx_errs & 0x2000) yp->stats.tx_window_errors++; if (tx_errs & 0x2000) yp->stats.tx_window_errors++;
if (tx_errs & 0x8000) yp->stats.tx_fifo_errors++; if (tx_errs & 0x8000) yp->stats.tx_fifo_errors++;
#ifdef ETHER_STATS
if (tx_errs & 0x1000) yp->stats.collisions16++;
#endif
} else { } else {
#ifndef final_version #ifndef final_version
if (yellowfin_debug > 4) if (yellowfin_debug > 4)
printk(KERN_DEBUG "%s: Normal transmit, Tx status %4.4x.\n", printk(KERN_DEBUG "%s: Normal transmit, Tx status %4.4x.\n",
dev->name, tx_errs); dev->name, tx_errs);
#endif
#ifdef ETHER_STATS
if (tx_errs & 0x0400) yp->stats.tx_deferred++;
#endif #endif
yp->stats.tx_bytes += skb->len; yp->stats.tx_bytes += skb->len;
yp->stats.collisions += tx_errs & 15; yp->stats.collisions += tx_errs & 15;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment