From 1d4501adf6da8f55dea85c0389b911b24e722620 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Tue, 9 Oct 2018 10:03:34 +0200 Subject: lib: Fix initial automated repeat-request This fixes rudimentary automated repeat-request ARQ to correctly configure the both connection records and use the receiver seqno. The rto variable is moved out of the connection record. Signed-off-by: Dimitri Staessens Signed-off-by: Sander Vrijders --- src/lib/rxmwheel.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/lib/rxmwheel.c') diff --git a/src/lib/rxmwheel.c b/src/lib/rxmwheel.c index 697c6a48..69151801 100644 --- a/src/lib/rxmwheel.c +++ b/src/lib/rxmwheel.c @@ -201,7 +201,7 @@ static int rxmwheel_move(void) r->tail = shm_du_buff_tail(sdb); r->sdb = sdb; - newtime = ts_to_ms(now) + (snd_cr->rto << ++r->mul); + newtime = ts_to_ms(now) + (f->frcti->rto << ++r->mul); rslot = (newtime >> RXMQ_R) & (RXMQ_SLOTS - 1); list_add_tail(&r->next, &rw.wheel[rslot]); @@ -239,8 +239,7 @@ static int rxmwheel_add(struct frcti * frcti, r->tail = shm_du_buff_tail(sdb); r->frcti = frcti; - slot = ((r->t0 + frcti->snd_cr.rto) >> RXMQ_R) - & (RXMQ_SLOTS - 1); + slot = ((r->t0 + frcti->rto) >> RXMQ_R) & (RXMQ_SLOTS - 1); list_add_tail(&r->next, &rw.wheel[slot]); -- cgit v1.2.3