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

2011c7d6 · Cedric Roux · 2a44ae63 · 1c57eadd · 2011c7d6
Commit 2011c7d6 authored Mar 18, 2017 by Cedric Roux
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

openair1/SCHED/phy_procedures_lte_ue.c openair1/SCHED/phy_procedures_lte_ue.c +8 -6

No files found.
--- a/openair1/SCHED/phy_procedures_lte_ue.c
+++ b/openair1/SCHED/phy_procedures_lte_ue.c
@@ -2267,11 +2267,13 @@ void phy_procedures_UE_TX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,ui
  }
    
  // reset DL ACK/NACK status
+  if (ue->dlsch[proc->subframe_rx&0x1][eNB_id][0] != NULL)
    reset_ack(&ue->frame_parms,
               ue->dlsch[proc->subframe_rx&0x1][eNB_id][0]->harq_ack,
               subframe_tx,
               ue->ulsch[eNB_id]->o_ACK,0);

+  if (ue->dlsch_SI[eNB_id] != NULL)
    reset_ack(&ue->frame_parms,
             ue->dlsch_SI[eNB_id]->harq_ack,
             subframe_tx,