From d1f54a98dccd9bedc01a12eaaf62e97b0841f2a5 Mon Sep 17 00:00:00 2001
From: LAD <louisadrien.dufrene@orange.com>
Date: Tue, 29 Oct 2019 03:41:56 -0700
Subject: [PATCH] [to test] Check CE from UECap and TDD from RRC config
---
openair2/RRC/LTE/MESSAGES/asn1_msg.c | 2 +-
openair2/RRC/LTE/rrc_eNB.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/openair2/RRC/LTE/MESSAGES/asn1_msg.c b/openair2/RRC/LTE/MESSAGES/asn1_msg.c
index 4d53ffa573..78642b4ab9 100644
--- a/openair2/RRC/LTE/MESSAGES/asn1_msg.c
+++ b/openair2/RRC/LTE/MESSAGES/asn1_msg.c
@@ -643,7 +643,7 @@ LTE_DRX_Config_t *do_DrxConfig(int CC_id,
}
/* CDRX not implemented for TDD */
- if (rrc_inst->carrier[CC_id].sib1->tdd_Config) {
+ if (configuration->frame_type[CC_id] == 1) {
LOG_E(RRC, "[do_DrxConfig] CDRX not implemented for TDD\n");
return NULL;
}
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index 75c5d60efb..983a566733 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -3205,7 +3205,7 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
rnti_t rnti = ue_context_pP->ue_id_rnti;
module_id_t module_id = ctxt_pP->module_id;
- if (NODE_IS_MONOLITHIC(RC.rrc[ctxt_pP->module_id]->node_type)) {
+ if (NODE_IS_MONOLITHIC(rrc_inst->node_type)) {
/* CDRX Configuration */
LOG_D(RRC, "Processing the DRX configuration in RRC Connection Reconfiguration\n");
--
2.26.2