From 46352f05427bc1abf0b51a0bfb2bd5b91a2a0f7e Mon Sep 17 00:00:00 2001
From: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Date: Sun, 30 Jan 2011 11:16:16 +0000
Subject: [PATCH] --- yaml --- r: 232854 b: refs/heads/master c:
 785e8cc39baf31d5c18a2d198ded03a003c9c190 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/pcmcia/axnet_cs.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7d0947023c95..3bee85e00abb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8587523640441a9ff2564ebc6efeb39497ad6709
+refs/heads/master: 785e8cc39baf31d5c18a2d198ded03a003c9c190
diff --git a/trunk/drivers/net/pcmcia/axnet_cs.c b/trunk/drivers/net/pcmcia/axnet_cs.c
index 1f42f6ac8551..d3cb77205863 100644
--- a/trunk/drivers/net/pcmcia/axnet_cs.c
+++ b/trunk/drivers/net/pcmcia/axnet_cs.c
@@ -1488,12 +1488,10 @@ static void ei_rx_overrun(struct net_device *dev)
     
 	/* 
 	 * Wait a full Tx time (1.2ms) + some guard time, NS says 1.6ms total.
-	 * Early datasheets said to poll the reset bit, but now they say that
-	 * it "is not a reliable indicator and subsequently should be ignored."
-	 * We wait at least 10ms.
+	 * We wait at least 2ms.
 	 */
 
-	mdelay(10);
+	mdelay(2);
 
 	/*
 	 * Reset RBCR[01] back to zero as per magic incantation.