From f007647173f49baac1c9faf3b29118aa758391bc Mon Sep 17 00:00:00 2001 From: Ulas Kozat Date: Fri, 8 Jan 2021 14:18:17 -0800 Subject: [PATCH] Fix broken build due to mistake in resolving merge conflict (#4303) Signed-off-by: Ulas Kozat --- lte/gateway/c/oai/tasks/mme_app/mme_app_bearer.c | 1 + .../c/oai/tasks/nas/esm/DedicatedEpsBearerContextActivation.c | 3 +-- lte/gateway/c/oai/tasks/sctp/sctpd_downlink_client.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lte/gateway/c/oai/tasks/mme_app/mme_app_bearer.c b/lte/gateway/c/oai/tasks/mme_app/mme_app_bearer.c index 3643c988dc77..b50a14ee7491 100644 --- a/lte/gateway/c/oai/tasks/mme_app/mme_app_bearer.c +++ b/lte/gateway/c/oai/tasks/mme_app/mme_app_bearer.c @@ -928,6 +928,7 @@ void mme_app_handle_delete_session_rsp( if (ue_context_p->ue_context_rel_cause == S1AP_INVALID_CAUSE) { ue_context_p->ue_context_rel_cause = S1AP_NAS_DETACH; } +#if EMBEDDED_SGW /* If UE has rejected activate default eps bearer request message * delete the pdn context */ diff --git a/lte/gateway/c/oai/tasks/nas/esm/DedicatedEpsBearerContextActivation.c b/lte/gateway/c/oai/tasks/nas/esm/DedicatedEpsBearerContextActivation.c index 22340f31194a..3fa30b77b70d 100644 --- a/lte/gateway/c/oai/tasks/nas/esm/DedicatedEpsBearerContextActivation.c +++ b/lte/gateway/c/oai/tasks/nas/esm/DedicatedEpsBearerContextActivation.c @@ -291,8 +291,7 @@ int esm_proc_dedicated_eps_bearer_context_accept( OAILOG_DEBUG( LOG_NAS_ESM, "ESM-PROC - Started ERAB_SETUP_RSP_TMR for " - "ue_id=" MME_UE_S1AP_ID_FMT - "ebi (%u)", + "ue_id=" MME_UE_S1AP_ID_FMT "ebi (%u)", ue_context_p->mme_ue_s1ap_id, ebi); } } diff --git a/lte/gateway/c/oai/tasks/sctp/sctpd_downlink_client.cpp b/lte/gateway/c/oai/tasks/sctp/sctpd_downlink_client.cpp index ef45f74db2d3..491dd2eb332d 100644 --- a/lte/gateway/c/oai/tasks/sctp/sctpd_downlink_client.cpp +++ b/lte/gateway/c/oai/tasks/sctp/sctpd_downlink_client.cpp @@ -106,7 +106,7 @@ using magma::sctpd::SendDlReq; using magma::sctpd::SendDlRes; // Max sleep backoff delay in microseconds -constexpr useconds_t max_backoff_usecs = 1000000; // 1 sec +constexpr useconds_t max_backoff_usecs = 1000000; // 1 sec std::unique_ptr _client = nullptr; @@ -174,7 +174,7 @@ int sctpd_init(sctp_init_t* init) { OAILOG_DEBUG(LOG_SCTP, "Sleeping for %d usecs", sleep_time); usleep(sleep_time); if (current_delay < max_backoff_usecs) { - current_delay += 10000; // Add 10 ms to backoff + current_delay += 10000; // Add 10 ms to backoff } } }