From a9faf533b4c0d264e3ed22c24a010bce857e2d0d Mon Sep 17 00:00:00 2001
From: luis_pereira87 <lpereira@allbesmart.pt>
Date: Fri, 24 Jun 2022 14:29:35 +0100
Subject: [PATCH] Fix SA with COTS UE in monolithic mode after merge

---
 openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c |  5 -----
 openair2/RRC/NR/L2_nr_interface.c             |  8 --------
 openair2/RRC/NR/nr_rrc_proto.h                |  6 ------
 openair2/RRC/NR/rrc_gNB.c                     | 10 +++++-----
 4 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
index b87edc9926..6daa68afed 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -1530,11 +1530,6 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
 
   if (ra->Msg4_frame == frameP && ra->Msg4_slot == slotP ) {
 
-    if (nr_mac_rrc_check_RRCSetup(module_idP, ra->rnti) <= 0){
-      ra->Msg4_frame++;
-      return;
-    }
-
     uint8_t time_domain_assignment = 0;
     uint8_t mcsIndex = 0;
 
diff --git a/openair2/RRC/NR/L2_nr_interface.c b/openair2/RRC/NR/L2_nr_interface.c
index 7d315bf766..161d1cd847 100644
--- a/openair2/RRC/NR/L2_nr_interface.c
+++ b/openair2/RRC/NR/L2_nr_interface.c
@@ -306,14 +306,6 @@ int8_t nr_mac_rrc_bwp_switch_req(const module_id_t     module_idP,
   return 0;
 }
 
-int8_t nr_mac_rrc_check_RRCSetup(const module_id_t Mod_idP,
-                               const rnti_t      rnti) {
-  struct rrc_gNB_ue_context_s *ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[Mod_idP], rnti);
-  char payload_size = ue_context_p->ue_context.Srb0.Tx_buffer.payload_size;
-  return payload_size;
-
-}
-
 int8_t nr_mac_rrc_data_ind(const module_id_t     module_idP,
                            const int             CC_id,
                            const frame_t         frameP,
diff --git a/openair2/RRC/NR/nr_rrc_proto.h b/openair2/RRC/NR/nr_rrc_proto.h
index 40de8b8049..d569b91aa8 100644
--- a/openair2/RRC/NR/nr_rrc_proto.h
+++ b/openair2/RRC/NR/nr_rrc_proto.h
@@ -163,12 +163,6 @@ nr_rrc_data_req(
   const pdcp_transmission_mode_t modeP
 );
 
-int8_t nr_mac_rrc_check_RRCSetup(
-  const module_id_t Mod_idP,
-  const rnti_t      rnti
-
-);
-
 int
 nr_rrc_mac_remove_ue(module_id_t mod_idP,
                   rnti_t rntiP);
diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 20b79362a0..3d95081336 100755
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -600,8 +600,7 @@ rrc_gNB_process_RRCSetupComplete(
 void 
 rrc_gNB_generate_defaultRRCReconfiguration(
   const protocol_ctxt_t     *const ctxt_pP,
-  rrc_gNB_ue_context_t      *ue_context_pP,
-  NR_CellGroupConfig_t      *cellGroupConfig
+  rrc_gNB_ue_context_t      *ue_context_pP
 )
 //-----------------------------------------------------------------------------
 {
@@ -716,6 +715,7 @@ rrc_gNB_generate_defaultRRCReconfiguration(
   }
 
   gNB_RRC_INST *rrc = RC.nrrrc[ctxt_pP->module_id];
+  gNB_RRC_UE_t *ue_p = &ue_context_pP->ue_context;
   memset(buffer, 0, sizeof(buffer));
   size = do_RRCReconfiguration(ctxt_pP, buffer, sizeof(buffer),
                                 xid,
@@ -730,7 +730,7 @@ rrc_gNB_generate_defaultRRCReconfiguration(
                                 &rrc->carrier,
                                 &rrc->configuration,
                                 NULL,
-                                cellGroupConfig);
+                                ue_p->masterCellGroup);
 
   free(ue_context_pP->ue_context.nas_pdu.buffer);
 
@@ -2778,7 +2778,7 @@ rrc_gNB_decode_dcch(
         if (ue_context_p->ue_context.established_pdu_sessions_flag == 1) {
           rrc_gNB_generate_dedicatedRRCReconfiguration(ctxt_pP, ue_context_p, NULL);
         } else {
-          rrc_gNB_generate_defaultRRCReconfiguration(ctxt_pP, ue_context_p, NULL);
+          rrc_gNB_generate_defaultRRCReconfiguration(ctxt_pP, ue_context_p);
         }
       }
       else{
@@ -3711,7 +3711,7 @@ static void rrc_CU_process_ue_context_setup_response(MessageDef *msg_p, const ch
   if (ue_context_p->ue_context.established_pdu_sessions_flag == 1) {
     rrc_gNB_generate_dedicatedRRCReconfiguration(&ctxt, ue_context_p, cellGroupConfig);
   } else {
-    rrc_gNB_generate_defaultRRCReconfiguration(&ctxt, ue_context_p, NULL);
+    rrc_gNB_generate_defaultRRCReconfiguration(&ctxt, ue_context_p);
   }
 
   free(cellGroupConfig->rlc_BearerToAddModList);