fix merge bug

4387070c · Xu Bo · 9c820805 · 4387070c
Commit 4387070c authored Feb 05, 2018 by Xu Bo
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c openair2/LAYER2/MAC/eNB_scheduler_ulsch.c +1 -1

No files found.
--- a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
@@ -1169,7 +1169,7 @@ schedule_ulsch_rnti(module_id_t module_idP,
    nfapi_ul_config_request_body_t *ul_req_tmp_body  = &ul_req_tmp->ul_config_request_body;

    //LOG_D(MAC, "entering ulsch preprocesor\n");
-    ulsch_scheduler_pre_processor(module_idP, frameP, subframeP, first_rb);
+    ulsch_scheduler_pre_processor(module_idP, frameP, subframeP,sched_subframeP, first_rb);

    //LOG_D(MAC, "exiting ulsch preprocesor\n");