diff options
Diffstat (limited to 'drivers/char/pty.c')
-rw-r--r-- | drivers/char/pty.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/char/pty.c b/drivers/char/pty.c index 80d3eedd7f96..c07a1b5cd05d 100644 --- a/drivers/char/pty.c +++ b/drivers/char/pty.c | |||
@@ -218,7 +218,7 @@ out: | |||
218 | return retval; | 218 | return retval; |
219 | } | 219 | } |
220 | 220 | ||
221 | static void pty_set_termios(struct tty_struct *tty, struct termios *old_termios) | 221 | static void pty_set_termios(struct tty_struct *tty, struct ktermios *old_termios) |
222 | { | 222 | { |
223 | tty->termios->c_cflag &= ~(CSIZE | PARENB); | 223 | tty->termios->c_cflag &= ~(CSIZE | PARENB); |
224 | tty->termios->c_cflag |= (CS8 | CREAD); | 224 | tty->termios->c_cflag |= (CS8 | CREAD); |
@@ -272,6 +272,8 @@ static void __init legacy_pty_init(void) | |||
272 | pty_driver->init_termios.c_oflag = 0; | 272 | pty_driver->init_termios.c_oflag = 0; |
273 | pty_driver->init_termios.c_cflag = B38400 | CS8 | CREAD; | 273 | pty_driver->init_termios.c_cflag = B38400 | CS8 | CREAD; |
274 | pty_driver->init_termios.c_lflag = 0; | 274 | pty_driver->init_termios.c_lflag = 0; |
275 | pty_driver->init_termios.c_ispeed = 38400; | ||
276 | pty_driver->init_termios.c_ospeed = 38400; | ||
275 | pty_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW; | 277 | pty_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW; |
276 | pty_driver->other = pty_slave_driver; | 278 | pty_driver->other = pty_slave_driver; |
277 | tty_set_operations(pty_driver, &pty_ops); | 279 | tty_set_operations(pty_driver, &pty_ops); |
@@ -286,6 +288,8 @@ static void __init legacy_pty_init(void) | |||
286 | pty_slave_driver->subtype = PTY_TYPE_SLAVE; | 288 | pty_slave_driver->subtype = PTY_TYPE_SLAVE; |
287 | pty_slave_driver->init_termios = tty_std_termios; | 289 | pty_slave_driver->init_termios = tty_std_termios; |
288 | pty_slave_driver->init_termios.c_cflag = B38400 | CS8 | CREAD; | 290 | pty_slave_driver->init_termios.c_cflag = B38400 | CS8 | CREAD; |
291 | pty_slave_driver->init_termios.c_ispeed = 38400; | ||
292 | pty_slave_driver->init_termios.c_ospeed = 38400; | ||
289 | pty_slave_driver->flags = TTY_DRIVER_RESET_TERMIOS | | 293 | pty_slave_driver->flags = TTY_DRIVER_RESET_TERMIOS | |
290 | TTY_DRIVER_REAL_RAW; | 294 | TTY_DRIVER_REAL_RAW; |
291 | pty_slave_driver->other = pty_driver; | 295 | pty_slave_driver->other = pty_driver; |
@@ -366,6 +370,8 @@ static void __init unix98_pty_init(void) | |||
366 | ptm_driver->init_termios.c_oflag = 0; | 370 | ptm_driver->init_termios.c_oflag = 0; |
367 | ptm_driver->init_termios.c_cflag = B38400 | CS8 | CREAD; | 371 | ptm_driver->init_termios.c_cflag = B38400 | CS8 | CREAD; |
368 | ptm_driver->init_termios.c_lflag = 0; | 372 | ptm_driver->init_termios.c_lflag = 0; |
373 | ptm_driver->init_termios.c_ispeed = 38400; | ||
374 | ptm_driver->init_termios.c_ospeed = 38400; | ||
369 | ptm_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW | | 375 | ptm_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW | |
370 | TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM; | 376 | TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM; |
371 | ptm_driver->other = pts_driver; | 377 | ptm_driver->other = pts_driver; |
@@ -381,6 +387,8 @@ static void __init unix98_pty_init(void) | |||
381 | pts_driver->subtype = PTY_TYPE_SLAVE; | 387 | pts_driver->subtype = PTY_TYPE_SLAVE; |
382 | pts_driver->init_termios = tty_std_termios; | 388 | pts_driver->init_termios = tty_std_termios; |
383 | pts_driver->init_termios.c_cflag = B38400 | CS8 | CREAD; | 389 | pts_driver->init_termios.c_cflag = B38400 | CS8 | CREAD; |
390 | pts_driver->init_termios.c_ispeed = 38400; | ||
391 | pts_driver->init_termios.c_ospeed = 38400; | ||
384 | pts_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW | | 392 | pts_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW | |
385 | TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM; | 393 | TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM; |
386 | pts_driver->other = ptm_driver; | 394 | pts_driver->other = ptm_driver; |