From f79b3e9435c8daa1a9f37452d6b525ca091f52ff Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@softwareradiosystems.com>
Date: Fri, 29 Apr 2022 19:23:05 +0100
Subject: [PATCH] gnb,rrc: fix SRB config generation when configuration is
 present in rb.conf

---
 srsgnb/src/stack/rrc/rrc_nr_ue.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srsgnb/src/stack/rrc/rrc_nr_ue.cc b/srsgnb/src/stack/rrc/rrc_nr_ue.cc
index cb6991daf..9ca216c8b 100644
--- a/srsgnb/src/stack/rrc/rrc_nr_ue.cc
+++ b/srsgnb/src/stack/rrc/rrc_nr_ue.cc
@@ -1414,6 +1414,12 @@ int rrc_nr::ue::update_rlc_bearers(const asn1::rrc_nr::cell_group_cfg_s& cell_gr
       rb_id = rb.served_radio_bearer.srb_id();
       if (not rb.rlc_cfg_present) {
         rlc_cfg = srsran::rlc_config_t::default_rlc_am_nr_config();
+      } else {
+        if (srsran::make_rlc_config_t(rb.rlc_cfg, rb_id, &rlc_cfg) != SRSRAN_SUCCESS) {
+          logger.error("Failed to build RLC config");
+          // TODO: HANDLE
+          return SRSRAN_ERROR;
+        }
       }
     } else {
       rb_id = rb.served_radio_bearer.drb_id();