From c8267c2cf96d69c4a70053bd8e05ddfa22cc3f90 Mon Sep 17 00:00:00 2001
From: Haruki NAOI <naoi.haruki@jp.fujitsu.com>
Date: Fri, 20 Apr 2018 18:41:35 +0900
Subject: [PATCH] Revert "Merge branch 'rm884_bugfix' into 'sp3_master'"
This reverts commit fad303fe3705fc8968aa7b3bb3e5cda2780c07d5, reversing
changes made to e35921cf961b44d0659c9625632c7cf0ec1cd827.
---
openair2/LAYER2/MAC/eNB_scheduler_primitives.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
index 2efc91571c..9cc5ef0476 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
@@ -4489,10 +4489,8 @@ extract_pusch_csi(module_id_t mod_idP, int CC_idP, int UE_id,
curbyte++;
}
}
- if (sched_ctl->aperiodic_wideband_cqi0[CC_idP] > 0) {
- sched_ctl->dl_cqi[CC_idP] =
+ sched_ctl->dl_cqi[CC_idP] =
sched_ctl->aperiodic_wideband_cqi0[CC_idP];
- }
break;
case CQI_ReportModeAperiodic_rm31:
AssertFatal(0 == 1, "to be fixed, don't use p but pdu directly\n");
--
GitLab