moreau francis <francis_moreau2000@yahoo.fr> points out that we need to
initialise overrun_time, else the overrun reporting screws up when jiffies is
"negative".
So initialise tty->overrun_time apropriately, and handle the case where the
tty has been open for so long that the overrun time has become "greater than"
jiffies.
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/char/n_tty.c | 8 +++++---
25-akpm/drivers/char/tty_io.c | 1 +
2 files changed, 6 insertions(+), 3 deletions(-)
diff -puN drivers/char/tty_io.c~tty-overrun-time-fix drivers/char/tty_io.c
--- 25/drivers/char/tty_io.c~tty-overrun-time-fix 2005-03-14 01:45:43.000000000 -0800
+++ 25-akpm/drivers/char/tty_io.c 2005-03-14 01:46:02.000000000 -0800
@@ -2632,6 +2632,7 @@ static void initialize_tty_struct(struct
tty->magic = TTY_MAGIC;
tty_ldisc_assign(tty, tty_ldisc_get(N_TTY));
tty->pgrp = -1;
+ tty->overrun_time = jiffies;
tty->flip.char_buf_ptr = tty->flip.char_buf;
tty->flip.flag_buf_ptr = tty->flip.flag_buf;
INIT_WORK(&tty->flip.work, flush_to_ldisc, tty);
diff -puN drivers/char/n_tty.c~tty-overrun-time-fix drivers/char/n_tty.c
--- 25/drivers/char/n_tty.c~tty-overrun-time-fix 2005-03-14 01:49:25.000000000 -0800
+++ 25-akpm/drivers/char/n_tty.c 2005-03-14 01:50:10.000000000 -0800
@@ -606,9 +606,11 @@ static inline void n_tty_receive_overrun
char buf[64];
tty->num_overrun++;
- if (time_before(tty->overrun_time, jiffies - HZ)) {
- printk(KERN_WARNING "%s: %d input overrun(s)\n", tty_name(tty, buf),
- tty->num_overrun);
+ if (time_before(tty->overrun_time, jiffies - HZ) ||
+ time_after(tty->overrun_time, jiffies)) {
+ printk(KERN_WARNING "%s: %d input overrun(s)\n",
+ tty_name(tty, buf),
+ tty->num_overrun);
tty->overrun_time = jiffies;
tty->num_overrun = 0;
}
_