aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Erlbeck <jerlbeck@sysmocom.de>2015-07-14 12:57:07 +0200
committerJacob Erlbeck <jerlbeck@sysmocom.de>2015-07-16 19:24:15 +0200
commit40da3e17e5b3d4cf199cb868d561f98c35b93147 (patch)
tree7b55899907523a1564047fe5e61c7126558e91d7
parent5a2b8be3f5c9659cedb56855d2741accfdaeab3d (diff)
alloc: Remove disabled code fragment for multi-UL allocation
This part of algorithm_b has already been disabled. Further work may depend on this, but it is going out of sync. So this commit removes it completely. Sponsored-by: On-Waves ehf
-rw-r--r--src/gprs_rlcmac_ts_alloc.cpp21
1 files changed, 0 insertions, 21 deletions
diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index e1e0055..a29e5db 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -918,27 +918,6 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts,
reserved_ul_slots = ul_slots;
avail_count = bitcount(reserved_ul_slots);
-#if 0 /* This code assigns multiple slots for UL (and wastes USFs that way) */
- for (ts = 0; ts < 8; ts++) {
- if (!(ul_slots & (1 << ts)))
- continue;
-
- free_usf = find_free_usf(&tbf->trx->pdch[ts]);
- if (free_usf < 0) {
- LOGP(DRLCMAC, LOGL_DEBUG,
- "- Skipping TS %d, because "
- "no USF available\n", ts);
- continue;
- }
-
- LOGP(DRLCMAC, LOGL_DEBUG, "- Assigning UL TS "
- "%d\n", ts);
- assign_uplink_tbf_usf(&tbf->trx->pdch[ts], ul_tbf, free_usf);
- slotcount++;
- if (slotcount == 1)
- ul_tbf->first_ts = ts;
- }
-#endif
}
first_common_ts = ffs(dl_slots & ul_slots) - 1;