maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ulsim-bugfix-w11' into develop_integration_w11

Browse Source
This commit is contained in:
Cedric Roux
2017-03-18 00:10:50 +01:00
parent 2a44ae639e 1c57eadd33
commit 2011c7d689
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SCHED/phy_procedures_lte_ue.c
+7 -5
View File
@@ -2267,12 +2267,14 @@ void phy_procedures_UE_TX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,ui
} }
// reset DL ACK/NACK status // reset DL ACK/NACK status
reset_ack(&ue->frame_parms, if (ue->dlsch[proc->subframe_rx&0x1][eNB_id][0] != NULL)
ue->dlsch[proc->subframe_rx&0x1][eNB_id][0]->harq_ack, reset_ack(&ue->frame_parms,
subframe_tx, ue->dlsch[proc->subframe_rx&0x1][eNB_id][0]->harq_ack,
ue->ulsch[eNB_id]->o_ACK,0); subframe_tx,
ue->ulsch[eNB_id]->o_ACK,0);
reset_ack(&ue->frame_parms, if (ue->dlsch_SI[eNB_id] != NULL)
reset_ack(&ue->frame_parms,
ue->dlsch_SI[eNB_id]->harq_ack, ue->dlsch_SI[eNB_id]->harq_ack,
subframe_tx, subframe_tx,
ue->ulsch[eNB_id]->o_ACK,0); ue->ulsch[eNB_id]->o_ACK,0);