Avoid calling RB preconfiguration with static rnti for the not required cases

openair2/GNB_APP/gnb_config.c

@@ -79,6 +79,7 @@
 
 #include "RRC/NR/MESSAGES/asn1_msg.h"
 #include "openair2/LAYER2/nr_pdcp/nr_pdcp.h"
+#include "executables/softmodem-common.h"
 
 extern uint16_t sf_ahead;
 int macrlc_has_f1 = 0;
@@ -1796,6 +1797,10 @@ void nr_read_config_and_init(void) {
     RCconfig_NRRRC(msg_p,gnb_id, RC.nrrrc[gnb_id]);
   }
 
+  if((IS_SOFTMODEM_NOS1 && !get_softmodem_params()->do_ra) || NODE_IS_DU(RC.nrrrc[0]->node_type)){
+      nr_DRB_preconfiguration(0x1234);
+  }
+
   if (NODE_IS_CU(RC.nrrrc[0]->node_type)) {
     pdcp_layer_init();
     nr_DRB_preconfiguration(0x1234);

openair2/LAYER2/NR_MAC_gNB/main.c

@@ -96,9 +96,6 @@ void mac_top_init_gNB(void)
     // These should be out of here later
     pdcp_layer_init();
 
-    // if(IS_SOFTMODEM_NOS1 && !get_softmodem_params()->do_ra)
-      nr_DRB_preconfiguration(0x1234);
-
     rrc_init_nr_global_param();
 
   }else {