From 218f1362541a03434a7ead4c1fab66a84fc3aa3b Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Thu, 20 Jun 2019 15:23:35 +0200
Subject: [PATCH] remove default PDCP entity for SRB0

---
 lib/include/srslte/upper/pdcp.h |  4 ----
 lib/src/upper/pdcp.cc           | 21 ---------------------
 2 files changed, 25 deletions(-)

diff --git a/lib/include/srslte/upper/pdcp.h b/lib/include/srslte/upper/pdcp.h
index fd8975047..d47afa078 100644
--- a/lib/include/srslte/upper/pdcp.h
+++ b/lib/include/srslte/upper/pdcp.h
@@ -93,10 +93,6 @@ private:
   pdcp_map_t  pdcp_array, pdcp_array_mrb;
   pthread_rwlock_t rwlock;
 
-  // default PDCP entity that is maintained active by PDCP instance
-  srslte_pdcp_config_t default_cnfg;
-  uint32_t             default_lcid;
-
   bool valid_lcid(uint32_t lcid);
   bool valid_mch_lcid(uint32_t lcid);
 };
diff --git a/lib/src/upper/pdcp.cc b/lib/src/upper/pdcp.cc
index 865e382f5..60ec25266 100644
--- a/lib/src/upper/pdcp.cc
+++ b/lib/src/upper/pdcp.cc
@@ -29,7 +29,6 @@ pdcp::pdcp()
   rrc = NULL;
   gw = NULL;
   pdcp_log = NULL;
-  default_lcid = 0;
   pthread_rwlock_init(&rwlock, NULL);
 }
 
@@ -57,27 +56,10 @@ void pdcp::init(srsue::rlc_interface_pdcp *rlc_, srsue::rrc_interface_pdcp *rrc_
   rrc          = rrc_;
   gw           = gw_;
   pdcp_log     = pdcp_log_;
-  default_lcid = lcid_;
-
-  // Default config
-  default_cnfg.is_control = false;
-  default_cnfg.is_data = false;
-  default_cnfg.direction = direction_;
-
-  // create default PDCP entity for SRB0
-  add_bearer(0, default_cnfg);
 }
 
 void pdcp::stop()
 {
-  // destroy default entity
-  pthread_rwlock_wrlock(&rwlock);
-  if (valid_lcid(0)) {
-    pdcp_map_t::iterator it = pdcp_array.find(0);
-    delete(it->second);
-    pdcp_array.erase(it);
-  }
-  pthread_rwlock_unlock(&rwlock);
 }
 
 void pdcp::reestablish() {
@@ -107,9 +89,6 @@ void pdcp::reset()
     pdcp_array.erase(it++);
   }
   pthread_rwlock_unlock(&rwlock);
-
-  // add default SRB0 again
-  add_bearer(0, default_cnfg);
 }
 
 /*******************************************************************************