Merge remote-tracking branch 'origin/fix-context-setup-response' into integration_2023_w30

openair2/RRC/NR/nr_rrc_defs.h

@@ -223,7 +223,6 @@ typedef struct drb_s {
 } drb_t;
 
 typedef enum {
-  RRC_FIRST_RECONF,
   RRC_SETUP,
   RRC_SETUP_FOR_REESTABLISHMENT,
   RRC_REESTABLISH,

openair2/RRC/NR/rrc_gNB.c

@@ -1951,11 +1951,8 @@ static void handle_rrcReconfigurationComplete(const protocol_ctxt_t *const ctxt_
       case RRC_PDUSESSION_MODIFY:
         rrc_gNB_send_NGAP_PDUSESSION_MODIFY_RESP(ctxt_pP, ue_context_p, xid);
         break;
-      case RRC_FIRST_RECONF:
-        rrc_gNB_send_NGAP_INITIAL_CONTEXT_SETUP_RESP(ctxt_pP, ue_context_p);
-        break;
       case RRC_DEFAULT_RECONF:
-        /* nothing to do */
+        rrc_gNB_send_NGAP_INITIAL_CONTEXT_SETUP_RESP(ctxt_pP, ue_context_p);
         break;
       default:
         LOG_E(RRC, "Received unexpected xid: %d\n", xid);