openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h · c9906d1a70867b727859a073d5a062afb31e752b · wangjie / OpenXG-RAN · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'remotes/oai/NR_SA_F1AP_RFSIMULATOR3' into NR_SA_F1AP_RFSIMULATOR3_Lo · c9906d1a
masayuki.harada authored Mar 08, 2021
```
# Conflicts:
#	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
```
c9906d1a

nr_pdcp_entity.h 3.55 KB