From 7c3751b10bff1887e4981aa787c913aa4c812da2 Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Sat, 28 Dec 2013 13:59:24 +0100 Subject: rlc/tbf: Move v_n into gprs_rlc_ul_window and adapt the tests v_n is part of the UL window handling so move it inside the ul_window --- src/tbf.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/tbf.cpp') diff --git a/src/tbf.cpp b/src/tbf.cpp index a91193d2..9276c416 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -1606,14 +1606,14 @@ int gprs_rlcmac_tbf::rcv_data_block_acknowledged(const uint8_t *data, size_t len rh->bsn, dir.ul.window.v_q(), (dir.ul.window.v_q() + ws - 1) & mod_sns); - dir.ul.v_n.mark_received(rh->bsn); - dir.ul.window.raise_v_r(rh->bsn, &dir.ul.v_n); + dir.ul.window.m_v_n.mark_received(rh->bsn); + dir.ul.window.raise_v_r(rh->bsn); /* Raise V(Q) if possible, and retrieve LLC frames from blocks. * This is looped until there is a gap (non received block) or * the window is empty.*/ const uint16_t v_q_beg = dir.ul.window.v_q(); - const uint16_t count = dir.ul.window.raise_v_q(&dir.ul.v_n); + const uint16_t count = dir.ul.window.raise_v_q(); /* Retrieve LLC frames from blocks that are ready */ for (uint16_t i = 0; i < count; ++i) { -- cgit v1.2.3