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

Merge remote-tracking branch 'remotes/origin/develop' into issue_345_l2_fapi_simulator_new

Browse Source 
# Conflicts:
#	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
#	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
#	openair2/LAYER2/RLC/rlc.c
This commit is contained in:
Haruki NAOI
2018-11-06 15:03:54 +09:00
parent 64b395c64a 47437903f9
commit 7d9898a5bb
126 changed files with 5614 additions and 5133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/PHY_INTERFACE/IF_Module.h
+1 -1
View File
@@ -76,7 +76,7 @@ typedef struct{
/// RACH indication list
nfapi_rach_indication_t rach_ind;
#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// RACH indication list for BR UEs
nfapi_rach_indication_t rach_ind_br;
#endif