Merge remote-tracking branch 'origin/develop' into develop-nr_cppcheck

2019-11-22 11:18:28 +01:00
parent 94968c14df b63e21b625
commit baf5f1ed93
8 changed files with 186 additions and 13 deletions
@@ -2014,6 +2014,14 @@ static int ue_ul_compare(const void *_a, const void *_b, void *_params) {
      UE_list->UE_template[pCCid2][UE_id2].pre_assigned_mcs_ul)
    return 1;

+  if (UE_list->UE_sched_ctrl[UE_id1].cqi_req_timer >
+      UE_list->UE_sched_ctrl[UE_id2].cqi_req_timer)
+    return -1;
+
+  if (UE_list->UE_sched_ctrl[UE_id1].cqi_req_timer <
+      UE_list->UE_sched_ctrl[UE_id2].cqi_req_timer)
+    return 1;
+
  return 0;
 }