From ad320c273e15dad84a0ce0de2accc1823684f39c Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Tue, 13 Apr 2021 12:15:26 +0200
Subject: [PATCH] proc_bsr_nr: cancel SR if UL grant is received

---
 srsue/src/stack/mac_nr/proc_bsr_nr.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srsue/src/stack/mac_nr/proc_bsr_nr.cc b/srsue/src/stack/mac_nr/proc_bsr_nr.cc
index afb6aca56..40980cfc7 100644
--- a/srsue/src/stack/mac_nr/proc_bsr_nr.cc
+++ b/srsue/src/stack/mac_nr/proc_bsr_nr.cc
@@ -256,6 +256,10 @@ void proc_bsr_nr::new_grant_ul(uint32_t grant_size)
     // 3> start or restart retxBSR-Timer.
     timer_retx.run();
   }
+
+  // Cancel SR if an UL grant is received
+  logger.debug("BSR:   Cancelling SR procedure due to UL grant");
+  sr->reset();
 }
 
 // This function is called by MUX only if Regular BSR has not been triggered before