diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c index 2a8ebabef2d7a073ee721482e8bcb195a8deab87..6192dacb86d492f5ed05c5e5d2d8a9a22c1a6059 100644 --- a/executables/nr-softmodem.c +++ b/executables/nr-softmodem.c @@ -299,7 +299,6 @@ static int create_gNB_tasks(ngran_node_t node_type, configmodule_interface_t *cf RCconfig_verify(cfg, node_type); - RCconfig_NR_L1(); RCconfig_nr_prs(); if (RC.nb_nr_macrlc_inst > 0) @@ -682,11 +681,13 @@ int main( int argc, char **argv ) { #endif LOG_I(HW, "Version: %s\n", PACKAGE_VERSION); - if (RC.nb_nr_L1_inst > 0) - RCconfig_NR_L1(); // don't create if node doesn't connect to RRC/S1/GTP const ngran_node_t node_type = get_node_type(); + + if (RC.nb_nr_L1_inst > 0) + RCconfig_NR_L1(); + if (NFAPI_MODE != NFAPI_MODE_PNF) { int ret = create_gNB_tasks(node_type, uniqCfg); AssertFatal(ret == 0, "cannot create ITTI tasks\n"); diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c index 61af471e9d53d9ca8e5ab8d91ab0b0a3b4d22c42..3b5d159d3494d9a92b1b976ebff2114f97437712 100644 --- a/openair2/GNB_APP/gnb_config.c +++ b/openair2/GNB_APP/gnb_config.c @@ -809,7 +809,6 @@ void RCconfig_nr_prs(void) void RCconfig_NR_L1(void) { int j = 0; - if (RC.gNB == NULL) { RC.gNB = (PHY_VARS_gNB **)malloc((1 + NUMBER_OF_gNB_MAX) * sizeof(PHY_VARS_gNB *)); LOG_I(NR_PHY, "RC.gNB = %p\n", RC.gNB);