From ff5b5854468560c676174f5e265681fd42aee283 Mon Sep 17 00:00:00 2001 From: Xenofon Foukas Date: Tue, 8 Mar 2016 12:58:44 +0000 Subject: [PATCH] Added check for ignoring empty mac dl config messages --- openair2/ENB_APP/enb_agent_mac.c | 4 ++-- openair2/LAYER2/MAC/eNB_agent_scheduler_dataplane.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/openair2/ENB_APP/enb_agent_mac.c b/openair2/ENB_APP/enb_agent_mac.c index ff8638ca4d..296da7f1d2 100644 --- a/openair2/ENB_APP/enb_agent_mac.c +++ b/openair2/ENB_APP/enb_agent_mac.c @@ -1369,8 +1369,8 @@ int enb_agent_register_mac_xface(mid_t mod_id, AGENT_MAC_xface *xface) { xface->enb_agent_send_sr_info = enb_agent_send_sr_info; xface->enb_agent_send_sf_trigger = enb_agent_send_sf_trigger; xface->enb_agent_send_update_mac_stats = enb_agent_send_update_mac_stats; - //xface->enb_agent_schedule_ue_spec = schedule_ue_spec_default; - xface->enb_agent_schedule_ue_spec = schedule_ue_spec_remote; + xface->enb_agent_schedule_ue_spec = schedule_ue_spec_default; + //xface->enb_agent_schedule_ue_spec = schedule_ue_spec_remote; xface->enb_agent_get_pending_dl_mac_config = enb_agent_get_pending_dl_mac_config; xface->enb_agent_notify_ue_state_change = enb_agent_ue_state_change; diff --git a/openair2/LAYER2/MAC/eNB_agent_scheduler_dataplane.c b/openair2/LAYER2/MAC/eNB_agent_scheduler_dataplane.c index 6f84014070..dc1ab3da0e 100644 --- a/openair2/LAYER2/MAC/eNB_agent_scheduler_dataplane.c +++ b/openair2/LAYER2/MAC/eNB_agent_scheduler_dataplane.c @@ -247,6 +247,11 @@ void apply_ue_spec_scheduling_decisions(mid_t mod_id, } ta_update = (ta_len > 0) ? ue_sched_ctl->ta_update : 0; + + // If there is nothing to schedule, just leave + if ((sdu_length_total + ta_len) < 0) { + return; + } offset = generate_dlsch_header((unsigned char*)UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0], num_sdus, //num_sdus