maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SA with COTS UE in monolithic mode after merge

Browse Source
This commit is contained in:
luis_pereira87
2022-06-24 14:51:38 +01:00
parent 0e04fba03d
commit a9faf533b4
4 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
-5
View File
@@ -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;
openair2/RRC/NR/L2_nr_interface.c
-8
View File
@@ -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,
openair2/RRC/NR/nr_rrc_proto.h
-6
View File
@@ -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);
openair2/RRC/NR/rrc_gNB.c
+5 -5
View File
@@ -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);