From c1fe4c3ce2c6c28708635da8352d2e549ff3e5ad Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Fri, 31 Mar 2006 02:30:47 -0800
Subject: [PATCH] --- yaml --- r: 24889 b: refs/heads/master c:
 0000754c27f07d5656eff17367c05dc4cfb7d965 h: refs/heads/master i:   24887:
 8195b207ac0bd5eb2368989b821333f91c1b0897 v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/net/3c59x.c | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 3653b0318859..44b4ff653fe5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88b9adb073b7a69a54b1b14423103bc24587ebdc
+refs/heads/master: 0000754c27f07d5656eff17367c05dc4cfb7d965
diff --git a/trunk/drivers/net/3c59x.c b/trunk/drivers/net/3c59x.c
index 70f63891b19c..51129079853b 100644
--- a/trunk/drivers/net/3c59x.c
+++ b/trunk/drivers/net/3c59x.c
@@ -2083,16 +2083,14 @@ vortex_error(struct net_device *dev, int status)
 		}
 		if (tx_status & 0x14)  vp->stats.tx_fifo_errors++;
 		if (tx_status & 0x38)  vp->stats.tx_aborted_errors++;
+		if (tx_status & 0x08)  vp->xstats.tx_max_collisions++;
 		iowrite8(0, ioaddr + TxStatus);
 		if (tx_status & 0x30) {			/* txJabber or txUnderrun */
 			do_tx_reset = 1;
-		} else if (tx_status & 0x08) {	/* maxCollisions */
-			vp->xstats.tx_max_collisions++;
-			if (vp->drv_flags & MAX_COLLISION_RESET) {
-				do_tx_reset = 1;
-				reset_mask = 0x0108;		/* Reset interface logic, but not download logic */
-			}
-		} else {						/* Merely re-enable the transmitter. */
+		} else if ((tx_status & 0x08) && (vp->drv_flags & MAX_COLLISION_RESET))  {	/* maxCollisions */
+			do_tx_reset = 1;
+			reset_mask = 0x0108;		/* Reset interface logic, but not download logic */
+		} else {				/* Merely re-enable the transmitter. */
 			iowrite16(TxEnable, ioaddr + EL3_CMD);
 		}
 	}