fix issue about build error of UE

openair2/LAYER2/PDCP_v10.1.0/pdcp.c

@@ -399,11 +399,16 @@ boolean_t pdcp_data_req(
             break;
 
           case RLC_OP_STATUS_OUT_OF_RESSOURCES:
-            UE_id = find_UE_id(ctxt_pP->module_id, ctxt_pP->rnti);
-            if(UE_id != -1){
-              pthread_mutex_lock(&(RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock));
-              RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_cnt++;
-              pthread_mutex_unlock(&(RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock));
+
+            for (UE_id = 0; UE_id < MAX_MOBILES_PER_ENB; UE_id++) {
+              if (RC.mac[ctxt_pP->module_id]->UE_list.active[UE_id] == TRUE) {
+                if (RC.mac[ctxt_pP->module_id]->UE_list.UE_template[RC.mac[ctxt_pP->module_id]->UE_list.pCC_id[UE_id]][UE_id].rnti == ctxt_pP->rnti) {
+                    pthread_mutex_lock(&(RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock));
+                    RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_cnt++;
+                    pthread_mutex_unlock(&(RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock));
+                    break;
+                }
+              }
             }
             LOG_D(PDCP, "Data sending request over RLC failed with 'Out of Resources' reason!\n");
             ret= FALSE;
@@ -464,11 +469,16 @@ boolean_t pdcp_data_req(
             break;
 
           case RLC_OP_STATUS_OUT_OF_RESSOURCES:
-            UE_id = find_UE_id(ctxt_pP->module_id, ctxt_pP->rnti);
-            if(UE_id != -1){
-              pthread_mutex_lock(&(RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock));
-              RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_cnt++;
-              pthread_mutex_unlock(&(RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock));
+
+            for (UE_id = 0; UE_id < MAX_MOBILES_PER_ENB; UE_id++) {
+              if (RC.mac[ctxt_pP->module_id]->UE_list.active[UE_id] == TRUE) {
+                if (RC.mac[ctxt_pP->module_id]->UE_list.UE_template[RC.mac[ctxt_pP->module_id]->UE_list.pCC_id[UE_id]][UE_id].rnti == ctxt_pP->rnti) {
+                    pthread_mutex_lock(&(RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock));
+                    RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_cnt++;
+                    pthread_mutex_unlock(&(RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock));
+                    break;
+                }
+              }
             }
             LOG_D(PDCP, "Data sending request over RLC failed with 'Out of Resources' reason!\n");
             ret= FALSE;

openair2/RRC/LTE/rrc_eNB.c

@@ -5922,13 +5922,13 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
         DRB_rlc_config = CALLOC(1, sizeof(*DRB_rlc_config));
         DRB_config->rlc_Config = DRB_rlc_config;
 #ifdef RRC_DEFAULT_RAB_IS_AM
-        DRB_rlc_config->present = RLC_Config_PR_am;
-        DRB_rlc_config->choice.am.ul_AM_RLC.t_PollRetransmit = T_PollRetransmit_ms50;
-        DRB_rlc_config->choice.am.ul_AM_RLC.pollPDU = PollPDU_p16;
-        DRB_rlc_config->choice.am.ul_AM_RLC.pollByte = PollByte_kBinfinity;
-        DRB_rlc_config->choice.am.ul_AM_RLC.maxRetxThreshold = UL_AM_RLC__maxRetxThreshold_t8;
-        DRB_rlc_config->choice.am.dl_AM_RLC.t_Reordering = T_Reordering_ms35;
-        DRB_rlc_config->choice.am.dl_AM_RLC.t_StatusProhibit = T_StatusProhibit_ms25;
+        DRB_rlc_config->present = LTE_RLC_Config_PR_am;
+        DRB_rlc_config->choice.am.ul_AM_RLC.t_PollRetransmit = LTE_T_PollRetransmit_ms50;
+        DRB_rlc_config->choice.am.ul_AM_RLC.pollPDU = LTE_PollPDU_p16;
+        DRB_rlc_config->choice.am.ul_AM_RLC.pollByte = LTE_PollByte_kBinfinity;
+        DRB_rlc_config->choice.am.ul_AM_RLC.maxRetxThreshold = LTE_UL_AM_RLC__maxRetxThreshold_t8;
+        DRB_rlc_config->choice.am.dl_AM_RLC.t_Reordering = LTE_T_Reordering_ms35;
+        DRB_rlc_config->choice.am.dl_AM_RLC.t_StatusProhibit = LTE_T_StatusProhibit_ms25;
 #else
         DRB_rlc_config->present = LTE_RLC_Config_PR_um_Bi_Directional;
         DRB_rlc_config->choice.um_Bi_Directional.ul_UM_RLC.sn_FieldLength = LTE_SN_FieldLength_size10;

targets/RT/USER/lte-ru.c

@@ -2341,14 +2341,6 @@ void init_RU_proc(RU_t *ru) {
 
   pthread_create( &proc->pthread_FH, attr_FH, ru_thread, (void*)ru );
 
-#if defined(PRE_SCD_THREAD)
-  if (NFAPI_MODE == NFAPI_MONOLITHIC) {
-    int rc;
-    LOG_I(MAC,"Creating MAC eNB PreSCD Task\n");
-    rc = itti_create_task (TASK_MAC_ENB_PRE_SCD, pre_scd_task, (void *)ru);
-    AssertFatal(rc >= 0, "Create task for MAC eNB PreSCD failed\n");
-  }
-#endif
 
 #ifdef PHY_TX_THREAD
   pthread_create( &proc->pthread_phy_tx, NULL, eNB_thread_phy_tx, (void *)ru );