Commit 4387070c authored by Xu Bo's avatar Xu Bo
Browse files

fix merge bug

parent 9c820805
...@@ -1169,7 +1169,7 @@ schedule_ulsch_rnti(module_id_t module_idP, ...@@ -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; nfapi_ul_config_request_body_t *ul_req_tmp_body = &ul_req_tmp->ul_config_request_body;
//LOG_D(MAC, "entering ulsch preprocesor\n"); //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"); //LOG_D(MAC, "exiting ulsch preprocesor\n");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment