From 4387070cda914ac3cd605df46309722d3718066c Mon Sep 17 00:00:00 2001
From: Xu Bo <xubo1@cn.fujtisu.com>
Date: Mon, 5 Feb 2018 17:25:57 +0900
Subject: [PATCH] fix merge bug
---
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
index 09c7bc84e2..ab3f32c83c 100644
--- 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");
--
GitLab