From deeded689de8f64d99e7711c8e8cdfe842340b80 Mon Sep 17 00:00:00 2001
From: Haruki NAOI <naoi.haruki@jp.fujitsu.com>
Date: Tue, 16 Jun 2020 15:39:18 +0900
Subject: [PATCH] Fix: guard multiple UL scheduling for same UE.

(cherry picked from commit 57caca9ba87fda3f73aa30d86f4af01a6062224c)
---
 openair2/LAYER2/MAC/eNB_scheduler_fairRR.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c b/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
index ba4d27a159..3ee27ae04b 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
@@ -2393,6 +2393,18 @@ void ulsch_scheduler_pre_ue_select_fairRR(
         break;
       }
 
+      for(i = 0; i<ulsch_ue_select[CC_id].ue_num; i++) {
+        if(ulsch_ue_select[CC_id].list[i].UE_id == first_ue_id[CC_id][temp]) {
+          break;
+        }
+      }
+
+      if(i < ulsch_ue_select[CC_id].ue_num){
+        LOG_E(MAC,"ulsch_scheduler_pre_ue_select_fairRR: UE volte select(last_ulsch_ue_id %d l_last_ulsch_ue_id_volte %d)\n",
+               last_ulsch_ue_id[CC_id],l_last_ulsch_ue_id_volte[CC_id]);
+        continue;
+      }
+
       hi_dci0_pdu   = &HI_DCI0_req->hi_dci0_pdu_list[HI_DCI0_req->number_of_dci+HI_DCI0_req->number_of_hi];
       format_flag = 2;
       rnti = UE_RNTI(module_idP,first_ue_id[CC_id][temp]);