Commit 39b01edc authored by Tilman Schmidt's avatar Tilman Schmidt Committed by Luis Henriques

isdn/gigaset: reset tty->receive_room when attaching ser_gigaset

commit fd98e941 upstream.

Commit 79901317 ("n_tty: Don't flush buffer when closing ldisc"),
first merged in kernel release 3.10, caused the following regression
in the Gigaset M101 driver:

Before that commit, when closing the N_TTY line discipline in
preparation to switching to N_GIGASET_M101, receive_room would be
reset to a non-zero value by the call to n_tty_flush_buffer() in
n_tty's close method. With the removal of that call, receive_room
might be left at zero, blocking data reception on the serial line.

The present patch fixes that regression by setting receive_room
to an appropriate value in the ldisc open method.

Fixes: 79901317 ("n_tty: Don't flush buffer when closing ldisc")
Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 230ecc15
...@@ -524,9 +524,18 @@ gigaset_tty_open(struct tty_struct *tty) ...@@ -524,9 +524,18 @@ gigaset_tty_open(struct tty_struct *tty)
cs->hw.ser->tty = tty; cs->hw.ser->tty = tty;
atomic_set(&cs->hw.ser->refcnt, 1); atomic_set(&cs->hw.ser->refcnt, 1);
init_completion(&cs->hw.ser->dead_cmp); init_completion(&cs->hw.ser->dead_cmp);
tty->disc_data = cs; tty->disc_data = cs;
/* Set the amount of data we're willing to receive per call
* from the hardware driver to half of the input buffer size
* to leave some reserve.
* Note: We don't do flow control towards the hardware driver.
* If more data is received than will fit into the input buffer,
* it will be dropped and an error will be logged. This should
* never happen as the device is slow and the buffer size ample.
*/
tty->receive_room = RBUFSIZE/2;
/* OK.. Initialization of the datastructures and the HW is done.. Now /* OK.. Initialization of the datastructures and the HW is done.. Now
* startup system and notify the LL that we are ready to run * startup system and notify the LL that we are ready to run
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment