Merge remote-tracking branch 'origin/feature-68-enb-agent' into develop_integration_w06
Conflicts: openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c
No related branches found
No related tags found
Showing
- openair1/SCHED/phy_procedures_lte_eNb.c 15 additions, 16 deletionsopenair1/SCHED/phy_procedures_lte_eNb.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
- openair2/LAYER2/MAC/pre_processor.c 1 addition, 1 deletionopenair2/LAYER2/MAC/pre_processor.c
- openair2/LAYER2/MAC/proto.h 1 addition, 0 deletionsopenair2/LAYER2/MAC/proto.h
Loading
Please register or sign in to comment