Commit 4fae831b authored by Daniel Starke's avatar Daniel Starke Committed by Greg Kroah-Hartman

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: e1eaea46 ("tty: n_gsm line discipline")
Signed-off-by: default avatarDaniel Starke <daniel.starke@siemens.com>
Link: https://lore.kernel.org/r/20220701061652.39604-7-daniel.starke@siemens.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bec02248
...@@ -1532,7 +1532,7 @@ static void gsm_control_retransmit(struct timer_list *t) ...@@ -1532,7 +1532,7 @@ static void gsm_control_retransmit(struct timer_list *t)
spin_lock_irqsave(&gsm->control_lock, flags); spin_lock_irqsave(&gsm->control_lock, flags);
ctrl = gsm->pending_cmd; ctrl = gsm->pending_cmd;
if (ctrl) { if (ctrl) {
if (gsm->cretries == 0) { if (gsm->cretries == 0 || !gsm->dlci[0] || gsm->dlci[0]->dead) {
gsm->pending_cmd = NULL; gsm->pending_cmd = NULL;
ctrl->error = -ETIMEDOUT; ctrl->error = -ETIMEDOUT;
ctrl->done = 1; ctrl->done = 1;
......
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