diff options
author | Daniel Willmann <daniel@totalueberwachung.de> | 2013-12-28 13:57:31 +0100 |
---|---|---|
committer | Daniel Willmann <daniel@totalueberwachung.de> | 2014-01-15 15:23:21 +0100 |
commit | f4a1ec6ce7bd38b829309fe7e04ef3d534d24581 (patch) | |
tree | 980185f62b311449e64404c3755783abdea308a2 /src | |
parent | c2fab7a6ff466f681ae47e8443efc222f60993a2 (diff) |
rlc: Rename the simple raise_v_r method to avoid naming conflicts
Diffstat (limited to 'src')
-rw-r--r-- | src/rlc.cpp | 2 | ||||
-rw-r--r-- | src/rlc.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rlc.cpp b/src/rlc.cpp index d115f767..0f481afc 100644 --- a/src/rlc.cpp +++ b/src/rlc.cpp @@ -172,7 +172,7 @@ void gprs_rlc_ul_window::raise_v_r(const uint16_t bsn, gprs_rlc_v_n *v_n) while (offset_v_r--) { if (offset_v_r) /* all except the received block */ v_n->mark_missing(v_r()); - raise_v_r(1); + raise_v_r_to(1); } LOGP(DRLCMACUL, LOGL_DEBUG, "- Raising V(R) to %d\n", v_r()); } @@ -94,7 +94,7 @@ struct gprs_rlc_ul_window { bool is_in_window(uint8_t bsn) const; void update_rbb(const gprs_rlc_v_n *v_n, char *rbb); - void raise_v_r(int moves); + void raise_v_r_to(int moves); void raise_v_r(const uint16_t bsn, gprs_rlc_v_n *v_n); uint16_t raise_v_q(gprs_rlc_v_n *v_n); @@ -347,7 +347,7 @@ inline const uint16_t gprs_rlc_ul_window::ssn() const return m_v_r; } -inline void gprs_rlc_ul_window::raise_v_r(int moves) +inline void gprs_rlc_ul_window::raise_v_r_to(int moves) { m_v_r = (m_v_r + moves) & mod_sns(); } |