patch-1.3.14 linux/drivers/net/atp.c

Next file: linux/drivers/net/eql.c
Previous file: linux/drivers/char/vt.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.13/linux/drivers/net/atp.c linux/drivers/net/atp.c
@@ -248,7 +248,7 @@
 
 #ifdef TIMED_CHECKER
 	del_timer(&atp_timer);
-	atp_timer.expires = TIMED_CHECKER;
+	atp_timer.expires = jiffies + TIMED_CHECKER;
 	atp_timed_dev = dev;
 	add_timer(&atp_timer);
 #endif
@@ -585,7 +585,7 @@
 			write_reg_byte(ioaddr, PAR0 + i, dev->dev_addr[i]);
 #ifdef TIMED_CHECKER
 		del_timer(&atp_timer);
-		atp_timer.expires = TIMED_CHECKER;
+		atp_timer.expires = jiffies + TIMED_CHECKER;
 		add_timer(&atp_timer);
 #endif
 	}
@@ -635,7 +635,7 @@
 #endif
 	}
   del_timer(&atp_timer);
-  atp_timer.expires = TIMED_CHECKER;
+  atp_timer.expires = jiffies + TIMED_CHECKER;
   add_timer(&atp_timer);
 }
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this