Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36
Conflicts: openair2/ENB_APP/flexran_agent_common_internal.c openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
No related branches found
No related tags found
Showing
- cmake_targets/CMakeLists.txt 1 addition, 0 deletionscmake_targets/CMakeLists.txt
- common/utils/load_module_shlib.c 105 additions, 64 deletionscommon/utils/load_module_shlib.c
- openair1/PHY/defs_common.h 16 additions, 11 deletionsopenair1/PHY/defs_common.h
- openair2/COMMON/flexran_messages_def.h 29 additions, 0 deletionsopenair2/COMMON/flexran_messages_def.h
- openair2/COMMON/messages_def.h 1 addition, 1 deletionopenair2/COMMON/messages_def.h
- openair2/COMMON/platform_types.h 7 additions, 1 deletionopenair2/COMMON/platform_types.h
- openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c 307 additions, 65 deletionsopenair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
- openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.h 10 additions, 0 deletionsopenair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.h
- openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c 727 additions, 0 deletions.../ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
- openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.h 41 additions, 0 deletions.../ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.h
- openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_slice_verification.c 373 additions, 0 deletions...ONTROL_MODULES/MAC/flexran_agent_mac_slice_verification.c
- openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_slice_verification.h 37 additions, 0 deletions...ONTROL_MODULES/MAC/flexran_agent_mac_slice_verification.h
- openair2/ENB_APP/CONTROL_MODULES/PDCP/flexran_agent_pdcp.c 5 additions, 3 deletionsopenair2/ENB_APP/CONTROL_MODULES/PDCP/flexran_agent_pdcp.c
- openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.c 169 additions, 160 deletionsopenair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.c
- openair2/ENB_APP/MESSAGES/V2/config_common.proto 82 additions, 1 deletionopenair2/ENB_APP/MESSAGES/V2/config_common.proto
- openair2/ENB_APP/MESSAGES/V2/config_messages.proto 15 additions, 0 deletionsopenair2/ENB_APP/MESSAGES/V2/config_messages.proto
- openair2/ENB_APP/enb_app.c 56 additions, 0 deletionsopenair2/ENB_APP/enb_app.c
- openair2/ENB_APP/enb_app.h 2 additions, 2 deletionsopenair2/ENB_APP/enb_app.h
- openair2/ENB_APP/enb_config.c 45 additions, 48 deletionsopenair2/ENB_APP/enb_config.c
- openair2/ENB_APP/flexran_agent_common.c 125 additions, 54 deletionsopenair2/ENB_APP/flexran_agent_common.c
Loading
Please register or sign in to comment