patch-2.2.0-pre1 linux/drivers/acorn/net/ether1.c

• Lines: 45
• Date: Wed Dec 23 09:44:41 1998
• Orig file: v2.1.132/linux/drivers/acorn/net/ether1.c
• Orig date: Wed Apr 8 19:36:25 1998

diff -u --recursive --new-file v2.1.132/linux/drivers/acorn/net/ether1.c linux/drivers/acorn/net/ether1.c
@@ -519,7 +519,7 @@
 	/* 586 should now unset iscp.busy */
 	i = jiffies + HZ/2;
 	while (ether1_inw (dev, ISCP_ADDR, iscp_t, iscp_busy, DISABLEIRQS) == 1) {
-		if (jiffies > i) {
+		if (time_after(jiffies, i)) {
 			printk (KERN_WARNING "%s: can't initialise 82586: iscp is busy\n", dev->name);
 			return 1;
 		}
@@ -529,7 +529,7 @@
 	i += HZ/10;
 	while (((status = ether1_inw (dev, CFG_ADDR, cfg_t, cfg_status, DISABLEIRQS))
 			& STAT_COMPLETE) == 0) {
-		if (jiffies > i)
+		if (time_after(jiffies, i))
 			break;
 	}
 
@@ -546,7 +546,7 @@
 	i += HZ/10;
 	while (((status = ether1_inw (dev, SA_ADDR, sa_t, sa_status, DISABLEIRQS))
 			& STAT_COMPLETE) == 0) {
-		if (jiffies > i)
+		if (time_after(jiffies, i))
 			break;
 	}
 
@@ -563,7 +563,7 @@
 	i += HZ/10;
 	while (((status = ether1_inw (dev, MC_ADDR, mc_t, mc_status, DISABLEIRQS))
 			& STAT_COMPLETE) == 0) {
-		if (jiffies > i)
+		if (time_after(jiffies, i))
 			break;
 	}
 
@@ -580,7 +580,7 @@
 	i += HZ;
 	while (((status = ether1_inw (dev, TDR_ADDR, tdr_t, tdr_status, DISABLEIRQS))
 			& STAT_COMPLETE) == 0) {
-		if (jiffies > i)
+		if (time_after(jiffies, i))
 			break;
 	}