From 3d4ba1a3b0263040521edba74ba5248324f1465a Mon Sep 17 00:00:00 2001
From: Tien-Thinh Nguyen <nguyenti@eurecom.fr>
Date: Fri, 12 May 2017 15:23:07 +0200
Subject: [PATCH] fix the errors related to multiple carriers (for a given UE
considering only the CCs which this UE belongs to)
---
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c | 32 ++++++++++++-----------
openair2/LAYER2/MAC/pre_processor.c | 11 +++++---
2 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
index 188eab9c953..595d16587cc 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
@@ -520,25 +520,27 @@ schedule_ue_spec(
// mac_xface->macphy_exit("[MAC][eNB] Cannot find eNB_UE_stats\n");
continue_flag=1;
}
-
- switch(mac_xface->get_transmission_mode(module_idP,CC_id,rnti)){
- case 1:
- case 2:
- case 7:
- aggregation = get_aggregation(get_bw_index(module_idP,CC_id),
+
+ if (continue_flag != 1){
+ switch(mac_xface->get_transmission_mode(module_idP,CC_id,rnti)){
+ case 1:
+ case 2:
+ case 7:
+ aggregation = get_aggregation(get_bw_index(module_idP,CC_id),
eNB_UE_stats->DL_cqi[0],
format1);
- break;
- case 3:
- aggregation = get_aggregation(get_bw_index(module_idP,CC_id),
+ break;
+ case 3:
+ aggregation = get_aggregation(get_bw_index(module_idP,CC_id),
eNB_UE_stats->DL_cqi[0],
format2A);
- break;
- default:
- LOG_W(MAC,"Unsupported transmission mode %d\n", mac_xface->get_transmission_mode(module_idP,CC_id,rnti));
- aggregation = 2;
- }
-
+ break;
+ default:
+ LOG_W(MAC,"Unsupported transmission mode %d\n", mac_xface->get_transmission_mode(module_idP,CC_id,rnti));
+ aggregation = 2;
+ }
+ } /* if (continue_flag != 1 */
+
if ((ue_sched_ctl->pre_nb_available_rbs[CC_id] == 0) || // no RBs allocated
CCE_allocation_infeasible(module_idP,CC_id,0,subframeP,aggregation,rnti)
) {
diff --git a/openair2/LAYER2/MAC/pre_processor.c b/openair2/LAYER2/MAC/pre_processor.c
index 74e0a43d7df..29972d6a1a2 100644
--- a/openair2/LAYER2/MAC/pre_processor.c
+++ b/openair2/LAYER2/MAC/pre_processor.c
@@ -71,9 +71,14 @@
int phy_stats_exist(module_id_t Mod_id, int rnti)
{
int CC_id;
- for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++)
- if (mac_xface->get_eNB_UE_stats(Mod_id, CC_id, rnti) == NULL)
- return 0;
+ for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++){
+ int UE_id = find_UE_id(Mod_id,rnti);
+ if (UE_id == -1)
+ continue; //skip if UE is not valid
+ if (CC_id == UE_PCCID(Mod_id,UE_id)) //get stats for only the CCs which the UE belongs to
+ if (mac_xface->get_eNB_UE_stats(Mod_id, CC_id, rnti) == NULL)
+ return 0;
+ }
return 1;
}
--
GitLab