From 68fe0ad4f23eb7d5e262d6966c74c21b2ab0aaa6 Mon Sep 17 00:00:00 2001 From: Angelo Athanassopoulos Date: Thu, 18 Aug 2022 23:14:16 +0200 Subject: [PATCH] NR RRC - Pass gNB_RRC_UE_t struct to next_available_drb function --- openair2/RRC/NR/rrc_gNB_drbs.c | 4 ++-- openair2/RRC/NR/rrc_gNB_drbs.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openair2/RRC/NR/rrc_gNB_drbs.c b/openair2/RRC/NR/rrc_gNB_drbs.c index b686f5e280..8d4c24df42 100644 --- a/openair2/RRC/NR/rrc_gNB_drbs.c +++ b/openair2/RRC/NR/rrc_gNB_drbs.c @@ -33,7 +33,7 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, bool enable_sdap, int do_drb_integrity, int do_drb_ciphering) { - uint8_t drb_id = next_available_drb(rnti, pduSession->param.pdusession_id); + uint8_t drb_id = next_available_drb(ue, rnti, pduSession->param.pdusession_id); NR_DRB_ToAddMod_t *DRB_config = NULL; NR_SDAP_Config_t *SDAP_config = NULL; @@ -108,7 +108,7 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, return DRB_config; } -uint8_t next_available_drb(rnti_t rnti, uint8_t pdusession_id) { +uint8_t next_available_drb(gNB_RRC_UE_t *rrc_ue, rnti_t rnti, uint8_t pdusession_id) { nr_ue_t *ue; if(nr_ue_get(rnti)) ue = nr_ue_get(rnti); diff --git a/openair2/RRC/NR/rrc_gNB_drbs.h b/openair2/RRC/NR/rrc_gNB_drbs.h index 8974a5ab2f..750f9fcb44 100644 --- a/openair2/RRC/NR/rrc_gNB_drbs.h +++ b/openair2/RRC/NR/rrc_gNB_drbs.h @@ -43,7 +43,7 @@ typedef struct nr_ue_s { struct nr_ue_s *next_ue; } nr_ue_t; -NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, +NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *rrc_ue, rnti_t rnti, const pdu_session_param_t *pduSession, bool enable_sdap, @@ -52,6 +52,6 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, nr_ue_t *nr_ue_get(rnti_t rnti); nr_ue_t *nr_ue_new(rnti_t rnti); -uint8_t next_available_drb(rnti_t rnti, uint8_t pdusession_id); +uint8_t next_available_drb(gNB_RRC_UE_t *ue, rnti_t rnti, uint8_t pdusession_id); #endif \ No newline at end of file