Commit a342846f authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman

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: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2c5dc464
...@@ -247,6 +247,8 @@ static void n_tty_write_wakeup(struct tty_struct *tty) ...@@ -247,6 +247,8 @@ static void n_tty_write_wakeup(struct tty_struct *tty)
static void n_tty_check_throttle(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) if (tty->driver->type == TTY_DRIVER_TYPE_PTY)
return; return;
/* /*
...@@ -254,6 +256,9 @@ static void n_tty_check_throttle(struct tty_struct *tty) ...@@ -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 * mode. We don't want to throttle the driver if we're in
* canonical mode and don't have a newline yet! * canonical mode and don't have a newline yet!
*/ */
if (ldata->icanon && ldata->canon_head == ldata->read_tail)
return;
while (1) { while (1) {
int throttled; int throttled;
tty_set_flow_change(tty, TTY_THROTTLE_SAFE); tty_set_flow_change(tty, TTY_THROTTLE_SAFE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment