From 36cd05bcbaaeaeb5995b812884c7f94812b8f18e Mon Sep 17 00:00:00 2001
From: Louis Adrien Dufrene <swmt1841@yd-CZC6227X3N.orangeai.mey>
Date: Tue, 16 Apr 2019 08:22:54 +0200
Subject: [PATCH] Bug fix: dci0_ongoing timer ok, now impossible to set ul_SR
when dci0 is ongoing.
---
openair2/LAYER2/MAC/eNB_scheduler_primitives.c | 2 +-
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
index 8d59bf0ca1..8aba7e779d 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
@@ -4954,7 +4954,7 @@ SR_indication(module_id_t mod_idP,
UE_scheduling_ctrl = &(UE_list->UE_sched_ctrl[UE_id]);
if ((UE_scheduling_ctrl->cdrx_configured == TRUE) &&
- (UE_scheduling_ctrl->dci0_ongoing_timer > 4) &&
+ (UE_scheduling_ctrl->dci0_ongoing_timer > 0) &&
(UE_scheduling_ctrl->dci0_ongoing_timer < 8)) {
LOG_D(MAC, "[eNB %d][SR %x] Frame %d subframeP %d Signaling SR for UE %d on CC_id %d. \
The SR is not set do to ongoing DCI0 with CDRX activated\n",
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
index b635a8cf99..141cba5a6e 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
@@ -241,9 +241,6 @@ rx_sdu(const module_id_t enb_mod_idP,
* Note: in case of asynchronous UL HARQ process restart here relevant RTT timer.
* Start corresponding CDRX ULRetransmission timer.
*/
-
- unsigned long active_time_condition = 10;
- VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_DRX_ACTIVE_TIME_CONDITION, (unsigned long) active_time_condition);
}
first_rb = UE_template_ptr->first_rb_ul[harq_pid];
--
GitLab