summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorFlorian Fainelli <florian.fainelli@telecomint.eu>2008-07-13 14:35:00 +0200
committerJeff Garzik <jgarzik@redhat.com>2008-07-22 19:59:39 -0400
commit31718dedf62fd62e807001138ab5ac76e9b11064 (patch)
tree88f7f55540be351b617e954eb7afe31251d12677 /drivers/net
parent32f565df9ba451a24117db67003ed2ae21bab88c (diff)
downloadlinux-3.10-31718dedf62fd62e807001138ab5ac76e9b11064.tar.gz
linux-3.10-31718dedf62fd62e807001138ab5ac76e9b11064.tar.bz2
linux-3.10-31718dedf62fd62e807001138ab5ac76e9b11064.zip
r6040: change the default waiting time
This patch changes the default waiting time of a packet, which along with our previous r6040_rx path, was causing huge delays with another host (160 to 230 ms). Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/r6040.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 973f1e81667..b68781d3592 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -388,8 +388,8 @@ static void r6040_init_mac_regs(struct net_device *dev)
iowrite16(lp->rx_ring_dma >> 16, ioaddr + MRD_SA1);
/* Set interrupt waiting time and packet numbers */
- iowrite16(0x0F06, ioaddr + MT_ICR);
- iowrite16(0x0F06, ioaddr + MR_ICR);
+ iowrite16(0, ioaddr + MT_ICR);
+ iowrite16(0, ioaddr + MR_ICR);
/* Enable interrupts */
iowrite16(INT_MASK, ioaddr + MIER);