Skip to content

O
OpenXG-RAN
Commit 14e8672a authored by masayuki.harada's avatar masayuki.harada Committed by Haruki NAOI
Browse files
Options

Fix X2HO procedure with multi UE. 

(cherry picked from commit 8c19fc121f62e929c8a2edfff313d81cca870a61)
parent b582161f
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @ 14e8672a
...@@ -475,7 +475,6 @@ rx_sdu(const module_id_t enb_mod_idP, ...@@ -475,7 +475,6 @@ rx_sdu(const module_id_t enb_mod_idP,
old_UE_id); old_UE_id);
UE_id = old_UE_id; UE_id = old_UE_id;
current_rnti = old_rnti;
/* Clear timer */ /* Clear timer */
UE_scheduling_control = &(UE_list->UE_sched_ctrl[UE_id]); UE_scheduling_control = &(UE_list->UE_sched_ctrl[UE_id]);
UE_template_ptr = &(UE_list->UE_template[CC_idP][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, ...@@ -499,6 +498,7 @@ rx_sdu(const module_id_t enb_mod_idP,
CC_idP, CC_idP,
frameP, frameP,
current_rnti); current_rnti);
current_rnti = old_rnti;
} else { } else {
/* TODO: if the UE did random access (followed by a MAC uplink with /* TODO: if the UE did random access (followed by a MAC uplink with
* CRNTI) because none of its scheduling request was granted, then * CRNTI) because none of its scheduling request was granted, then
......
openair2/RRC/LTE/rrc_eNB.c
View file @ 14e8672a
...@@ -9856,7 +9856,11 @@ void *rrc_enb_process_itti_msg(void *notUsed) { ...@@ -9856,7 +9856,11 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
/* in the target eNB */ /* in the target eNB */
}else{ }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; ue_context_p->ue_context.handover_info->state = HO_RELEASE;
}else{ }else{
free(ue_context_p->ue_context.handover_info); free(ue_context_p->ue_context.handover_info);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment