Merge from develop

2019-02-13 09:01:51 +01:00
parent 0eb430c508 5275479751
commit c7bce0f8d7
263 changed files with 23546 additions and 16069 deletions
@@ -1680,6 +1680,11 @@ void ulsch_scheduler_pre_processor(module_id_t module_idP,
      rnti = UE_RNTI(module_idP, i);
      UE_id = i;

+
+    if (UE_list->UE_template[CC_id][UE_id].rach_resource_type > 0) continue;
+
+    rnti = UE_RNTI(module_idP,i);
+
      if (rnti == NOT_A_RNTI)
        continue;