Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g...
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into various-l2-fixes-187 Conflicts: openair1/PHY/LTE_TRANSPORT/if4_tools.c targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.25PRB.lo.conf targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.usrpb210.conf targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.conf targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.50PRB.oaisim.conf
Showing
- cmake_targets/CMakeLists.txt 3 additions, 1 deletioncmake_targets/CMakeLists.txt
- cmake_targets/autotests/v2/actions/execution_compile.bash 3 additions, 0 deletionscmake_targets/autotests/v2/actions/execution_compile.bash
- cmake_targets/build_oai 11 additions, 2 deletionscmake_targets/build_oai
- openair1/PHY/LTE_TRANSPORT/dci_tools.c 4 additions, 2 deletionsopenair1/PHY/LTE_TRANSPORT/dci_tools.c
- openair1/PHY/LTE_TRANSPORT/if4_tools.c 3 additions, 5 deletionsopenair1/PHY/LTE_TRANSPORT/if4_tools.c
- openair1/PHY/LTE_TRANSPORT/prach.c 53 additions, 12 deletionsopenair1/PHY/LTE_TRANSPORT/prach.c
- openair1/PHY/LTE_TRANSPORT/ulsch_modulation.c 1 addition, 1 deletionopenair1/PHY/LTE_TRANSPORT/ulsch_modulation.c
- openair1/PHY/defs.h 1 addition, 0 deletionsopenair1/PHY/defs.h
- openair1/SCHED/phy_mac_stub.c 147 additions, 29 deletionsopenair1/SCHED/phy_mac_stub.c
- openair1/SCHED/phy_procedures_lte_eNb.c 23 additions, 16 deletionsopenair1/SCHED/phy_procedures_lte_eNb.c
- openair1/SCHED/phy_procedures_lte_ue.c 15 additions, 18 deletionsopenair1/SCHED/phy_procedures_lte_ue.c
- openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c 64 additions, 24 deletionsopenair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
- openair2/ENB_APP/MESSAGES/V2/stats_common.proto 1 addition, 0 deletionsopenair2/ENB_APP/MESSAGES/V2/stats_common.proto
- openair2/ENB_APP/flexran_agent_common.c 97 additions, 81 deletionsopenair2/ENB_APP/flexran_agent_common.c
- openair2/ENB_APP/flexran_agent_common.h 7 additions, 1 deletionopenair2/ENB_APP/flexran_agent_common.h
- openair2/ENB_APP/flexran_agent_extern.h 4 additions, 0 deletionsopenair2/ENB_APP/flexran_agent_extern.h
- openair2/ENB_APP/flexran_agent_handler.c 1 addition, 1 deletionopenair2/ENB_APP/flexran_agent_handler.c
- openair2/LAYER2/MAC/flexran_agent_mac_proto.h 0 additions, 13 deletionsopenair2/LAYER2/MAC/flexran_agent_mac_proto.h
- openair2/LAYER2/MAC/flexran_agent_scheduler_dataplane.c 81 additions, 61 deletionsopenair2/LAYER2/MAC/flexran_agent_scheduler_dataplane.c
- openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c 95 additions, 161 deletionsopenair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c
Loading
Please register or sign in to comment