Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "[lte][agw] Fix broken build due to mistake in resolving merge conflict" #4309

Merged
merged 1 commit into from Jan 9, 2021
Merged

Revert "[lte][agw] Fix broken build due to mistake in resolving merge conflict" #4309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion lte/gateway/c/oai/tasks/mme_app/mme_app_bearer.c
View file
Open in desktop
Expand Up @@ -928,7 +928,6 @@ 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
*/
Expand Down
3 changes: 2 additions & 1 deletion lte/gateway/c/oai/tasks/nas/esm/DedicatedEpsBearerContextActivation.c
View file
Open in desktop
Expand Up @@ -291,7 +291,8 @@ 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);
}
}
Expand Down
4 changes: 2 additions & 2 deletions lte/gateway/c/oai/tasks/sctp/sctpd_downlink_client.cpp
View file
Open in desktop
Expand Up @@ -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;

Expand Down Expand Up @@ -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
}
}
}
Expand Down