Merge branch 'issue255_256_257_tmp' into ues_test

openair2/LAYER2/MAC/eNB_scheduler.c

@@ -498,6 +498,7 @@ check_ul_failure(module_id_t module_idP, int CC_id, int UE_id,
     // check uplink failure
     if ((UE_list->UE_sched_ctrl[UE_id].ul_failure_timer > 0) &&
 	(UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync == 0)) {
+        if (UE_list->UE_sched_ctrl[UE_id].ul_failure_timer == 1)
 	LOG_I(MAC, "UE %d rnti %x: UL Failure timer %d \n", UE_id, rnti,
 	      UE_list->UE_sched_ctrl[UE_id].ul_failure_timer);
 	if (UE_list->UE_sched_ctrl[UE_id].ra_pdcch_order_sent == 0) {
@@ -539,7 +540,7 @@ check_ul_failure(module_id_t module_idP, int CC_id, int UE_id,
 		  dl_config_pdu->dci_dl_pdu.
 		  dci_dl_pdu_rel8.resource_block_coding);
 	} else {		// ra_pdcch_sent==1
-	    LOG_I(MAC,
+	    LOG_D(MAC,
 		  "UE %d rnti %x: sent PDCCH order for RAPROC waiting (failure timer %d) \n",
 		  UE_id, rnti,
 		  UE_list->UE_sched_ctrl[UE_id].ul_failure_timer);

openair2/RRC/LITE/rrc_eNB.c

@@ -2014,7 +2014,7 @@ rrc_eNB_generate_RRCConnectionRelease(
     // set release timer
   ue_context_pP->ue_context.ue_release_timer_rrc = 1;
   // remove UE after 10 frames after RRCConnectionRelease is triggered
-  ue_context_pP->ue_context.ue_release_timer_thres_rrc = 200;
+  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_release_timer = 0;
   ue_context_pP->ue_context.ue_release_timer_s1 = 0;
@@ -6842,6 +6842,11 @@ rrc_enb_task(
       /* Nothing to do. Apparently everything is done in S1AP processing */
       //LOG_I(RRC, "[eNB %d] Received message %s, not processed because procedure not synched\n",
       //instance, msg_name_p);
+     if (rrc_eNB_get_ue_context(RC.rrc[instance], GTPV1U_ENB_DELETE_TUNNEL_RESP(msg_p).rnti)
+         && rrc_eNB_get_ue_context(RC.rrc[instance], GTPV1U_ENB_DELETE_TUNNEL_RESP(msg_p).rnti)->ue_context.ue_release_timer_rrc > 0) {
+        rrc_eNB_get_ue_context(RC.rrc[instance], GTPV1U_ENB_DELETE_TUNNEL_RESP(msg_p).rnti)->ue_context.ue_release_timer_rrc =
+        rrc_eNB_get_ue_context(RC.rrc[instance], GTPV1U_ENB_DELETE_TUNNEL_RESP(msg_p).rnti)->ue_context.ue_release_timer_thres_rrc;
+      }
       break;
 
 #   endif