summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Kawasaki <ken_kawasaki@spring.nifty.jp>2011-01-30 11:16:16 +0000
committerDavid S. Miller <davem@davemloft.net>2011-01-31 20:53:20 -0800
commit785e8cc39baf31d5c18a2d198ded03a003c9c190 (patch)
tree6680ee6f411705965aaad4cba7f35b166433dda5
parent8587523640441a9ff2564ebc6efeb39497ad6709 (diff)
downloadlinux-stable-785e8cc39baf31d5c18a2d198ded03a003c9c190.tar.gz
linux-stable-785e8cc39baf31d5c18a2d198ded03a003c9c190.tar.bz2
linux-stable-785e8cc39baf31d5c18a2d198ded03a003c9c190.zip
axnet_cs: reduce delay time at ei_rx_overrun
axnet_cs: mdelay of 10ms is too long at ei_rx_overrun. It should be reduced to 2ms. Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/pcmcia/axnet_cs.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 1f42f6ac8551..d3cb77205863 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/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.