Commit eafbe67f authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

n_tty: Refactor input_available_p() by call site 



Distinguish if caller is n_tty_poll() or n_tty_read(), and
set the read/wakeup threshold accordingly.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 001ba923

drivers/tty/n_tty.c

+4 −3
Original line number Diff line number Diff line
@@ -1869,14 +1869,15 @@ static int n_tty_open(struct tty_struct *tty) 
	return -ENOMEM;

}



static inline int input_available_p(struct tty_struct *tty, int amt)

static inline int input_available_p(struct tty_struct *tty, int poll)

{

	struct n_tty_data *ldata = tty->disc_data;

	int amt = poll && !TIME_CHAR(tty) ? MIN_CHAR(tty) : 1;



	if (ldata->icanon && !L_EXTPROC(tty)) {

		if (ldata->canon_head != ldata->read_tail)

			return 1;

	} else if (read_cnt(ldata) >= (amt ? amt : 1))

	} else if (read_cnt(ldata) >= amt)

		return 1;



	return 0;
@@ -2375,7 +2376,7 @@ static unsigned int n_tty_poll(struct tty_struct *tty, struct file *file, 


	poll_wait(file, &tty->read_wait, wait);

	poll_wait(file, &tty->write_wait, wait);

	if (input_available_p(tty, TIME_CHAR(tty) ? 0 : MIN_CHAR(tty)))

	if (input_available_p(tty, 1))

		mask |= POLLIN | POLLRDNORM;

	if (tty->packet && tty->link->ctrl_status)

		mask |= POLLPRI | POLLIN | POLLRDNORM;