diff options
| author |   Jiri Slaby <jslaby@suse.cz> | 2021-05-05 11:18:59 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-13 16:57:16 +0200 |
| commit | 67a620d58b47b6683da7f8152baa4384f74b19f8 (patch) | |
| tree | 5b60c90fca607b0fa44a43a6c02255c19fdbe91b /drivers/tty/n_tty.c | |
| parent | n_tty: drop parmrk_dbl from n_tty_receive_char (diff) | |
| download | linux-dev-67a620d58b47b6683da7f8152baa4384f74b19f8.tar.xz linux-dev-67a620d58b47b6683da7f8152baa4384f74b19f8.zip | |
n_tty: move lnext handling
Move lnext handling from __receive_buf to n_tty_receive_buf_standard. It
simplifies the handling as it needs not fetching 'flag' and decrement
'count' in __receive_buf. Instead, all this is left up to the loop in
n_tty_receive_buf_standard which already does that.
This way, no need to repeat the action when n_tty_receive_char_special
returns true -- ldata->lnext is set there in that case, so the 'if
(ldata->lnext)' check is sufficient. The next patch will switch
n_tty_receive_char_special to return 'void'.
The result is much simplified code flow.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210505091928.22010-7-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/n_tty.c')
| -rw-r--r-- | drivers/tty/n_tty.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index f0db3f41df83..d40844b7a4fb 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c @@ -1538,6 +1538,12 @@ static void n_tty_receive_buf_standard(struct tty_struct *tty, while (count--) { if (fp) flag = *fp++; + + if (ldata->lnext) { + n_tty_receive_char_lnext(tty, *cp++, flag); + continue; + } + if (likely(flag == TTY_NORMAL)) { unsigned char c = *cp++; @@ -1551,12 +1557,8 @@ static void n_tty_receive_buf_standard(struct tty_struct *tty, } if (!test_bit(c, ldata->char_map)) n_tty_receive_char(tty, c); - else if (n_tty_receive_char_special(tty, c) && count) { - if (fp) - flag = *fp++; - n_tty_receive_char_lnext(tty, *cp++, flag); - count--; - } + else + n_tty_receive_char_special(tty, c); } else n_tty_receive_char_flagged(tty, *cp++, flag); } @@ -1575,15 +1577,6 @@ static void __receive_buf(struct tty_struct *tty, const unsigned char *cp, else if (tty->closing && !L_EXTPROC(tty)) n_tty_receive_buf_closing(tty, cp, fp, count); else { - if (ldata->lnext) { - char flag = TTY_NORMAL; - - if (fp) - flag = *fp++; - n_tty_receive_char_lnext(tty, *cp++, flag); - count--; - } - n_tty_receive_buf_standard(tty, cp, fp, count); flush_echoes(tty); |