diff --git a/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c b/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c index 6bb4e9aab0..a7f5afd51d 100644 --- a/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c +++ b/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c @@ -127,7 +127,11 @@ void pre_scd_nb_rbs_required( module_id_t module_idP, for (lc_id = DCCH; lc_id <= DTCH; lc_id++) { rlc_status = mac_rlc_status_ind(module_idP, rnti, module_idP, frameP, subframeP, - ENB_FLAG_YES, MBMS_FLAG_NO, lc_id, 0); + ENB_FLAG_YES, MBMS_FLAG_NO, lc_id, 0 +#ifdef Rel14 + ,0, 0 +#endif + ); UE_template.dl_buffer_total += rlc_status.bytes_in_buffer; //storing the total dlsch buffer } // end of store dlsch buffer diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c index 0740bc8ed9..ac57356f61 100644 --- a/targets/RT/USER/lte-ru.c +++ b/targets/RT/USER/lte-ru.c @@ -1948,8 +1948,7 @@ void* pre_scd_thread( void* param ){ for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) { - rrc_rx_tx(&ctxt, 0, // eNB index, unused in eNB - CC_id); + rrc_rx_tx(&ctxt, CC_id); min_rb_unit[CC_id] = get_min_rb_unit(Mod_id, CC_id); } @@ -2004,7 +2003,7 @@ static void* eNB_thread_phy_tx( void* param ) { if(ru->num_eNB == 1){ proc_rxtx.subframe_tx = proc->subframe_phy_tx; proc_rxtx.frame_tx = proc->frame_phy_tx; - phy_procedures_eNB_TX(eNB_list[0], &proc_rxtx, no_relay, NULL, 1); + phy_procedures_eNB_TX(eNB_list[0], &proc_rxtx, 1); phy_tx_txdataF_end = 1; if(pthread_mutex_lock(&ru->proc.mutex_rf_tx) != 0){ LOG_E( PHY, "[RU] ERROR pthread_mutex_lock for rf tx thread (IC %d)\n", ru->proc.instance_cnt_rf_tx);