From ab451412de5325b28fd0084849d04828068b020e Mon Sep 17 00:00:00 2001
From: Haruki NAOI <naoi.haruki@jp.fujitsu.com>
Date: Mon, 2 Jul 2018 19:15:06 +0900
Subject: [PATCH] fix: pdcp_update_stats() function stalls when eNB is compiled
with "--mu" options.
---
openair2/ENB_APP/flexran_agent_defs.h | 2 +-
openair2/LAYER2/PDCP_v10.1.0/pdcp.c | 2 +-
openair2/RRC/LTE/rrc_eNB_S1AP.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/openair2/ENB_APP/flexran_agent_defs.h b/openair2/ENB_APP/flexran_agent_defs.h
index aa71dd33fa..57265b38b7 100644
--- a/openair2/ENB_APP/flexran_agent_defs.h
+++ b/openair2/ENB_APP/flexran_agent_defs.h
@@ -102,7 +102,7 @@ typedef enum {
} ran_name_t;
typedef uint8_t xid_t;
-typedef uint8_t mid_t; // module or enb id
+typedef uint16_t mid_t; // module or enb id
typedef uint8_t lcid_t;
typedef int32_t err_code_t;
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
index ccee62df97..bd1ec2880b 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
@@ -866,7 +866,7 @@ pdcp_data_ind(
void pdcp_update_stats(const protocol_ctxt_t* const ctxt_pP){
- uint8_t pdcp_uid = 0;
+ uint16_t pdcp_uid = 0;
uint8_t rb_id = 0;
// these stats are measured for both eNB and UE on per seond basis
diff --git a/openair2/RRC/LTE/rrc_eNB_S1AP.c b/openair2/RRC/LTE/rrc_eNB_S1AP.c
index 59a2c35294..ebac3c4ee9 100644
--- a/openair2/RRC/LTE/rrc_eNB_S1AP.c
+++ b/openair2/RRC/LTE/rrc_eNB_S1AP.c
@@ -1994,7 +1994,7 @@ int rrc_eNB_process_PAGING_IND(MessageDef *msg_p, const char *msg_name, instance
/* insert data to UE_PF_PO or update data in UE_PF_PO */
pthread_mutex_lock(&ue_pf_po_mutex);
- uint8_t i = 0;
+ uint16_t i = 0;
for (i = 0; i < MAX_MOBILES_PER_ENB; i++) {
if ((UE_PF_PO[CC_id][i].enable_flag == TRUE && UE_PF_PO[CC_id][i].ue_index_value == (uint16_t)(S1AP_PAGING_IND(msg_p).ue_index_value))
|| (UE_PF_PO[CC_id][i].enable_flag != TRUE)) {
--
2.26.2