Merge remote-tracking branch 'origin/hotfix-rlc-2018-w09' into develop
This commit is contained in:
@@ -172,7 +172,7 @@ rlc_um_segment_10 (const protocol_ctxt_t* const ctxt_pP, rlc_um_entity_t *rlc_pP
|
||||
test_pdu_remaining_size = 0;
|
||||
test_remaining_size_to_substract = 0;
|
||||
test_remaining_num_li_to_substract = 0;
|
||||
pdu_remaining_size = pdu_remaining_size - (test_li_length_in_bytes ^ 3);
|
||||
//pdu_remaining_size = pdu_remaining_size - (test_li_length_in_bytes ^ 3);
|
||||
} else if ((sdu_mngt_p->sdu_remaining_size + (test_li_length_in_bytes ^ 3)) < test_pdu_remaining_size ) {
|
||||
test_num_li += 1;
|
||||
num_fill_sdu += 1;
|
||||
@@ -365,9 +365,9 @@ rlc_um_segment_10 (const protocol_ctxt_t* const ctxt_pP, rlc_um_entity_t *rlc_pP
|
||||
sdu_mngt_p->sdu_remaining_size,
|
||||
pdu_remaining_size - sdu_mngt_p->sdu_remaining_size);
|
||||
#endif
|
||||
#if !EXMIMO
|
||||
assert(1!=1);
|
||||
#endif
|
||||
//#if !EXMIMO
|
||||
// assert(1!=1);
|
||||
//#endif
|
||||
memcpy(data, data_sdu_p, sdu_mngt_p->sdu_remaining_size);
|
||||
// reduce the size of the PDU
|
||||
continue_fill_pdu_with_sdu = 0;
|
||||
|
||||
Reference in New Issue
Block a user