From 22e13cb64cb59b4eb88907d8b6b62f86434f326a Mon Sep 17 00:00:00 2001 From: nepes Date: Sat, 2 Mar 2019 23:28:49 +0100 Subject: [PATCH] resolving conflicts --- openair2/COMMON/platform_types.h | 2 -- openair2/RRC/LTE/rrc_eNB.c | 1 - 2 files changed, 3 deletions(-) diff --git a/openair2/COMMON/platform_types.h b/openair2/COMMON/platform_types.h index 6bee42f51b..ef9f591958 100644 --- a/openair2/COMMON/platform_types.h +++ b/openair2/COMMON/platform_types.h @@ -236,9 +236,7 @@ typedef struct protocol_ctxt_s { sub_frame_t subframe; /*!< \brief LTE sub frame number.*/ eNB_index_t eNB_index; /*!< \brief valid for UE indicating the index of connected eNB(s) */ boolean_t configured; /*!< \brief flag indicating whether the instance is configured or not */ -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) boolean_t brOption; -#endif } protocol_ctxt_t; // warning time hardcoded #define PROTOCOL_CTXT_TIME_MILLI_SECONDS(CtXt_h) ((CtXt_h)->frame*10+(CtXt_h)->subframe) diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c index f4a0aae4c7..b93bcba0b9 100644 --- a/openair2/RRC/LTE/rrc_eNB.c +++ b/openair2/RRC/LTE/rrc_eNB.c @@ -6533,7 +6533,6 @@ void rrc_eNB_generate_RRCConnectionSetup(const protocol_ctxt_t *const ctxt_pP, break; } } - } MSC_LOG_TX_MESSAGE( MSC_RRC_ENB,