From 5eaa56e6ba0f773ed8cf7417f06f69783bae3ed7 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@softwareradiosystems.com>
Date: Fri, 19 Nov 2021 17:09:26 +0000
Subject: [PATCH] lib,rlc_am_nr: fix processing of ACKs

---
 lib/src/rlc/rlc_am_nr.cc | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/src/rlc/rlc_am_nr.cc b/lib/src/rlc/rlc_am_nr.cc
index a5d971fdf..1dae24781 100644
--- a/lib/src/rlc/rlc_am_nr.cc
+++ b/lib/src/rlc/rlc_am_nr.cc
@@ -239,19 +239,23 @@ void rlc_am_nr_tx::handle_control_pdu(uint8_t* payload, uint32_t nof_bytes)
    */
   // Process ACKs
   uint32_t stop_sn = status.N_nack == 0
-                         ? st.tx_next
-                         : status.nacks[0].nack_sn; // Stop processing ACKs at the first NACK, if it exists.
-  if (status.ack_sn >= st.tx_next_ack) {
-    for (uint32_t sn = st.tx_next_ack; sn < stop_sn; sn++) {
-      if (tx_window.has_sn(sn)) {
-        tx_window.remove_pdu(sn);
-        st.tx_next_ack = sn + 1;
-      } else {
-        logger->error("Missing ACKed SN from TX window");
-        break;
-      }
+                         ? status.ack_sn
+                         : status.nacks[0].nack_sn - 1; // Stop processing ACKs at the first NACK, if it exists.
+  if (stop_sn > st.tx_next) {
+    logger->error("Rx'ed ACK or NACK larger than TX_NEXT. Ignoring status report");
+    return;
+  }
+  for (uint32_t sn = st.tx_next_ack; sn < stop_sn; sn++) {
+    if (tx_window.has_sn(sn)) {
+      tx_window.remove_pdu(sn);
+      st.tx_next_ack = sn + 1;
+      // TODO notify PDCP
+    } else {
+      logger->error("Missing ACKed SN from TX window");
+      break;
     }
   }
+
   // Process N_acks
   for (uint32_t nack_idx = 0; nack_idx < status.N_nack; nack_idx++) {
     if (st.tx_next_ack <= status.nacks[nack_idx].nack_sn && status.nacks[nack_idx].nack_sn <= st.tx_next) {