Skip to content

O
OpenXG-RAN
Commit 45340318 authored by wujing's avatar wujing Committed by Haruki NAOI
Browse files
Options

Fix the issue that go into else if route which cause process abort even if ack 

(cherry picked from commit af12c48237f7816c5671ca4d436b08ddd51718fe)
parent bb6d772d
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @ 45340318
...@@ -4671,9 +4671,7 @@ extract_harq(module_id_t mod_idP, ...@@ -4671,9 +4671,7 @@ extract_harq(module_id_t mod_idP,
/* CDRX: PUCCH gives an ACK, so reset corresponding HARQ RTT */ /* CDRX: PUCCH gives an ACK, so reset corresponding HARQ RTT */
sched_ctl->harq_rtt_timer[CC_idP][harq_pid] = 0; sched_ctl->harq_rtt_timer[CC_idP][harq_pid] = 0;
} } else if ((num_ack_nak == 2)
if ((num_ack_nak == 2)
&& (sched_ctl->round[CC_idP][harq_pid][select_tb] < 8) && (sched_ctl->round[CC_idP][harq_pid][select_tb] < 8)
&& (sched_ctl->round[CC_idP][harq_pid][oppose_tb] < 8) && (sched_ctl->round[CC_idP][harq_pid][oppose_tb] < 8)
&& ((pdu[select_tb] == 2) || (pdu[select_tb] == 4)) && ((pdu[select_tb] == 2) || (pdu[select_tb] == 4))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment