Fix broken build due to mistake in resolving merge conflict (#4303)

Signed-off-by: Ulas Kozat <kozat@fb.com>
magma · Jan 8, 2021 · f007647 · f007647
1 parent d356a00
commit f007647
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 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
@@ -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
@@ -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
@@ -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<SctpdDownlinkClient> _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
       }
     }
   }