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

fix build waning

Browse Source 
(cherry picked from commit 624fe21f52117959940066a6cfc5f8beac70e462)

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_RA.c
#	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
#	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
#	openair3/S1AP/s1ap_eNB.c

# Conflicts:
#	openair3/S1AP/s1ap_eNB.c
This commit is contained in:
Wu Jing
2021-01-06 19:52:37 +09:00
committed by masayuki.harada
parent 52acfc75de
commit 4a14c4c706
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair3/S1AP/s1ap_eNB.c
+2 -2
View File
@@ -105,7 +105,7 @@ static void s1ap_eNB_register_mme(s1ap_eNB_instance_t *instance_p,
MessageDef *message_p = NULL; MessageDef *message_p = NULL;
sctp_new_association_req_t *sctp_new_association_req_p = NULL; sctp_new_association_req_t *sctp_new_association_req_p = NULL;
s1ap_eNB_mme_data_t *s1ap_mme_data_p = NULL; s1ap_eNB_mme_data_t *s1ap_mme_data_p = NULL;
struct s1ap_eNB_mme_data_s *mme = NULL; // struct s1ap_eNB_mme_data_s *mme = NULL;
DevAssert(instance_p != NULL); DevAssert(instance_p != NULL);
DevAssert(mme_ip_address != NULL); DevAssert(mme_ip_address != NULL);
message_p = itti_alloc_new_message(TASK_S1AP, SCTP_NEW_ASSOCIATION_REQ); message_p = itti_alloc_new_message(TASK_S1AP, SCTP_NEW_ASSOCIATION_REQ);
@@ -666,7 +666,7 @@ void *s1ap_eNB_process_itti_msg(void *notUsed) {
case TIMER_HAS_EXPIRED: case TIMER_HAS_EXPIRED:
{ {
s1ap_eNB_timer_expired(ITTI_MESSAGE_GET_INSTANCE(received_msg), s1ap_eNB_timer_expired(ITTI_MESSAGE_GET_INSTANCE(received_msg),
&TIMER_HAS_EXPIRED(received_msg)); (s1ap_timer_has_expired_t *) &TIMER_HAS_EXPIRED(received_msg));
} }
break; break;
openair3/S1AP/s1ap_eNB_handlers.c
+4 -1
View File
@@ -38,6 +38,9 @@
#include "s1ap_eNB_defs.h" #include "s1ap_eNB_defs.h"
#include "s1ap_eNB_handlers.h" #include "s1ap_eNB_handlers.h"
#include "s1ap_eNB_decoder.h" #include "s1ap_eNB_decoder.h"
#include "s1ap_eNB_encoder.h"
#include "s1ap_eNB_itti_messaging.h"
#include "s1ap_eNB_ue_context.h" #include "s1ap_eNB_ue_context.h"
#include "s1ap_eNB_trace.h" #include "s1ap_eNB_trace.h"
@@ -818,7 +821,7 @@ int s1ap_eNB_handle_error_indication(uint32_t assoc_id,
if (ie) { if (ie) {
if( ie->value.choice.CriticalityDiagnostics.procedureCode ) if( ie->value.choice.CriticalityDiagnostics.procedureCode )
{ {
S1AP_WARN("Received S1 Error indication CriticalityDiagnostics procedureCode = %d\n", *ie->value.choice.CriticalityDiagnostics.procedureCode); S1AP_WARN("Received S1 Error indication CriticalityDiagnostics procedureCode = %ld\n", *ie->value.choice.CriticalityDiagnostics.procedureCode);
} }
// TODO continue // TODO continue
} }