Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a0213cb authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

TTY: ircomm, use close times from tty_port 



Switch to tty_port->close_delay and closing_wait.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Samuel Ortiz <samuel@sortiz.org>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a3cc9fcf

include/net/irda/ircomm_tty.h

+0 −3
Original line number Diff line number Diff line
@@ -101,9 +101,6 @@ struct ircomm_tty_cb { 
	struct timer_list watchdog_timer;

	struct work_struct  tqueue;



        unsigned short    close_delay;

        unsigned short    closing_wait; /* time to wait before closing */



	int  open_count;

	int  blocked_open;	/* # of blocked opens */

net/irda/ircomm/ircomm_tty.c

+4 −6
Original line number Diff line number Diff line
@@ -389,8 +389,6 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp) 
		INIT_WORK(&self->tqueue, ircomm_tty_do_softint);

		self->max_header_size = IRCOMM_TTY_HDR_UNINITIALISED;

		self->max_data_size = IRCOMM_TTY_DATA_UNINITIALISED;

		self->close_delay = 5*HZ/10;

		self->closing_wait = 30*HZ;



		/* Init some important stuff */

		init_timer(&self->watchdog_timer);
@@ -546,8 +544,8 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp) 
	 * the line discipline to only process XON/XOFF characters.

	 */

	tty->closing = 1;

	if (self->closing_wait != ASYNC_CLOSING_WAIT_NONE)

		tty_wait_until_sent_from_close(tty, self->closing_wait);

	if (self->port.closing_wait != ASYNC_CLOSING_WAIT_NONE)

		tty_wait_until_sent_from_close(tty, self->port.closing_wait);



	ircomm_tty_shutdown(self);
@@ -558,8 +556,8 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp) 
	self->tty = NULL;



	if (self->blocked_open) {

		if (self->close_delay)

			schedule_timeout_interruptible(self->close_delay);

		if (self->port.close_delay)

			schedule_timeout_interruptible(self->port.close_delay);

		wake_up_interruptible(&self->port.open_wait);

	}

net/irda/ircomm/ircomm_tty_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -272,8 +272,8 @@ static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self, 
	info.line = self->line;

	info.flags = self->flags;

	info.baud_base = self->settings.data_rate;

	info.close_delay = self->close_delay;

	info.closing_wait = self->closing_wait;

	info.close_delay = self->port.close_delay;

	info.closing_wait = self->port.closing_wait;



	/* For compatibility  */

	info.type = PORT_16550A;