Fix merge build error

openair2/LAYER2/NR_MAC_gNB/main.c

@@ -89,8 +89,8 @@ void mac_top_init_gNB(void)
     // These should be out of here later
     pdcp_layer_init();
 
-    //if(IS_SOFTMODEM_NOS1)
-    //  nr_DRB_preconfiguration();
+    if(IS_SOFTMODEM_NOS1)
+      nr_DRB_preconfiguration();
 
     rrc_init_nr_global_param();
 

openair2/RRC/NR/rrc_gNB_nsa.c

@@ -268,7 +268,6 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
                          ue_context_p->ue_id_rnti,
                          ue_context_p->ue_context.secondaryCellGroup);
 
-#if 0
   nr_rrc_pdcp_config_asn1_req(
     &ctxt,
     (NR_SRB_ToAddModList_t *) NULL,
@@ -288,7 +287,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
       ue_context_p->ue_context.rb_config->drb_ToReleaseList,
       (LTE_PMCH_InfoList_r9_t *) NULL,
       ue_context_p->ue_context.secondaryCellGroup->rlc_BearerToAddModList);
-#endif
+
 }