Skip to content

O
OpenXG-RAN
Commit ac1496c2 authored by Raymond Knopp's avatar Raymond Knopp
Browse files
Options

conditions for rlc_config_asn in CU

parent c43281a7
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 11 deletions
openair2/RRC/LTE/rrc_eNB.c
View file @ ac1496c2
...@@ -630,9 +630,8 @@ static void init_MBMS( ...@@ -630,9 +630,8 @@ static void init_MBMS(
#endif #endif
,NULL); ,NULL);
if ( (RC.rrc[enb_mod_idP]->node_type != ngran_eNB_CU) || if ((RC.rrc[enb_mod_idP]->node_type != ngran_eNB_CU) &&
(RC.rrc[enb_mod_idP]->node_type != ngran_ng_eNB_CU) || (RC.rrc[enb_mod_idP]->node_type != ngran_ng_eNB_CU)) {
(RC.rrc[enb_mod_idP]->node_type != ngran_gNB_CU) ) {
rrc_rlc_config_asn1_req(&ctxt, rrc_rlc_config_asn1_req(&ctxt,
NULL, // SRB_ToAddModList NULL, // SRB_ToAddModList
NULL, // DRB_ToAddModList NULL, // DRB_ToAddModList
...@@ -5307,8 +5306,8 @@ rrc_eNB_generate_RRCConnectionReconfiguration_handover( ...@@ -5307,8 +5306,8 @@ rrc_eNB_generate_RRCConnectionReconfiguration_handover(
, (PMCH_InfoList_r9_t *) NULL , (PMCH_InfoList_r9_t *) NULL
#endif #endif
,NULL); ,NULL);
if ( (RC.rrc[ctxt_pP->module_id]->node_type != ngran_eNB_CU) || if ( (RC.rrc[ctxt_pP->module_id]->node_type != ngran_eNB_CU) &&
(RC.rrc[ctxt_pP->module_id]->node_type != ngran_ng_eNB_CU) || (RC.rrc[ctxt_pP->module_id]->node_type != ngran_ng_eNB_CU)&&
(RC.rrc[ctxt_pP->module_id]->node_type != ngran_gNB_CU) ) { (RC.rrc[ctxt_pP->module_id]->node_type != ngran_gNB_CU) ) {
rrc_rlc_config_asn1_req(&ctxt, rrc_rlc_config_asn1_req(&ctxt,
ue_context_pP->ue_context.SRB_configList, ue_context_pP->ue_context.SRB_configList,
...@@ -5538,8 +5537,8 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete( ...@@ -5538,8 +5537,8 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
, (PMCH_InfoList_r9_t *) NULL , (PMCH_InfoList_r9_t *) NULL
#endif #endif
,NULL); ,NULL);
if ( (RC.rrc[ctxt_pP->module_id]->node_type != ngran_eNB_CU) || if ( (RC.rrc[ctxt_pP->module_id]->node_type != ngran_eNB_CU) &&
(RC.rrc[ctxt_pP->module_id]->node_type != ngran_ng_eNB_CU) || (RC.rrc[ctxt_pP->module_id]->node_type != ngran_ng_eNB_CU)&&
(RC.rrc[ctxt_pP->module_id]->node_type != ngran_gNB_CU) ) { (RC.rrc[ctxt_pP->module_id]->node_type != ngran_gNB_CU) ) {
// Refresh SRBs/DRBs // Refresh SRBs/DRBs
rrc_rlc_config_asn1_req( rrc_rlc_config_asn1_req(
...@@ -6375,8 +6374,8 @@ rrc_eNB_decode_ccch( ...@@ -6375,8 +6374,8 @@ rrc_eNB_decode_ccch(
#endif #endif
,NULL); ,NULL);
if ( (RC.rrc[ctxt_pP->module_id]->node_type != ngran_eNB_CU) || if ( (RC.rrc[ctxt_pP->module_id]->node_type != ngran_eNB_CU) &&
(RC.rrc[ctxt_pP->module_id]->node_type != ngran_ng_eNB_CU) || (RC.rrc[ctxt_pP->module_id]->node_type != ngran_ng_eNB_CU)&&
(RC.rrc[ctxt_pP->module_id]->node_type != ngran_gNB_CU) ) { (RC.rrc[ctxt_pP->module_id]->node_type != ngran_gNB_CU) ) {
rrc_rlc_config_asn1_req(ctxt_pP, rrc_rlc_config_asn1_req(ctxt_pP,
ue_context_p->ue_context.SRB_configList, ue_context_p->ue_context.SRB_configList,
...@@ -6619,8 +6618,8 @@ rrc_eNB_decode_ccch( ...@@ -6619,8 +6618,8 @@ rrc_eNB_decode_ccch(
#endif #endif
,NULL); ,NULL);
if ( (RC.rrc[ctxt_pP->module_id]->node_type != ngran_eNB_CU) || if ( (RC.rrc[ctxt_pP->module_id]->node_type != ngran_eNB_CU) &&
(RC.rrc[ctxt_pP->module_id]->node_type != ngran_ng_eNB_CU) || (RC.rrc[ctxt_pP->module_id]->node_type != ngran_ng_eNB_CU) &&
(RC.rrc[ctxt_pP->module_id]->node_type != ngran_gNB_CU) ) { (RC.rrc[ctxt_pP->module_id]->node_type != ngran_gNB_CU) ) {
rrc_rlc_config_asn1_req(ctxt_pP, rrc_rlc_config_asn1_req(ctxt_pP,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment