n_tty: Factor raw mode receive_buf() into separate fn

Convert to modal receive_buf() processing; factor raw mode
per-char i/o into n_tty_receive_buf_raw().

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 19 insertions, 5 deletions

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 6aa90332dd3e..900ebbe0a7ab 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -1259,11 +1259,6 @@ static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c)
         struct n_tty_data *ldata = tty->disc_data;
         int parmrk;
 
-        if (ldata->raw) {
-                put_tty_queue(c, ldata);
-                return;
-        }
-
         if (I_ISTRIP(tty))
                 c &= 0x7f;
         if (I_IUCLC(tty) && L_IEXTEN(tty))
@@ -1530,6 +1525,23 @@ n_tty_receive_buf_real_raw(struct tty_struct *tty, const unsigned char *cp,
         ldata->read_head += n;
 }
 
+static void
+n_tty_receive_buf_raw(struct tty_struct *tty, const unsigned char *cp,
+                      char *fp, int count)
+{
+        struct n_tty_data *ldata = tty->disc_data;
+        char flag = TTY_NORMAL;
+
+        while (count--) {
+                if (fp)
+                        flag = *fp++;
+                if (likely(flag == TTY_NORMAL))
+                        put_tty_queue(*cp++, ldata);
+                else
+                        n_tty_receive_char_flagged(tty, *cp++, flag);
+        }
+}
+
 static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
                           char *fp, int count)
 {
@@ -1537,6 +1549,8 @@ static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
 
         if (ldata->real_raw)
                 n_tty_receive_buf_real_raw(tty, cp, fp, count);
+        else if (ldata->raw)
+                n_tty_receive_buf_raw(tty, cp, fp, count);
         else {
                 char flag = TTY_NORMAL;