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

NR RRC - Moved next_available_drb function outside generateDRB

Browse Source
This commit is contained in:
Angelo Athanassopoulos
2022-09-28 11:16:58 +02:00
parent 240d45b731
commit 0fd71f0973
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/NR/rrc_gNB.c
+2
View File
@@ -826,7 +826,9 @@ rrc_gNB_generate_dedicatedRRCReconfiguration(
for(long drb_id_add = 1; drb_id_add <= nb_drb_to_setup; drb_id_add++){ for(long drb_id_add = 1; drb_id_add <= nb_drb_to_setup; drb_id_add++){
if(drb_id_add > MAX_DRBS_PER_PDUSESSION) if(drb_id_add > MAX_DRBS_PER_PDUSESSION)
break; break;
uint8_t drb_id = next_available_drb(ue_p, ue_context_pP->ue_context.pduSession[i].param.pdusession_id);
NR_DRB_ToAddMod_t *DRB_config = generateDRB(ue_p, NR_DRB_ToAddMod_t *DRB_config = generateDRB(ue_p,
drb_id,
&ue_context_pP->ue_context.pduSession[i], &ue_context_pP->ue_context.pduSession[i],
rrc->configuration.enable_sdap, rrc->configuration.enable_sdap,
rrc->security.do_drb_integrity, rrc->security.do_drb_integrity,
openair2/RRC/NR/rrc_gNB_drbs.c
+1 -1
View File
@@ -22,11 +22,11 @@
#include "rrc_gNB_drbs.h" #include "rrc_gNB_drbs.h"
NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue,
uint8_t drb_id,
const pdu_session_param_t *pduSession, const pdu_session_param_t *pduSession,
bool enable_sdap, bool enable_sdap,
int do_drb_integrity, int do_drb_integrity,
int do_drb_ciphering) { int do_drb_ciphering) {
uint8_t drb_id = next_available_drb(ue, pduSession->param.pdusession_id);
NR_DRB_ToAddMod_t *DRB_config = NULL; NR_DRB_ToAddMod_t *DRB_config = NULL;
NR_SDAP_Config_t *SDAP_config = NULL; NR_SDAP_Config_t *SDAP_config = NULL;
openair2/RRC/NR/rrc_gNB_drbs.h
+1
View File
@@ -32,6 +32,7 @@
#define DRB_INACTIVE (0) #define DRB_INACTIVE (0)
NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *rrc_ue, NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *rrc_ue,
uint8_t drb_id,
const pdu_session_param_t *pduSession, const pdu_session_param_t *pduSession,
bool enable_sdap, bool enable_sdap,
int do_drb_integrity, int do_drb_integrity,