summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pfinet/ChangeLog5
-rw-r--r--pfinet/timer-emul.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/pfinet/ChangeLog b/pfinet/ChangeLog
index 302c9b6e..af66b0be 100644
--- a/pfinet/ChangeLog
+++ b/pfinet/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-08 Marcus Brinkmann <marcus@gnu.org>
+
+ * timer-emul.c (add_timer): Don't add jiffies to EXPIRES, it is
+ the responsibility of the caller to do this.
+
2001-02-25 Roland McGrath <roland@frob.com>
* Makefile (asm/checksum.h): New target.
diff --git a/pfinet/timer-emul.c b/pfinet/timer-emul.c
index c305486e..32d1fb2d 100644
--- a/pfinet/timer-emul.c
+++ b/pfinet/timer-emul.c
@@ -85,8 +85,6 @@ add_timer (struct timer_list *timer)
{
struct timer_list **tp;
- timer->expires += jiffies;
-
for (tp = &timers; *tp; tp = &(*tp)->next)
if ((*tp)->expires > timer->expires)
{