diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-01-07 20:52:46 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-01-07 20:52:58 +0300 |
| commit | 6dcb8bf9a1d7f6d137a17b76177cd67e9b8e023d (patch) | |
| tree | f73ca2bee2f77eb965f049d10e10636a0ff718a0 /net/lapb/lapb_timer.c | |
| parent | 64062869f0d63d118560c15f671376b43f71b102 (diff) | |
| parent | 7b62275507232f01f66d3e7d05c77bbd9009b726 (diff) | |
| download | linux-6dcb8bf9a1d7f6d137a17b76177cd67e9b8e023d.tar.xz | |
Merge branch 'for-linus' into for-next
Back-merge of 5.11-devel branch for syncing the result changes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'net/lapb/lapb_timer.c')
| -rw-r--r-- | net/lapb/lapb_timer.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c index 8f5b17001a07..baa247fe4ed0 100644 --- a/net/lapb/lapb_timer.c +++ b/net/lapb/lapb_timer.c @@ -85,11 +85,18 @@ static void lapb_t1timer_expiry(struct timer_list *t) switch (lapb->state) { /* - * If we are a DCE, keep going DM .. DM .. DM + * If we are a DCE, send DM up to N2 times, then switch to + * STATE_1 and send SABM(E). */ case LAPB_STATE_0: - if (lapb->mode & LAPB_DCE) + if (lapb->mode & LAPB_DCE && + lapb->n2count != lapb->n2) { + lapb->n2count++; lapb_send_control(lapb, LAPB_DM, LAPB_POLLOFF, LAPB_RESPONSE); + } else { + lapb->state = LAPB_STATE_1; + lapb_establish_data_link(lapb); + } break; /* |