cellular-infrastructure
/
osmo-pcu
mirror of https://gerrit.osmocom.org/osmo-pcu
9
0
Fork 1
Code Issues Releases Wiki Activity

rlc: Rename the simple raise_v_r method to avoid naming conflicts

This commit is contained in:
Daniel Willmann 2013-12-28 13:57:31 +01:00
parent c2fab7a6ff
commit f4a1ec6ce7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rlc.cpp
View File

@ -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--) { while (offset_v_r--) {
if (offset_v_r) /* all except the received block */ if (offset_v_r) /* all except the received block */
v_n->mark_missing(v_r()); 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()); LOGP(DRLCMACUL, LOGL_DEBUG, "- Raising V(R) to %d\n", v_r());
} }

4
src/rlc.h
View File

@ -94,7 +94,7 @@ struct gprs_rlc_ul_window {
bool is_in_window(uint8_t bsn) const; bool is_in_window(uint8_t bsn) const;
void update_rbb(const gprs_rlc_v_n *v_n, char *rbb); 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); 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); 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; 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(); m_v_r = (m_v_r + moves) & mod_sns();
} }