aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2014-01-04 15:39:54 +0100
committerAndreas Eversberg <jolly@eversberg.eu>2014-01-04 15:52:00 +0100
commit24ba1d00aeb6f6bd99116486f979c65d272ad6f4 (patch)
treef898c7c42ce80a357053621e4570023d1c240586
parentb5f790a63a0e88639aba278345f83bf06a98d330 (diff)
alloc_algorithm_b: Increment 'i', so allocated TS will not exceed tx_range
-rw-r--r--src/gprs_rlcmac_ts_alloc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index 96fc092..e1e2498 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -400,7 +400,7 @@ static int select_ul_slots(gprs_rlcmac_trx *trx,
int i;
uint8_t ts_no;
- for (ts_no = tx_win_min, i = 0; i < tx_range; ts_no = (ts_no + 1) & 7) {
+ for (ts_no = tx_win_min, i = 0; i < tx_range; ts_no = (ts_no + 1) & 7, i++) {
gprs_rlcmac_pdch *pdch = &trx->pdch[ts_no];
/* check if enabled */
@@ -492,7 +492,7 @@ static int select_first_ts(gprs_rlcmac_trx *trx, uint8_t tx_win_min,
{
uint8_t ts_no;
int i;
- for (ts_no = tx_win_min, i = 0; i < tx_range; ts_no = (ts_no + 1) & 7) {
+ for (ts_no = tx_win_min, i = 0; i < tx_range; ts_no = (ts_no + 1) & 7, i++) {
gprs_rlcmac_pdch *pdch = &trx->pdch[ts_no];
/* check if enabled */
if (!pdch->is_enabled()) {