From 7813e898ba04f86cf08e96ae566ec599c4d6fd7a Mon Sep 17 00:00:00 2001 From: Wu Jing Date: Thu, 19 Apr 2018 12:26:20 +0900 Subject: [PATCH 1/2] RM884 fix, when cqi received is 0, don not update dl_cqi --- openair2/LAYER2/MAC/eNB_scheduler_primitives.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c index 9cc5ef0476..3b37f032c5 100644 --- a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c +++ b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c @@ -4489,8 +4489,11 @@ extract_pusch_csi(module_id_t mod_idP, int CC_idP, int UE_id, curbyte++; } } - sched_ctl->dl_cqi[CC_idP] = + LOG_I(MAC, "RM884 UE_id %d, frame %d, subframe %d, aperiodic_wideband_cqi0 %d, dl_cqi %d\n", frameP, subframeP, sched_ctl->aperiodic_wideband_cqi0[CC_idP], sched_ctl->dl_cqi[CC_idP]); + if (sched_ctl->aperiodic_wideband_cqi0[CC_idP] > 0) { + 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"); From 2bf209e469b05c6c364e53871024546a39b22ab8 Mon Sep 17 00:00:00 2001 From: tomita Date: Thu, 19 Apr 2018 18:25:34 +0900 Subject: [PATCH 2/2] Delete LOG_I . --- openair2/LAYER2/MAC/eNB_scheduler_primitives.c | 1 - 1 file changed, 1 deletion(-) diff --git a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c index 3b37f032c5..2efc91571c 100644 --- a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c +++ b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c @@ -4489,7 +4489,6 @@ extract_pusch_csi(module_id_t mod_idP, int CC_idP, int UE_id, curbyte++; } } - LOG_I(MAC, "RM884 UE_id %d, frame %d, subframe %d, aperiodic_wideband_cqi0 %d, dl_cqi %d\n", frameP, subframeP, sched_ctl->aperiodic_wideband_cqi0[CC_idP], sched_ctl->dl_cqi[CC_idP]); if (sched_ctl->aperiodic_wideband_cqi0[CC_idP] > 0) { sched_ctl->dl_cqi[CC_idP] = sched_ctl->aperiodic_wideband_cqi0[CC_idP];