2.5.30-pcnet_cs

PATCH New Russell King 1 participant 1 message Aug 30, 2002 Network drivers

lore

Share & tools

lore

Russell King

author

2002-08-30 21:36 UTC #0 lore raw

PATCH 1/1 2.5.30-pcnet_cs

This patch appears not to be in 2.5.32, but applies cleanly.

This patch fixes a bug in handling the timeout in pcnet_cs.c, where it uses the following test to determine whether the timeout has expired:

        if (jiffies - dma_start > PCNET_RDC_TIMEOUT) {

Unfortunately, PCNET_RDC_TIMEOUT is defined to be "0x02", so the length of the timeout is only two jiffy ticks, rather than being the expected 20ms. This patch fixes this.

Also, the above (and one other place) should be converted to time_after().

 drivers/net/pcmcia/pcnet_cs.c |    6 +++---
 1 files changed, 3 insertions, 3 deletions

drivers/net/pcmcia/pcnet_cs.c +3 -3

diff -ur orig/drivers/net/pcmcia/pcnet_cs.c linux/drivers/net/pcmcia/pcnet_cs.c
@@ -64,7 +64,7 @@
 #define SOCKET_START_PG	0x01
 #define SOCKET_STOP_PG	0xff
 
-#define PCNET_RDC_TIMEOUT 0x02	/* Max wait in jiffies for Tx RDC */
+#define PCNET_RDC_TIMEOUT (2*HZ/100)	/* Max wait in jiffies for Tx RDC */
 
 static char *if_names[] = { "auto", "10baseT", "10base2"};

@@ -1183,7 +1183,7 @@
 	}
 	info->link_status = link;
     }
-    if (info->pna_phy && (jiffies - info->mii_reset > 6*HZ)) {
+    if (info->pna_phy && time_after(jiffies, info->mii_reset + 6*HZ)) {
 	link = mdio_read(mii_addr, info->eth_phy, 1) & 0x0004;
 	if (((info->phy_id == info->pna_phy) && link) ||
 	    ((info->phy_id != info->pna_phy) && !link)) {

@@ -1385,7 +1385,7 @@
 #endif
 
     while ((inb_p(nic_base + EN0_ISR) & ENISR_RDC) == 0)
-	if (jiffies - dma_start > PCNET_RDC_TIMEOUT) {
+	if (time_after(jiffies, dma_start + PCNET_RDC_TIMEOUT)) {
 	    printk(KERN_NOTICE "%s: timeout waiting for Tx RDC.\n",
 		   dev->name);
 	    pcnet_reset_8390(dev);