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

NR PDCP - Removed DRB ID limitations

Browse Source
This commit is contained in:
Angelo Athanassopoulos
2022-09-28 11:16:58 +02:00
parent 91143db61e
commit 6b465c71d0
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
+1
View File
@@ -25,6 +25,7 @@
#include <stdint.h> #include <stdint.h>
#include "nr_pdcp_sdu.h" #include "nr_pdcp_sdu.h"
#include "openair2/RRC/NR/rrc_gNB_drbs.h"
typedef enum { typedef enum {
NR_PDCP_DRB_AM, NR_PDCP_DRB_AM,
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+4 -4
View File
@@ -265,7 +265,7 @@ static void do_pdcp_data_ind(
else else
rb = ue->srb[rb_id - 1]; rb = ue->srb[rb_id - 1];
} else { } else {
if (rb_id < 1 || rb_id > 5) if (rb_id < 1 || rb_id > MAX_DRBS_PER_UE)
rb = NULL; rb = NULL;
else else
rb = ue->drb[rb_id - 1]; rb = ue->drb[rb_id - 1];
@@ -631,7 +631,7 @@ static void deliver_sdu_drb(void *_ue, nr_pdcp_entity_t *entity,
size); size);
} }
else{ else{
for (i = 0; i < 5; i++) { for (i = 0; i < MAX_DRBS_PER_UE; i++) {
if (entity == ue->drb[i]) { if (entity == ue->drb[i]) {
rb_id = i+1; rb_id = i+1;
goto rb_found; goto rb_found;
@@ -666,7 +666,7 @@ static void deliver_pdu_drb(void *_ue, nr_pdcp_entity_t *entity,
int i; int i;
mem_block_t *memblock; mem_block_t *memblock;
for (i = 0; i < 5; i++) { for (i = 0; i < MAX_DRBS_PER_UE; i++) {
if (entity == ue->drb[i]) { if (entity == ue->drb[i]) {
rb_id = i+1; rb_id = i+1;
goto rb_found; goto rb_found;
@@ -1347,7 +1347,7 @@ static bool pdcp_data_req_drb(protocol_ctxt_t *ctxt_pP,
ue = nr_pdcp_manager_get_ue(nr_pdcp_ue_manager, rnti); ue = nr_pdcp_manager_get_ue(nr_pdcp_ue_manager, rnti);
if (rb_id < 1 || rb_id > 5) if (rb_id < 1 || rb_id > MAX_DRBS_PER_UE)
rb = NULL; rb = NULL;
else else
rb = ue->drb[rb_id - 1]; rb = ue->drb[rb_id - 1];
openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.h
+1 -1
View File
@@ -29,7 +29,7 @@ typedef void nr_pdcp_ue_manager_t;
typedef struct nr_pdcp_ue_t { typedef struct nr_pdcp_ue_t {
int rnti; int rnti;
nr_pdcp_entity_t *srb[3]; nr_pdcp_entity_t *srb[3];
nr_pdcp_entity_t *drb[5]; nr_pdcp_entity_t *drb[MAX_DRBS_PER_UE];
} nr_pdcp_ue_t; } nr_pdcp_ue_t;
/***********************************************************************/ /***********************************************************************/