From c33e94fede9344767c574bd195ec849116c22980 Mon Sep 17 00:00:00 2001
From: Francisco Paisana <francisco.paisana@softwareradiosystems.com>
Date: Mon, 28 Sep 2020 22:09:42 +0100
Subject: [PATCH] fix conformace 8_5_1_1 failure

---
 srsue/src/stack/rrc/rrc.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srsue/src/stack/rrc/rrc.cc b/srsue/src/stack/rrc/rrc.cc
index c529169ed..4c9a3d9c6 100644
--- a/srsue/src/stack/rrc/rrc.cc
+++ b/srsue/src/stack/rrc/rrc.cc
@@ -728,6 +728,13 @@ void rrc::send_con_restablish_request(reest_cause_e cause, uint16_t crnti, uint1
   // Clean reestablishment type
   reestablishment_successful = false;
 
+  if (cause.value != reest_cause_opts::ho_fail) {
+    if (cause.value != reest_cause_opts::other_fail) {
+      pci = meas_cells.serving_cell().get_pci();
+    }
+    cellid = meas_cells.serving_cell().get_cell_id();
+  }
+
   // Compute shortMAC-I
   uint8_t       varShortMAC_packed[16] = {};
   asn1::bit_ref bref(varShortMAC_packed, sizeof(varShortMAC_packed));