resolving conflicts

2019-03-02 23:28:49 +01:00
parent 40cb79e44f
commit 22e13cb64c
2 changed files with 0 additions and 3 deletions
@@ -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)
@@ -6533,7 +6533,6 @@ void rrc_eNB_generate_RRCConnectionSetup(const protocol_ctxt_t *const ctxt_pP,
          break;
        }
      }
-    }
    
    MSC_LOG_TX_MESSAGE(
      MSC_RRC_ENB,