From f99d6bc224f6aa3a2ab621a5ce0ddd1e8a3afd77 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@softwareradiosystems.com>
Date: Fri, 12 Nov 2021 16:19:55 +0000
Subject: [PATCH] lib,rlc: changed get_bearer() to get_lcid().

---
 lib/include/srsran/rlc/rlc_am_base.h | 2 +-
 lib/include/srsran/rlc/rlc_common.h  | 4 ++--
 lib/include/srsran/rlc/rlc_tm.h      | 2 +-
 lib/include/srsran/rlc/rlc_um_base.h | 2 +-
 lib/src/rlc/rlc_tm.cc                | 2 +-
 lib/src/rlc/rlc_um_base.cc           | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/include/srsran/rlc/rlc_am_base.h b/lib/include/srsran/rlc/rlc_am_base.h
index 0764b4ae1..d7d4f5b60 100644
--- a/lib/include/srsran/rlc/rlc_am_base.h
+++ b/lib/include/srsran/rlc/rlc_am_base.h
@@ -69,7 +69,7 @@ public:
 
   rlc_mode_t get_mode() final { return rlc_mode_t::am; }
 
-  uint32_t get_bearer() final { return lcid; }
+  uint32_t get_lcid() final { return lcid; }
 
   /****************************************************************************
    * PDCP interface
diff --git a/lib/include/srsran/rlc/rlc_common.h b/lib/include/srsran/rlc/rlc_common.h
index 9d6b0f29f..8e62796c5 100644
--- a/lib/include/srsran/rlc/rlc_common.h
+++ b/lib/include/srsran/rlc/rlc_common.h
@@ -241,8 +241,8 @@ public:
     }
   }
 
-  virtual rlc_mode_t get_mode()   = 0;
-  virtual uint32_t   get_bearer() = 0;
+  virtual rlc_mode_t get_mode() = 0;
+  virtual uint32_t   get_lcid() = 0;
 
   virtual rlc_bearer_metrics_t get_metrics()   = 0;
   virtual void                 reset_metrics() = 0;
diff --git a/lib/include/srsran/rlc/rlc_tm.h b/lib/include/srsran/rlc/rlc_tm.h
index c24883d88..849ba9737 100644
--- a/lib/include/srsran/rlc/rlc_tm.h
+++ b/lib/include/srsran/rlc/rlc_tm.h
@@ -41,7 +41,7 @@ public:
   void empty_queue() override;
 
   rlc_mode_t get_mode() override;
-  uint32_t   get_bearer() override;
+  uint32_t   get_lcid() override;
 
   rlc_bearer_metrics_t get_metrics() override;
   void                 reset_metrics() override;
diff --git a/lib/include/srsran/rlc/rlc_um_base.h b/lib/include/srsran/rlc/rlc_um_base.h
index 4f2f4609d..40cfd2768 100644
--- a/lib/include/srsran/rlc/rlc_um_base.h
+++ b/lib/include/srsran/rlc/rlc_um_base.h
@@ -48,7 +48,7 @@ public:
   bool is_mrb();
 
   rlc_mode_t get_mode();
-  uint32_t   get_bearer();
+  uint32_t   get_lcid() final;
 
   // PDCP interface
   void write_sdu(unique_byte_buffer_t sdu);
diff --git a/lib/src/rlc/rlc_tm.cc b/lib/src/rlc/rlc_tm.cc
index 34e260743..6acd35e8b 100644
--- a/lib/src/rlc/rlc_tm.cc
+++ b/lib/src/rlc/rlc_tm.cc
@@ -64,7 +64,7 @@ rlc_mode_t rlc_tm::get_mode()
   return rlc_mode_t::tm;
 }
 
-uint32_t rlc_tm::get_bearer()
+uint32_t rlc_tm::get_lcid()
 {
   return lcid;
 }
diff --git a/lib/src/rlc/rlc_um_base.cc b/lib/src/rlc/rlc_um_base.cc
index c8bc6ae9d..b24ae585c 100644
--- a/lib/src/rlc/rlc_um_base.cc
+++ b/lib/src/rlc/rlc_um_base.cc
@@ -42,7 +42,7 @@ rlc_mode_t rlc_um_base::get_mode()
   return rlc_mode_t::um;
 }
 
-uint32_t rlc_um_base::get_bearer()
+uint32_t rlc_um_base::get_lcid()
 {
   return lcid;
 }