Skip to content

Commit

Permalink
net/lapb: fix t1 timer handling for LAPB_STATE_0
Browse files Browse the repository at this point in the history
1. DTE interface changes immediately to LAPB_STATE_1 and start sending
   SABM(E).

2. DCE interface sends N2-times DM and changes to LAPB_STATE_1
   afterwards if there is no response in the meantime.

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Martin Schiller authored and Jakub Kicinski committed Nov 28, 2020
1 parent a4989fa commit 62480b9
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions net/lapb/lapb_timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down

0 comments on commit 62480b9

Please sign in to comment.