Fix X2HO procedure with multi UE.

(cherry picked from commit 8c19fc121f62e929c8a2edfff313d81cca870a61)

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -475,7 +475,6 @@ rx_sdu(const module_id_t enb_mod_idP,
                   old_UE_id);
 
             UE_id = old_UE_id;
-            current_rnti = old_rnti;
             /* Clear timer */
             UE_scheduling_control = &(UE_list->UE_sched_ctrl[UE_id]);
             UE_template_ptr = &(UE_list->UE_template[CC_idP][UE_id]);
@@ -499,6 +498,7 @@ rx_sdu(const module_id_t enb_mod_idP,
                            CC_idP,
                            frameP,
                            current_rnti);
+            current_rnti = old_rnti;
           } else {
             /* TODO: if the UE did random access (followed by a MAC uplink with
              * CRNTI) because none of its scheduling request was granted, then

openair2/RRC/LTE/rrc_eNB.c

@@ -9856,7 +9856,11 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
           /* in the target eNB */
           }else{
 
-            if(ue_context_p->ue_context.handover_info->state == HO_FORWARDING){
+            if((ue_context_p->ue_context.handover_info->state == HO_COMPLETE)
+              || (ue_context_p->ue_context.handover_info->state == HO_FORWARDING)
+              || (ue_context_p->ue_context.handover_info->state == HO_CONFIGURED)
+              || (ue_context_p->ue_context.handover_info->state == HO_END_MARKER)
+              || (ue_context_p->ue_context.handover_info->state == HO_FORWARDING_COMPLETE)){
                 ue_context_p->ue_context.handover_info->state = HO_RELEASE;
             }else{
                 free(ue_context_p->ue_context.handover_info);