From a72279dcbd14b4e5e8ad55301a73dfc0f197dd30 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@softwareradiosystems.com>
Date: Wed, 11 May 2022 16:09:07 +0100
Subject: [PATCH] Addressed review comments:

1 - enb,cfg: fix typo
2 - enb,config: added back deleted config option
3 - ue,rrc_nr: fix wrong log level in log message
4 - enb,config: remove unused parameter
---
 srsenb/rb.conf.example               | 12 +++++++++---
 srsenb/src/enb_cfg_parser.cc         |  2 +-
 srsgnb/hdr/stack/rrc/rrc_nr_config.h |  3 +--
 srsue/src/stack/rrc_nr/rrc_nr.cc     |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/srsenb/rb.conf.example b/srsenb/rb.conf.example
index 9a5bc5d44..b22e14549 100644
--- a/srsenb/rb.conf.example
+++ b/srsenb/rb.conf.example
@@ -10,9 +10,12 @@
 //       poll_byte = -1;
 //       max_retx_thresh = 4;
 //     };
-//     dl_am = {
-//       t_reassembly = 50;
-//       t_status_prohibit = 50;
+//     dl_am = {                                                                                      
+//       t_reordering = 35;
+//       t_status_prohibit = 0;
+//     };
+//     enb_specific = {
+//      dl_max_retx_thresh = 32;
 //     };
 //   };
 // }
@@ -29,6 +32,9 @@
 //       t_reordering = 35;
 //       t_status_prohibit = 0;
 //     };
+//     enb_specific = {
+//      dl_max_retx_thresh = 32;
+//     };
 //   };
 // }
 
diff --git a/srsenb/src/enb_cfg_parser.cc b/srsenb/src/enb_cfg_parser.cc
index 9f4dd845e..0b627efe4 100644
--- a/srsenb/src/enb_cfg_parser.cc
+++ b/srsenb/src/enb_cfg_parser.cc
@@ -644,7 +644,7 @@ int field_5g_srb::parse(libconfig::Setting& root)
     cfg.present = true;
   }
 
-  // RLC-UM Should not exist section
+  // RLC-UM must not exist in this section
   if (root.exists("ul_um") || root.exists("dl_um")) {
     ERROR("Error SRBs must be AM.");
     return SRSRAN_ERROR;
diff --git a/srsgnb/hdr/stack/rrc/rrc_nr_config.h b/srsgnb/hdr/stack/rrc/rrc_nr_config.h
index 0b63e98db..74469b535 100644
--- a/srsgnb/hdr/stack/rrc/rrc_nr_config.h
+++ b/srsgnb/hdr/stack/rrc/rrc_nr_config.h
@@ -46,8 +46,7 @@ struct rrc_cell_cfg_nr_t {
 typedef std::vector<rrc_cell_cfg_nr_t> rrc_cell_list_nr_t;
 
 struct srb_5g_cfg_t {
-  int                     enb_dl_max_retx_thres = -1;
-  bool                    present               = false;
+  bool                    present = false;
   asn1::rrc_nr::rlc_cfg_c rlc_cfg;
 };
 
diff --git a/srsue/src/stack/rrc_nr/rrc_nr.cc b/srsue/src/stack/rrc_nr/rrc_nr.cc
index 9a57422e5..31bb4709d 100644
--- a/srsue/src/stack/rrc_nr/rrc_nr.cc
+++ b/srsue/src/stack/rrc_nr/rrc_nr.cc
@@ -1062,7 +1062,7 @@ bool rrc_nr::apply_rlc_add_mod(const rlc_bearer_cfg_s& rlc_bearer_cfg)
       return false;
     }
   } else if (not is_drb) {
-    logger.error("Using default RLC configs for SRB%d", srb_id);
+    logger.debug("Using default RLC configs for SRB%d", srb_id);
     rlc_cfg = rlc_config_t::default_rlc_am_nr_config();
   } else {
     logger.error("In RLC bearer cfg does not contain rlc cfg");