Fix merge bug in return value of ul_ACK_subframe2_dl_frame

367e0763 · jftt_wangshanshan · 5c76360c · 367e0763
Commit 367e0763 authored Feb 06, 2018 by jftt_wangshanshan
--- 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) {