after merge, remain compile errors
This commit is contained in:
@@ -349,12 +349,12 @@ mac_rrc_data_ind(
|
||||
ue_context_p = rrc_eNB_get_ue_context(RC.rrc[ctxt.module_id],rntiP);
|
||||
|
||||
if(ue_context_p) {
|
||||
if (ue_context_p->ue_context.Status != RRC_RECONFIGURED) {
|
||||
LOG_E(RRC,"[eNB %d] Received C-RNTI ,but UE %x status(%d) not RRC_RECONFIGURED\n",module_idP,rntiP,ue_context_p->ue_context.Status);
|
||||
if (ue_context_p->ue_context.StatusRrc != RRC_RECONFIGURED) {
|
||||
LOG_E(RRC,"[eNB %d] Received C-RNTI ,but UE %x status(%d) not RRC_RECONFIGURED\n",module_idP,rntiP,ue_context_p->ue_context.StatusRrc);
|
||||
return (-1);
|
||||
}
|
||||
rrc_eNB_generate_defaultRRCConnectionReconfiguration(&ctxt,ue_context_p,0);
|
||||
ue_context_p->ue_context.Status = RRC_RECONFIGURED;
|
||||
ue_context_p->ue_context.StatusRrc = RRC_RECONFIGURED;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -376,7 +376,7 @@ mac_eNB_get_rrc_status(
|
||||
ue_context_p = rrc_eNB_get_ue_context(RC.rrc[Mod_idP], rntiP);
|
||||
|
||||
if (ue_context_p != NULL) {
|
||||
return(ue_context_p->ue_context.Status);
|
||||
return(ue_context_p->ue_context.StatusRrc);
|
||||
} else {
|
||||
return RRC_INACTIVE;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user