From d937e6e2c09c49e25764e1aeb81d5bcf2fd2a89e Mon Sep 17 00:00:00 2001
From: Masayuki Harada <masayuki.harada@jp.fujitsu.com>
Date: Tue, 1 Feb 2022 19:06:51 +0900
Subject: [PATCH] Fix some problems.

---
 openair2/RRC/NR/rrc_gNB.c      | 4 +---
 openair2/RRC/NR/rrc_gNB_NGAP.c | 8 +++-----
 openair2/RRC/NR/rrc_gNB_NGAP.h | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 84b8193ba8..1520bda2ec 100755
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -1081,7 +1081,7 @@ rrc_gNB_generate_dedicatedRRCReconfiguration(
 }
 
 //-----------------------------------------------------------------------------
-int
+void
 rrc_gNB_modify_dedicatedRRCReconfiguration(
   const protocol_ctxt_t     *const ctxt_pP,
   rrc_gNB_ue_context_t      *ue_context_pP)
@@ -1258,8 +1258,6 @@ rrc_gNB_modify_dedicatedRRCReconfiguration(
     buffer,
     PDCP_TRANSMISSION_MODE_CONTROL);
 #endif
-
-  return 0;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/openair2/RRC/NR/rrc_gNB_NGAP.c b/openair2/RRC/NR/rrc_gNB_NGAP.c
index 47e994f645..00ee9de3a0 100644
--- a/openair2/RRC/NR/rrc_gNB_NGAP.c
+++ b/openair2/RRC/NR/rrc_gNB_NGAP.c
@@ -1156,7 +1156,7 @@ rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(
           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++) {
           if (is_treated[j] == FALSE &&
               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) {
       LOG_D(NR_RRC, "generate RRCReconfiguration \n");
-      if (0 == rrc_gNB_modify_dedicatedRRCReconfiguration(&ctxt, ue_context_p)) {
-        return (0);
-      }
+      rrc_gNB_modify_dedicatedRRCReconfiguration(&ctxt, ue_context_p);
     } 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");
       uint8_t nb_of_pdu_sessions_failed = 0;
@@ -1354,7 +1352,7 @@ rrc_gNB_send_NGAP_PDUSESSION_MODIFY_RESP(
         pdu_sessions_failed++;
       }
     } 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);
     }
   }
diff --git a/openair2/RRC/NR/rrc_gNB_NGAP.h b/openair2/RRC/NR/rrc_gNB_NGAP.h
index 86faedc37e..5833c8aac2 100644
--- a/openair2/RRC/NR/rrc_gNB_NGAP.h
+++ b/openair2/RRC/NR/rrc_gNB_NGAP.h
@@ -122,7 +122,7 @@ rrc_gNB_send_NGAP_PDUSESSION_MODIFY_RESP(
   uint8_t                   xid
 );
 
-int
+void
 rrc_gNB_modify_dedicatedRRCReconfiguration(
   const protocol_ctxt_t     *const ctxt_pP,
   rrc_gNB_ue_context_t      *ue_context_pP