From cfb059f0c2d8657757e834b1ceba6f3b05745d72 Mon Sep 17 00:00:00 2001
From: Ismael Gomez <ismagom@gmail.com>
Date: Sat, 2 Dec 2017 22:52:17 +0100
Subject: [PATCH] Restart rx_counter for SRB in PDCP when restablishing

---
 lib/src/upper/pdcp_entity.cc | 1 +
 srsue/src/upper/rrc.cc       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/src/upper/pdcp_entity.cc b/lib/src/upper/pdcp_entity.cc
index ceb89a0bb..b4cc5b9d5 100644
--- a/lib/src/upper/pdcp_entity.cc
+++ b/lib/src/upper/pdcp_entity.cc
@@ -81,6 +81,7 @@ void pdcp_entity::reestablish() {
   // For SRBs
   if (cfg.is_control) {
     tx_count = 0;
+    rx_count = 0;
   } else {
     if (rlc->rb_is_um(lcid)) {
       tx_count = 0;
diff --git a/srsue/src/upper/rrc.cc b/srsue/src/upper/rrc.cc
index 346a04ac0..461a4f9ee 100644
--- a/srsue/src/upper/rrc.cc
+++ b/srsue/src/upper/rrc.cc
@@ -514,7 +514,7 @@ void rrc::select_next_cell_in_plmn() {
 }
 
 void rrc::new_phy_meas(float rsrp, float rsrq, uint32_t tti, uint32_t earfcn, uint32_t pci) {
-  if (state == RRC_STATE_CONNECTED) {
+  if (state != RRC_STATE_IDLE) {
     measurements.new_phy_meas(earfcn, pci, rsrp, rsrq, tti);
   } else {
     // If measurement is of the serving cell, evaluate cell reselection criteria