From 7447fefd191ba5f531d636b14d59d98d86172a6d Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@softwareradiosystems.com>
Date: Wed, 10 Mar 2021 16:24:34 +0000
Subject: [PATCH] Make sure that sending the status report sent after RLC
 configuration in reestablishment

---
 srsue/src/stack/rrc/rrc_procedures.cc | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srsue/src/stack/rrc/rrc_procedures.cc b/srsue/src/stack/rrc/rrc_procedures.cc
index dda20f4a5..2030ec600 100644
--- a/srsue/src/stack/rrc/rrc_procedures.cc
+++ b/srsue/src/stack/rrc/rrc_procedures.cc
@@ -957,12 +957,10 @@ srslte::proc_outcome_t rrc::connection_reconf_no_ho_proc::init(const asn1::rrc::
   if (rrc_ptr->reestablishment_successful) {
     // Reestablish PDCP and RLC for SRB2 and all DRB
     // TODO: Which is the maximum LCID?
-    rrc_ptr->reestablishment_successful = false;
     for (int i = 2; i < SRSLTE_N_RADIO_BEARERS; i++) {
       if (rrc_ptr->rlc->has_bearer(i)) {
         rrc_ptr->rlc->reestablish(i);
         rrc_ptr->pdcp->reestablish(i);
-        rrc_ptr->pdcp->send_status_report(i);
       }
     }
   }
@@ -974,6 +972,16 @@ srslte::proc_outcome_t rrc::connection_reconf_no_ho_proc::init(const asn1::rrc::
     }
   }
 
+  if (rrc_ptr->reestablishment_successful) {
+    // Send status report if necessary.
+    rrc_ptr->reestablishment_successful = false;
+    for (int i = 2; i < SRSLTE_N_RADIO_BEARERS; i++) {
+      if (rrc_ptr->rlc->has_bearer(i)) {
+        rrc_ptr->pdcp->send_status_report(i);
+      }
+    }
+  }
+
   // Apply Scell RR configurations (call is non-blocking). Make a copy since can be changed inside
   // apply_scell_config() Note that apply_scell_config() calls set_scell() and set_config() which run in the
   // background.
@@ -1324,9 +1332,9 @@ proc_outcome_t rrc::connection_reest_proc::init(asn1::rrc::reest_cause_e cause)
   reest_cellid = rrc_ptr->meas_cells.find_cell(reest_source_freq, reest_source_pci)->get_cell_id();
 
   Info("Starting... cause: \"%s\", UE context: {C-RNTI=0x%x, PCI=%d, CELL ID=%d}",
-       reest_cause == asn1::rrc::reest_cause_opts::recfg_fail
-           ? "Reconfiguration failure"
-           : cause == asn1::rrc::reest_cause_opts::ho_fail ? "Handover failure" : "Other failure",
+       reest_cause == asn1::rrc::reest_cause_opts::recfg_fail ? "Reconfiguration failure"
+       : cause == asn1::rrc::reest_cause_opts::ho_fail        ? "Handover failure"
+                                                              : "Other failure",
        reest_rnti,
        reest_source_pci,
        reest_cellid);