diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2015-01-16 21:05:35 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-02 19:11:26 +0100 |
| commit | a342846f9b0448996f56ebece80454d41b431ce2 (patch) | |
| tree | 9c46111ae604d1e3eae2f5973c755af62ef5cb73 /drivers | |
| parent | n_tty: Eliminate receive_room() from consumer/exclusive paths (diff) | |
| download | linux-a342846f9b0448996f56ebece80454d41b431ce2.tar.xz linux-a342846f9b0448996f56ebece80454d41b431ce2.zip | |
n_tty: Fix throttle for canon lines > 3967 chars
The tty driver will be mistakenly throttled if a line termination
has not been received, and the line exceeds 3967 chars. Thus, it is
possible for the driver to stop sending when it has not yet sent
the newline. This does not apply to the pty driver.
Don't throttle until at least one line termination has been
received.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/n_tty.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index b60b043f47d8..d4b14c30794e 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c @@ -247,6 +247,8 @@ static void n_tty_write_wakeup(struct tty_struct *tty) static void n_tty_check_throttle(struct tty_struct *tty) { + struct n_tty_data *ldata = tty->disc_data; + if (tty->driver->type == TTY_DRIVER_TYPE_PTY) return; /* @@ -254,6 +256,9 @@ static void n_tty_check_throttle(struct tty_struct *tty) * mode. We don't want to throttle the driver if we're in * canonical mode and don't have a newline yet! */ + if (ldata->icanon && ldata->canon_head == ldata->read_tail) + return; + while (1) { int throttled; tty_set_flow_change(tty, TTY_THROTTLE_SAFE); |