From 24ba1d00aeb6f6bd99116486f979c65d272ad6f4 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Sat, 4 Jan 2014 15:39:54 +0100 Subject: alloc_algorithm_b: Increment 'i', so allocated TS will not exceed tx_range --- src/gprs_rlcmac_ts_alloc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 96fc0927..e1e2498d 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()) { -- cgit v1.2.3