diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-12-17 14:37:24 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-12-17 14:37:24 -0300 |
| commit | 281a94b0f2f0775a2b7825c18bccf7e4c922b7b3 (patch) | |
| tree | 9c6b8a2d392a1640d84989de25e079f3758c4f1a /net/lapb/lapb_timer.c | |
| parent | feca8a8342d3f53e394c9fc7d985b98ec0250ce1 (diff) | |
| parent | accefff5b547a9a1d959c7e76ad539bf2480e78b (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and check what UAPI headers need to be synched.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
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; /* |