From 32e107dcdfe3fbf5d2ae27f94c2f09807710db15 Mon Sep 17 00:00:00 2001
From: Florian Kaltenberger <kaltenbe@eurecom.fr>
Date: Mon, 8 Jul 2019 15:29:14 +0200
Subject: [PATCH] fixing bugs in UE

---
 executables/nr-ue.c                          | 3 ++-
 openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/executables/nr-ue.c b/executables/nr-ue.c
index e368a3198b..e3d9488dc9 100644
--- a/executables/nr-ue.c
+++ b/executables/nr-ue.c
@@ -631,8 +631,9 @@ void *UE_thread(void *arg) {
     processingData_t *curMsg=(processingData_t *)NotifiedFifoData(msgToPush);
     curMsg->UE=UE;
     // update thread index for received subframe
-    curMsg->proc.nr_tti_rx= slot_nr;
     curMsg->UE->current_thread_id[slot_nr] = thread_idx;
+    curMsg->proc.CC_id = 0;
+    curMsg->proc.nr_tti_rx= slot_nr;
     curMsg->proc.subframe_rx=table_sf_slot[slot_nr];
     curMsg->proc.nr_tti_tx = (absolute_slot + DURATION_RX_TO_TX) % nb_slot_frame;
     curMsg->proc.subframe_tx=curMsg->proc.nr_tti_rx;
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
index da2da96c50..f9cddb4327 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
@@ -583,6 +583,9 @@ int8_t nr_ue_decode_mib(
         mac->type0_pdcch_ss_n_c = n_c;
         
 	    // fill in the elements in config request inside P5 message
+	mac->phy_config.Mod_id = module_id;
+	mac->phy_config.CC_id = cc_id;
+
 	    mac->phy_config.config_req.pbch_config.system_frame_number = frame;    //  after calculation
 	    mac->phy_config.config_req.pbch_config.subcarrier_spacing_common = mac->mib->subCarrierSpacingCommon;
 	    mac->phy_config.config_req.pbch_config.ssb_subcarrier_offset = ssb_subcarrier_offset;  //  after calculation
-- 
2.26.2