From 8072aaa09145d767dd501dfa50509d75974934c6 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 25 Sep 2018 19:11:56 +0100 Subject: [PATCH] Fixed minor mistake in resolving conflict. --- srsepc/src/mme/s1ap_ctx_mngmt_proc.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc b/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc index 1cea56cae..1952ff1a6 100644 --- a/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc +++ b/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc @@ -127,7 +127,7 @@ s1ap_ctx_mngmt_proc::send_initial_context_setup_request(nas *nas_ctx, uint16_t e uint8_t *tmp_ptr = erab_ctx_req->transportLayerAddress.buffer; liblte_value_2_bits(sgw_s1u_ip, &tmp_ptr, 32); - uint32_t sgw_s1u_teid = erab_ctx->sgw_s1u_fteid.teid; + uint32_t sgw_s1u_teid = esm_ctx->sgw_s1u_fteid.teid; srslte::uint32_to_uint8(sgw_s1u_teid,erab_ctx_req->gTP_TEID.buffer); //Set UE security capabilities and k_enb