maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15

Browse Source 
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/TOOLS/time_meas.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/LAYER2/RLC/rlc.h
This commit is contained in:
hardy
2021-04-14 14:56:04 +02:00
parent 246afc7ccb 657b525efc
commit c4745c3e46
36 changed files with 1114 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/SIMULATION/NR_RRC/itti_sim.c
-1
View File
@@ -145,7 +145,6 @@ extern void *udp_eNB_task(void *args_p);
int transmission_mode=1;
int emulate_rf = 0;
int numerology = 0;
int usrp_tx_thread = 0;
double cpuf;