From df67735a99d256ff45df73bedfa12e8627fec57c Mon Sep 17 00:00:00 2001
From: Ismael Gomez <ismagom@gmail.com>
Date: Sun, 25 Feb 2018 13:08:36 +0100
Subject: [PATCH] Reset UL after IDLEling PHY

---
 srsue/src/phy/phch_recv.cc | 11 ++++++++++-
 srsue/src/upper/rrc.cc     |  3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/srsue/src/phy/phch_recv.cc b/srsue/src/phy/phch_recv.cc
index 4a8fef5bf..d63d298ec 100644
--- a/srsue/src/phy/phch_recv.cc
+++ b/srsue/src/phy/phch_recv.cc
@@ -391,13 +391,22 @@ bool phch_recv::cell_handover(srslte_cell_t cell)
   bool ret = false;
   this->cell = cell;
   Info("Cell HO: Stopping sync with current cell\n");
-  worker_com->reset_ul();
   phy_state = IDLE_RX;
   cnt = 0;
   while(!is_in_idle_rx && cnt<20) {
     usleep(1000);
     cnt++;
   }
+  cnt = 0;
+  while(!is_in_idle_rx && cnt<20) {
+    usleep(1000);
+    cnt++;
+  }
+  for(uint32_t i=0;i<workers_pool->get_nof_workers();i++) {
+    ((phch_worker*) workers_pool->get_worker(i))->reset();
+  }
+  worker_com->reset();
+  worker_com->reset_ul();
   if (is_in_idle_rx) {
     Info("Cell HO: Reconfiguring cell\n");
     if (set_cell()) {
diff --git a/srsue/src/upper/rrc.cc b/srsue/src/upper/rrc.cc
index 0760ccb7e..9c5ad52c1 100644
--- a/srsue/src/upper/rrc.cc
+++ b/srsue/src/upper/rrc.cc
@@ -1128,7 +1128,8 @@ bool rrc::ho_prepare() {
     pdcp->reestablish();
     rlc->reestablish();
     mac->reset();
-    phy->reset();
+    // PHY is reset inside cell_handover() function
+
     mac->set_ho_rnti(mob_reconf.mob_ctrl_info.new_ue_id, mob_reconf.mob_ctrl_info.target_pci);
     apply_rr_config_common_dl(&mob_reconf.mob_ctrl_info.rr_cnfg_common);