diff options
| author | Daniel Starke <daniel.starke@siemens.com> | 2022-07-01 08:16:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-01 10:07:39 +0200 |
| commit | 4fae831b3a71fc5a44cc5c7d0b8c1267ee7659f5 (patch) | |
| tree | fdc66e6626c0fd77cb6f5f75ab7f23620e0087f7 /drivers/tty | |
| parent | tty: n_gsm: fix non flow control frames during mux flow off (diff) | |
| download | linux-4fae831b3a71fc5a44cc5c7d0b8c1267ee7659f5.tar.xz linux-4fae831b3a71fc5a44cc5c7d0b8c1267ee7659f5.zip | |
tty: n_gsm: fix packet re-transmission without open control channel
In the current implementation control packets are re-transmitted even if
the control channel closed down during T2. This is wrong.
Check whether the control channel is open before re-transmitting any
packets. Note that control channel open/close is handled by T1 and not T2
and remains unaffected by this.
Fixes: e1eaea46bb40 ("tty: n_gsm line discipline")
Signed-off-by: Daniel Starke <daniel.starke@siemens.com>
Link: https://lore.kernel.org/r/20220701061652.39604-7-daniel.starke@siemens.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/n_gsm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index 3f415b2fa199..39359274096d 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -1532,7 +1532,7 @@ static void gsm_control_retransmit(struct timer_list *t) spin_lock_irqsave(&gsm->control_lock, flags); ctrl = gsm->pending_cmd; if (ctrl) { - if (gsm->cretries == 0) { + if (gsm->cretries == 0 || !gsm->dlci[0] || gsm->dlci[0]->dead) { gsm->pending_cmd = NULL; ctrl->error = -ETIMEDOUT; ctrl->done = 1; |