From d79c186a136f706868d3bf6d07428b68322383e5 Mon Sep 17 00:00:00 2001
From: echigoya <echigoya.toru@jp.fujitsu.com>
Date: Fri, 19 May 2017 09:36:47 +0900
Subject: [PATCH] Fujitsu No.6 Correct DAI incrementation
---
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
mode change 100644 => 100755 openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
old mode 100644
new mode 100755
index 595d16587c..68f99bf721
--- a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
@@ -612,17 +612,15 @@ schedule_ue_spec(
if (round > 0) {
- if (frame_parms[CC_id]->frame_type == TDD) {
- UE_list->UE_template[CC_id][UE_id].DAI++;
- update_ul_dci(module_idP,CC_id,rnti,UE_list->UE_template[CC_id][UE_id].DAI);
- LOG_D(MAC,"DAI update: CC_id %d subframeP %d: UE %d, DAI %d\n",
- CC_id,subframeP,UE_id,UE_list->UE_template[CC_id][UE_id].DAI);
- }
-
// get freq_allocation
nb_rb = UE_list->UE_template[CC_id][UE_id].nb_rb[harq_pid];
if (nb_rb <= nb_available_rb) {
+ if (frame_parms[CC_id]->frame_type == TDD) {
+ UE_list->UE_template[CC_id][UE_id].DAI++;
+ update_ul_dci(module_idP,CC_id,rnti,UE_list->UE_template[CC_id][UE_id].DAI);
+ LOG_D(MAC,"DAI update: CC_id %d subframeP %d: UE %d, DAI %d\n", CC_id,subframeP,UE_id,UE_list->UE_template[CC_id][UE_id].DAI);
+ }
if(nb_rb == ue_sched_ctl->pre_nb_available_rbs[CC_id]) {
for(j=0; j<frame_parms[CC_id]->N_RBG; j++) { // for indicating the rballoc for each sub-band
--
GitLab