choosing the right version of the unresolved merge conflict in beamforming.c

changed the memory allocation of txdataF and beam_weigths
2017-01-21 16:20:10 +01:00
parent 37a18b2530
commit e84a00174b
3 changed files with 29 additions and 56 deletions
@@ -2002,7 +2002,6 @@ void init_eNB(eNB_func_t node_function[], eNB_timing_t node_timing[],int nb_inst
 	eNB->do_prach             = NULL;
 	eNB->do_precoding         = 0;
 	eNB->fep                  = eNB_fep_rru_if5;
-	eNB->do_precoding         = 0;
 	eNB->td                   = NULL;
 	eNB->te                   = NULL;
 	eNB->proc_uespec_rx       = NULL;