Merge branch 'sp3_master' into rm894_assertion
This commit is contained in:
@@ -333,6 +333,7 @@ rrc_rx_tx(
|
|||||||
|
|
||||||
// check for UL failure
|
// check for UL failure
|
||||||
RB_FOREACH(ue_context_p, rrc_ue_tree_s, &(RC.rrc[ctxt_pP->module_id]->rrc_ue_head)) {
|
RB_FOREACH(ue_context_p, rrc_ue_tree_s, &(RC.rrc[ctxt_pP->module_id]->rrc_ue_head)) {
|
||||||
|
ctxt_pP->rnti = ue_context_p->ue_id_rnti;
|
||||||
if ((ctxt_pP->frame == 0) && (ctxt_pP->subframe==0)) {
|
if ((ctxt_pP->frame == 0) && (ctxt_pP->subframe==0)) {
|
||||||
if (ue_context_p->ue_context.Initialue_identity_s_TMSI.presence == TRUE) {
|
if (ue_context_p->ue_context.Initialue_identity_s_TMSI.presence == TRUE) {
|
||||||
LOG_I(RRC,"UE rnti %x:S-TMSI %x failure timer %d/8\n",
|
LOG_I(RRC,"UE rnti %x:S-TMSI %x failure timer %d/8\n",
|
||||||
|
|||||||
@@ -2066,7 +2066,7 @@ rrc_eNB_generate_RRCConnectionRelease(
|
|||||||
// ue_context_pP->ue_context.ue_release_timer_thres_rrc = 100;
|
// ue_context_pP->ue_context.ue_release_timer_thres_rrc = 100;
|
||||||
ue_context_pP->ue_context.ue_reestablishment_timer = 0;
|
ue_context_pP->ue_context.ue_reestablishment_timer = 0;
|
||||||
ue_context_pP->ue_context.ue_release_timer = 0;
|
ue_context_pP->ue_context.ue_release_timer = 0;
|
||||||
ue_context_pP->ue_context.ue_release_timer_s1 = 0;
|
//ue_context_pP->ue_context.ue_release_timer_s1 = 0;
|
||||||
LOG_I(RRC,
|
LOG_I(RRC,
|
||||||
PROTOCOL_RRC_CTXT_UE_FMT" Logical Channel DL-DCCH, Generate RRCConnectionRelease (bytes %d)\n",
|
PROTOCOL_RRC_CTXT_UE_FMT" Logical Channel DL-DCCH, Generate RRCConnectionRelease (bytes %d)\n",
|
||||||
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
|
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
|
||||||
|
|||||||
Reference in New Issue
Block a user