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
executables/main-ocp.c
-1
View File
@@ -82,7 +82,6 @@ int otg_enabled;
uint64_t downlink_frequency[MAX_NUM_CCs][4];
int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
int split73;
int usrp_tx_thread = 0;
char * split73_config;
int split73;
AGENT_RRC_xface *agent_rrc_xface[NUM_MAX_ENB]= {0};