From c8bff02efaf53d88028eb52c3f95f2127b53f038 Mon Sep 17 00:00:00 2001
From: Haruki NAOI <naoi.haruki@jp.fujitsu.com>
Date: Wed, 27 Jun 2018 17:39:43 +0900
Subject: [PATCH] fix: assertion occurs in nack_or_dtx_reported() function when
RRCConnectionSetup moves.
---
openair2/LAYER2/MAC/eNB_scheduler_primitives.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
index 1ac7003723..9d5bdf90ef 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
@@ -4351,8 +4351,11 @@ static int nack_or_dtx_reported(
int i;
if (cc->tdd_Config) {
- AssertFatal(0==1, "TDD to be done. FAPI structures (see nfapi_harq_indication_tdd_rel13_t) are not clean. To be cleaned as well?\n");
- abort();
+ nfapi_harq_indication_tdd_rel13_t *hi = &harq_pdu->harq_indication_tdd_rel13;
+ for (i = 0; i < hi->number_of_ack_nack; hi++)
+ if (hi->harq_data[0].bundling.value_0 != 1) //only bundling is used for tdd for now
+ return 1;
+ return 0;
} else {
nfapi_harq_indication_fdd_rel13_t *hi = &harq_pdu->harq_indication_fdd_rel13;
for (i = 0; i < hi->number_of_ack_nack; hi++)
--
GitLab