maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some problems.

Browse Source
This commit is contained in:
Masayuki Harada
2022-02-01 19:06:51 +09:00
parent 9cd14735de
commit d937e6e2c0
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/NR/rrc_gNB.c
+1 -3
View File
@@ -1081,7 +1081,7 @@ rrc_gNB_generate_dedicatedRRCReconfiguration(
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
int void
rrc_gNB_modify_dedicatedRRCReconfiguration( rrc_gNB_modify_dedicatedRRCReconfiguration(
const protocol_ctxt_t *const ctxt_pP, const protocol_ctxt_t *const ctxt_pP,
rrc_gNB_ue_context_t *ue_context_pP) rrc_gNB_ue_context_t *ue_context_pP)
@@ -1258,8 +1258,6 @@ rrc_gNB_modify_dedicatedRRCReconfiguration(
buffer, buffer,
PDCP_TRANSMISSION_MODE_CONTROL); PDCP_TRANSMISSION_MODE_CONTROL);
#endif #endif
return 0;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
openair2/RRC/NR/rrc_gNB_NGAP.c
+3 -5
View File
@@ -1156,7 +1156,7 @@ rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(
continue; continue;
} }
//Check same PDU session ID to handle multiple pdu session id //Check if same PDU session ID to handle multiple pdu sessions
for (j = i+1; j < nb_pdusessions_tomodify; j++) { for (j = i+1; j < nb_pdusessions_tomodify; j++) {
if (is_treated[j] == FALSE && if (is_treated[j] == FALSE &&
NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[j].pdusession_id == NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[j].pdusession_id ==
@@ -1240,9 +1240,7 @@ rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(
if (ue_context_p->ue_context.nb_of_failed_pdusessions < ue_context_p->ue_context.nb_of_modify_pdusessions) { if (ue_context_p->ue_context.nb_of_failed_pdusessions < ue_context_p->ue_context.nb_of_modify_pdusessions) {
LOG_D(NR_RRC, "generate RRCReconfiguration \n"); LOG_D(NR_RRC, "generate RRCReconfiguration \n");
if (0 == rrc_gNB_modify_dedicatedRRCReconfiguration(&ctxt, ue_context_p)) { rrc_gNB_modify_dedicatedRRCReconfiguration(&ctxt, ue_context_p);
return (0);
}
} else { // all pdu modification failed } else { // all pdu modification failed
LOG_I(NR_RRC, "pdu session modify failed, fill NGAP_PDUSESSION_MODIFY_RESP with the pdu session information that failed to modify \n"); LOG_I(NR_RRC, "pdu session modify failed, fill NGAP_PDUSESSION_MODIFY_RESP with the pdu session information that failed to modify \n");
uint8_t nb_of_pdu_sessions_failed = 0; uint8_t nb_of_pdu_sessions_failed = 0;
@@ -1354,7 +1352,7 @@ rrc_gNB_send_NGAP_PDUSESSION_MODIFY_RESP(
pdu_sessions_failed++; pdu_sessions_failed++;
} }
} else { } else {
LOG_D(NR_RRC,"xid does not corresponds (context pdu session index %d, status %d, xid %d/%d) \n ", LOG_D(NR_RRC,"xid does not correspond (context pdu session index %d, status %d, xid %d/%d) \n ",
i, ue_context_pP->ue_context.modify_pdusession[i].status, xid, ue_context_pP->ue_context.modify_pdusession[i].xid); i, ue_context_pP->ue_context.modify_pdusession[i].status, xid, ue_context_pP->ue_context.modify_pdusession[i].xid);
} }
} }
openair2/RRC/NR/rrc_gNB_NGAP.h
+1 -1
View File
@@ -122,7 +122,7 @@ rrc_gNB_send_NGAP_PDUSESSION_MODIFY_RESP(
uint8_t xid uint8_t xid
); );
int void
rrc_gNB_modify_dedicatedRRCReconfiguration( rrc_gNB_modify_dedicatedRRCReconfiguration(
const protocol_ctxt_t *const ctxt_pP, const protocol_ctxt_t *const ctxt_pP,
rrc_gNB_ue_context_t *ue_context_pP rrc_gNB_ue_context_t *ue_context_pP