Commit 709b1fd2 authored by fnabet's avatar fnabet
Browse files

RLC AM: fix TReordering expiry

parent e1293616
...@@ -83,23 +83,22 @@ rlc_am_check_timer_reordering( ...@@ -83,23 +83,22 @@ rlc_am_check_timer_reordering(
AssertFatal (cursor != NULL, "RLC AM TReordering Expiry Rx PDU list empty LcId=%d\n", rlc_pP->channel_id); AssertFatal (cursor != NULL, "RLC AM TReordering Expiry Rx PDU list empty LcId=%d\n", rlc_pP->channel_id);
while ((cursor != NULL) && (vr_ms_new != rlc_pP->vr_h)) { /* go to memblock up to vrX*/
pdu_info = &((rlc_am_rx_pdu_management_t*)(cursor->data))->pdu_info; pdu_info = &((rlc_am_rx_pdu_management_t*)(cursor->data))->pdu_info;
while ((cursor != NULL) && (RLC_AM_DIFF_SN(pdu_info->sn,rlc_pP->vr_r) < RLC_AM_DIFF_SN(vr_ms_new,rlc_pP->vr_r))) {
cursor = cursor->next;
// First find an element with SN greater or equal than vrX if (cursor != NULL) {
if (RLC_AM_DIFF_SN(pdu_info->sn,rlc_pP->vr_r) >= RLC_AM_DIFF_SN(rlc_pP->vr_x,rlc_pP->vr_r)) { pdu_info = &((rlc_am_rx_pdu_management_t*)(cursor->data))->pdu_info;
if (((rlc_am_rx_pdu_management_t*)(cursor->data))->all_segments_received == 0) { }
// Stop at first found discontinuity }
// vr_ms_new holds SN following the latest in sequence fully received PDU >= old vrX
break; /* Now find a SN for which either no PDU is received or partially received */
} while ((cursor != NULL) && (pdu_info->sn == vr_ms_new) && (((rlc_am_rx_pdu_management_t*)(cursor->data))->all_segments_received > 0)) {
else { cursor = cursor->next;
vr_ms_new = RLC_AM_NEXT_SN(vr_ms_new); vr_ms_new = RLC_AM_NEXT_SN(vr_ms_new);
} if (cursor != NULL) {
pdu_info = &((rlc_am_rx_pdu_management_t*)(cursor->data))->pdu_info;
} }
cursor = cursor->next;
} }
/* Update vr_ms */ /* Update vr_ms */
......
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