From 3a24b66ecf069efd3dfa30ee778a4c24323ed7c8 Mon Sep 17 00:00:00 2001 From: Guido Casati Date: Thu, 15 Dec 2022 10:28:32 +0100 Subject: [PATCH] Define for RX/TX Max Size of RLC buffers - new definition to replace hardcoded values --- openair2/COMMON/platform_constants.h | 4 ++++ openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/openair2/COMMON/platform_constants.h b/openair2/COMMON/platform_constants.h index f053fe7f1e..47dac57832 100644 --- a/openair2/COMMON/platform_constants.h +++ b/openair2/COMMON/platform_constants.h @@ -119,6 +119,10 @@ #define CH_OFFSET 0x0004 #define CH_SHIFT 2 +// RLC Entity +#define RLC_TX_MAXSIZE 10000000 +#define RLC_RX_MAXSIZE 10000000 + // RLC_AM_SEND_MRW # define SEND_MRW_OFF 15 # define SEND_MRW_ON 240 diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c index 31dbfefd5e..d841260475 100644 --- a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c +++ b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c @@ -758,8 +758,8 @@ static void add_rlc_srb(int rnti, struct NR_SRB_ToAddMod *s, NR_RLC_BearerConfig poll_byte = -1; max_retx_threshold = 8; sn_field_length = 12; - nr_rlc_am = new_nr_rlc_entity_am(10000000, - 10000000, + nr_rlc_am = new_nr_rlc_entity_am(RLC_RX_MAXSIZE, + RLC_TX_MAXSIZE, deliver_sdu, ue, successful_delivery, ue, max_retx_reached, ue, @@ -840,8 +840,8 @@ static void add_drb_am(int rnti, struct NR_DRB_ToAddMod *s, NR_RLC_BearerConfig_ if (ue->drb[drb_id-1] != NULL) { LOG_W(RLC, "%s:%d:%s: DRB %d already exists for UE with RNTI %04x, do nothing\n", __FILE__, __LINE__, __FUNCTION__, drb_id, rnti); } else { - nr_rlc_am = new_nr_rlc_entity_am(10000000, - 10000000, + nr_rlc_am = new_nr_rlc_entity_am(RLC_RX_MAXSIZE, + RLC_TX_MAXSIZE, deliver_sdu, ue, successful_delivery, ue, max_retx_reached, ue, @@ -912,8 +912,8 @@ static void add_drb_um(int rnti, struct NR_DRB_ToAddMod *s, NR_RLC_BearerConfig_ if (ue->drb[drb_id-1] != NULL) { LOG_W(RLC, "DEBUG add_drb_um %s:%d:%s: warning DRB %d already exist for ue %d, do nothing\n", __FILE__, __LINE__, __FUNCTION__, drb_id, rnti); } else { - nr_rlc_um = new_nr_rlc_entity_um(100000000, - 100000000, + nr_rlc_um = new_nr_rlc_entity_um(RLC_RX_MAXSIZE, + RLC_TX_MAXSIZE, deliver_sdu, ue, t_reassembly, sn_field_length);