From b27984349d0a13a351b45e41cec9c0546d553c7e Mon Sep 17 00:00:00 2001
From: Wu Jing <wu.jing@cn.fujitsu.com>
Date: Wed, 11 Apr 2018 13:44:56 +0900
Subject: [PATCH] fix ct test bug 2_37 2_72
---
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_status_report.c | 2 +-
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_status_report.c b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_status_report.c
index 22c5604708..72b106d1c0 100644
--- a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_status_report.c
+++ b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_status_report.c
@@ -617,7 +617,7 @@ rlc_am_send_status_pdu(
}
/* First ensure there is enough TBS for at least 1 SOStart/SOEnd, else break */
- if ((nb_bits_transmitted + RLC_AM_SN_BITS + (RLC_AM_PDU_E_BITS << 1) + (RLC_AM_STATUS_PDU_SO_LENGTH << 1)) <= nb_bits_to_transmit) {
+ else if ((nb_bits_transmitted + RLC_AM_SN_BITS + (RLC_AM_PDU_E_BITS << 1) + (RLC_AM_STATUS_PDU_SO_LENGTH << 1)) <= nb_bits_to_transmit) {
/* Init loop flags */
/* Check lsf */
segment_loop_end = (pdu_info_cursor_p->lsf == 1);
diff --git a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
index 0718cdd93c..b1c455aee0 100644
--- a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
+++ b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
@@ -571,6 +571,8 @@ rlc_um_mac_data_request (const protocol_ctxt_t* const ctxt_pP, void *rlc_pP,cons
//AssertFatal( tb_size_in_bytes > 0 , "RLC UM PDU LENGTH %d", tb_size_in_bytes);
if(tb_size_in_bytes <= 0) {
LOG_E(RLC, "RLC UM PDU LENGTH %d\n", tb_size_in_bytes);
+ tb_p = tb_p->next;
+ continue;
}
#if TRACE_RLC_UM_PDU || MESSAGE_CHART_GENERATOR
--
GitLab