From 23c3c5bf0c826eda3501e0a32b8442fdc1d546dd Mon Sep 17 00:00:00 2001 From: Angelo Athanassopoulos Date: Fri, 30 Sep 2022 10:25:37 +0200 Subject: [PATCH] NR RLC & RRC - Changed magic numbers with proper Macro --- openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c | 6 +++--- openair2/RRC/NR/rrc_gNB.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c index 7534b76a77..b809e4caba 100644 --- a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c +++ b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c @@ -254,7 +254,7 @@ mac_rlc_status_resp_t mac_rlc_status_ind( switch (channel_idP) { case 1 ... 3: rb = ue->srb[channel_idP - 1]; break; - case 4 ... 32: rb = ue->drb[channel_idP - 4]; break; + case 4 ... NGAP_MAX_DRBS_PER_UE: rb = ue->drb[channel_idP - 4]; break; default: rb = NULL; break; } @@ -317,7 +317,7 @@ rlc_buffer_occupancy_t mac_rlc_get_buffer_occupancy_ind( switch (channel_idP) { case 1 ... 3: rb = ue->srb[channel_idP - 1]; break; - case 4 ... 32: rb = ue->drb[channel_idP - 4]; break; + case 4 ... NGAP_MAX_DRBS_PER_UE: rb = ue->drb[channel_idP - 4]; break; default: rb = NULL; break; } @@ -410,7 +410,7 @@ int nr_rlc_get_available_tx_space( switch (channel_idP) { case 1 ... 3: rb = ue->srb[channel_idP - 1]; break; - case 4 ... 32: rb = ue->drb[channel_idP - 4]; break; + case 4 ... NGAP_MAX_DRBS_PER_UE: rb = ue->drb[channel_idP - 4]; break; default: rb = NULL; break; } diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c index eefb8caa22..b8cdea75da 100755 --- a/openair2/RRC/NR/rrc_gNB.c +++ b/openair2/RRC/NR/rrc_gNB.c @@ -782,7 +782,7 @@ rrc_gNB_generate_dedicatedRRCReconfiguration( int i; uint8_t drb_id_to_setup_start = 1; uint8_t nb_drb_to_setup = rrc->configuration.drbs; - long drb_priority[32]; + long drb_priority[NGAP_MAX_DRBS_PER_UE]; NR_CellGroupConfig_t *cellGroupConfig = NULL; uint8_t xid = rrc_gNB_get_next_transaction_identifier(ctxt_pP->module_id);