From 07ee33f024f73bb4e995271b0a82232047984af8 Mon Sep 17 00:00:00 2001 From: Cedric Roux Date: Sun, 19 Nov 2023 16:43:57 +0100 Subject: [PATCH] nr pdcp: minor: fix spacing --- openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c b/openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c index 9dda9b9ace..3341bdae7b 100644 --- a/openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c +++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c @@ -88,7 +88,6 @@ static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity, entity->stats.rxpdu_dd_pkts++; entity->stats.rxpdu_dd_bytes += size; - return; } @@ -120,7 +119,6 @@ static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity, entity->stats.rxpdu_dd_pkts++; entity->stats.rxpdu_dd_bytes += size; - } } @@ -130,7 +128,6 @@ static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity, entity->stats.rxpdu_dd_pkts++; entity->stats.rxpdu_dd_bytes += size; - return; } @@ -158,7 +155,6 @@ static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity, entity->stats.txsdu_pkts++; entity->stats.txsdu_bytes += cur->size; - nr_pdcp_free_sdu(cur); count++; } @@ -224,7 +220,7 @@ static int nr_pdcp_entity_process_sdu(nr_pdcp_entity_t *entity, memcpy(buf + header_size, buffer, size); - if (entity->has_integrity){ + if (entity->has_integrity) { uint8_t integrity[4] = {0}; entity->integrity(entity->integrity_context, integrity, @@ -232,13 +228,12 @@ static int nr_pdcp_entity_process_sdu(nr_pdcp_entity_t *entity, entity->rb_id, count, entity->is_gnb ? 1 : 0); memcpy((unsigned char *)buf + header_size + size, integrity, 4); + } else if (integrity_size == 4) { + // set MAC-I to 0 for SRBs with integrity not active + memset(buf + header_size + size, 0, 4); } - // set MAC-I to 0 for SRBs with integrity not active - else if (integrity_size == 4) - memset(buf + header_size + size, 0, 4); - - if (entity->has_ciphering && (entity->is_gnb || entity->security_mode_completed)){ + if (entity->has_ciphering && (entity->is_gnb || entity->security_mode_completed)) { entity->cipher(entity->security_context, (unsigned char *)buf + header_size, size + integrity_size, entity->rb_id, count, entity->is_gnb ? 1 : 0);