From 091877fd2a22fdc9c4fdcb3d6935cc634e25a812 Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Wed, 1 Dec 2021 15:20:26 +0100
Subject: [PATCH] gnb,rrc: inverse order of configuring lower layers when
 establishing bearer

start with lower layers first, so MAC, RLC then PDCP.
Since PDCP requires that the LCID is already registered at RLC to make config
checks. It checks for RLC mode (UM) in this case causing log entries like:

2021-12-01T13:47:40.453641 [RLC-NR ] [W] LCID 4 doesn't exist.
---
 srsgnb/src/stack/rrc/rrc_nr_ue.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srsgnb/src/stack/rrc/rrc_nr_ue.cc b/srsgnb/src/stack/rrc/rrc_nr_ue.cc
index 2ab0007b4..00d2441a3 100644
--- a/srsgnb/src/stack/rrc/rrc_nr_ue.cc
+++ b/srsgnb/src/stack/rrc/rrc_nr_ue.cc
@@ -1073,14 +1073,14 @@ void rrc_nr::ue::send_rrc_reconfiguration()
     }
 
     // Update lower layers
-    // add PDCP bearers
-    update_pdcp_bearers(ies.radio_bearer_cfg, master_cell_group);
+    // add MAC bearers
+    update_mac(master_cell_group, false);
 
     // add RLC bearers
     update_rlc_bearers(master_cell_group);
 
-    // add MAC bearers
-    update_mac(master_cell_group, false);
+    // add PDCP bearers
+    update_pdcp_bearers(ies.radio_bearer_cfg, master_cell_group);
   }
 
   if (nas_pdu_queue.size() > 0) {