From 27b7431cf487f96eca66bfbaf039e15f90ff43cc Mon Sep 17 00:00:00 2001 From: Cedric Roux Date: Fri, 4 Jan 2019 15:41:34 +0100 Subject: [PATCH] bugfix: fix some merge error --- openair1/SCHED/phy_procedures_lte_eNb.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c index 519a0ea512..8978f79f37 100755 --- a/openair1/SCHED/phy_procedures_lte_eNb.c +++ b/openair1/SCHED/phy_procedures_lte_eNb.c @@ -1779,12 +1779,13 @@ void fill_ulsch_harq_indication (PHY_VARS_eNB * eNB, LTE_UL_eNB_HARQ_t * ulsch_h release_harq(eNB,UE_id,1,frame,subframe,1<o_ACK[i] == 1); } } - //LOG_E(PHY,"eNB->UL_INFO.harq_ind.harq_indication_body.number_of_harqs:%d\n", eNB->UL_INFO.harq_ind.harq_indication_body.number_of_harqs); - eNB->UL_INFO.harq_ind.harq_indication_body.number_of_harqs++; - - pthread_mutex_unlock(&eNB->UL_INFO_mutex); - } + + //LOG_E(PHY,"eNB->UL_INFO.harq_ind.harq_indication_body.number_of_harqs:%d\n", eNB->UL_INFO.harq_ind.harq_indication_body.number_of_harqs); + eNB->UL_INFO.harq_ind.harq_indication_body.number_of_harqs++; + + pthread_mutex_unlock(&eNB->UL_INFO_mutex); + } void fill_uci_harq_indication (PHY_VARS_eNB * eNB, LTE_eNB_UCI * uci, int frame, int subframe, uint8_t * harq_ack, uint8_t tdd_mapping_mode, uint16_t tdd_multiplexing_mask) {