fix merge issue

targets/RT/USER/lte-enb.c

@@ -256,7 +256,6 @@ static inline int rxtx(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc, char *thread_name
     }
 #endif
 
-  pthread_mutex_lock(&eNB->UL_INFO_mutex);
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ULSCH_SCHEDULER, 1 );
 
   pthread_mutex_lock(&eNB->UL_INFO_mutex);

targets/RT/USER/lte-softmodem.c

@@ -902,12 +902,6 @@ if (nfapi_mode==2) {// VNF
 
   printf("wait_eNBs()\n");
   wait_eNBs();
-  printf("About to Init RU threads RC.nb_RU:%d\n", RC.nb_RU);
-
-  if (RC.nb_RU >0) {
-    printf("Initializing RU threads\n");
-    init_RU(get_softmodem_params()->rf_config_file);
-
   printf("About to Init RU threads RC.nb_RU:%d\n", RC.nb_RU);
   // RU thread and some L1 procedure aren't necessary in VNF or L2 FAPI simulator.
   // but RU thread deals with pre_scd and this is necessary in VNF and simulator.
@@ -920,7 +914,6 @@ if (nfapi_mode==2) {// VNF
       RC.ru[ru_id]->rf_map.chain=CC_id+(get_softmodem_params()->chain_offset);
     }
   }
-  }
 
   config_sync_var=0;