From 367e07634722993788a59c3e36f0cbc9fa181a48 Mon Sep 17 00:00:00 2001 From: jftt_wangshanshan Date: Tue, 6 Feb 2018 11:58:25 +0800 Subject: [PATCH] Fix merge bug in return value of ul_ACK_subframe2_dl_frame --- openair1/SCHED/phy_procedures_lte_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openair1/SCHED/phy_procedures_lte_common.c b/openair1/SCHED/phy_procedures_lte_common.c index fc63c12b8e..83ba5b4b97 100644 --- a/openair1/SCHED/phy_procedures_lte_common.c +++ b/openair1/SCHED/phy_procedures_lte_common.c @@ -336,7 +336,7 @@ unsigned char ul_ACK_subframe2_dl_subframe(LTE_DL_FRAME_PARMS *frame_parms,unsig return(0); } -unsigned char ul_ACK_subframe2_dl_frame(LTE_DL_FRAME_PARMS *frame_parms,int frame, unsigned char subframe,unsigned char subframe_tx) +int ul_ACK_subframe2_dl_frame(LTE_DL_FRAME_PARMS *frame_parms,int frame, unsigned char subframe,unsigned char subframe_tx) { if (frame_parms->frame_type == FDD) {