Remove the MAC and RRC context after UL failure when gNB is not connected to CN5G

2021-07-22 14:05:10 +01:00
parent 67bccd8c80
commit 1beffd1ecc
1 changed files with 5 additions and 1 deletions
@@ -3070,7 +3070,10 @@ void nr_rrc_subframe_process(protocol_ctxt_t *const ctxt_pP, const int CC_id) {
                   ue_context_p,
                   NGAP_CAUSE_RADIO_NETWORK,
                   30);
-        }else{
+        }
+
+        // Remove here the MAC and RRC context when RRC is not connected or gNB is not connected to CN5G
+        if(ue_context_p->ue_context.StatusRrc < NR_RRC_CONNECTED || ue_context_p->ue_context.gNB_ue_ngap_id == 0) {
          mac_remove_nr_ue(ctxt_pP->module_id, ctxt_pP->rnti);
          rrc_rlc_remove_ue(ctxt_pP);
          pdcp_remove_UE(ctxt_pP);
@@ -3082,6 +3085,7 @@ void nr_rrc_subframe_process(protocol_ctxt_t *const ctxt_pP, const int CC_id) {
            LOG_I(NR_RRC, "remove UE %x \n", ctxt_pP->rnti);
          }
        }
+
        break; // break RB_FOREACH
      }
    }