tty: Move pty-specific set_termios() handling to pty driver

Packet mode is unique to the pty driver; move the packet mode state
change code from the generic tty ioctl handler to the pty driver.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Reviewed-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 29 insertions, 31 deletions

diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 6c7602592fe0..7f612c524224 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -259,6 +259,34 @@ out:
 static void pty_set_termios(struct tty_struct *tty,
                                         struct ktermios *old_termios)
 {
+        unsigned long flags;
+
+        /* See if packet mode change of state. */
+        if (tty->link && tty->link->packet) {
+                int extproc = (old_termios->c_lflag & EXTPROC) |
+                                (tty->termios.c_lflag & EXTPROC);
+                int old_flow = ((old_termios->c_iflag & IXON) &&
+                                (old_termios->c_cc[VSTOP] == '\023') &&
+                                (old_termios->c_cc[VSTART] == '\021'));
+                int new_flow = (I_IXON(tty) &&
+                                STOP_CHAR(tty) == '\023' &&
+                                START_CHAR(tty) == '\021');
+                if ((old_flow != new_flow) || extproc) {
+                        spin_lock_irqsave(&tty->ctrl_lock, flags);
+                        if (old_flow != new_flow) {
+                                tty->ctrl_status &= ~(TIOCPKT_DOSTOP | TIOCPKT_NOSTOP);
+                                if (new_flow)
+                                        tty->ctrl_status |= TIOCPKT_DOSTOP;
+                                else
+                                        tty->ctrl_status |= TIOCPKT_NOSTOP;
+                        }
+                        if (extproc)
+                                tty->ctrl_status |= TIOCPKT_IOCTL;
+                        spin_unlock_irqrestore(&tty->ctrl_lock, flags);
+                        wake_up_interruptible(&tty->link->read_wait);
+                }
+        }
+
         tty->termios.c_cflag &= ~(CSIZE | PARENB);
         tty->termios.c_cflag |= (CS8 | CREAD);
 }
diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index ab4562c06af4..24a136079d90 100644
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -524,10 +524,7 @@ EXPORT_SYMBOL(tty_termios_hw_change);
  *      @tty: tty to update
  *      @new_termios: desired new value
  *
- *      Perform updates to the termios values set on this terminal. There
- *      is a bit of layering violation here with n_tty in terms of the
- *      internal knowledge of this function.
- *
+ *      Perform updates to the termios values set on this terminal.
  *      A master pty's termios should never be set.
  *
  *      Locking: termios_rwsem
@@ -537,7 +534,6 @@ int tty_set_termios(struct tty_struct *tty, struct ktermios *new_termios)
 {
         struct ktermios old_termios;
         struct tty_ldisc *ld;
-        unsigned long flags;
 
         WARN_ON(tty->driver->type == TTY_DRIVER_TYPE_PTY &&
                 tty->driver->subtype == PTY_TYPE_MASTER);
@@ -553,32 +549,6 @@ int tty_set_termios(struct tty_struct *tty, struct ktermios *new_termios)
         tty->termios = *new_termios;
         unset_locked_termios(&tty->termios, &old_termios, &tty->termios_locked);
 
-        /* See if packet mode change of state. */
-        if (tty->link && tty->link->packet) {
-                int extproc = (old_termios.c_lflag & EXTPROC) |
-                                (tty->termios.c_lflag & EXTPROC);
-                int old_flow = ((old_termios.c_iflag & IXON) &&
-                                (old_termios.c_cc[VSTOP] == '\023') &&
-                                (old_termios.c_cc[VSTART] == '\021'));
-                int new_flow = (I_IXON(tty) &&
-                                STOP_CHAR(tty) == '\023' &&
-                                START_CHAR(tty) == '\021');
-                if ((old_flow != new_flow) || extproc) {
-                        spin_lock_irqsave(&tty->ctrl_lock, flags);
-                        if (old_flow != new_flow) {
-                                tty->ctrl_status &= ~(TIOCPKT_DOSTOP | TIOCPKT_NOSTOP);
-                                if (new_flow)
-                                        tty->ctrl_status |= TIOCPKT_DOSTOP;
-                                else
-                                        tty->ctrl_status |= TIOCPKT_NOSTOP;
-                        }
-                        if (extproc)
-                                tty->ctrl_status |= TIOCPKT_IOCTL;
-                        spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-                        wake_up_interruptible(&tty->link->read_wait);
-                }
-        }
-
         if (tty->ops->set_termios)
                 (*tty->ops->set_termios)(tty, &old_termios);
         else