diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-07-13 15:15:18 +0200 |
|---|---|---|
| committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-07-16 18:51:40 +0200 |
| commit | 2b558857dd720ea0a743d2656873a8c472ecd6b9 (patch) | |
| tree | e2d38eae36626877bab5334fc6231e25c2cced80 /src | |
| parent | a8c2aaf6f05d5e25665e8cbb2b415c6a2ad34d8b (diff) | |
alloc: Remove redundant first_common_ts handling
Currently this code path is only used, if an allocation has been
taken place in a former call to an allocation algorithm function.
If this was for an DL TBF, the first common TS was selected,
otherwise the least used common TS was selected for an UL TBF.
The shrinking of the UL set (to 1<<first_common_ts) is done in the
latter case.
This commit removes an additional code path that aligns the UL set to
first_common_ts, because it has no more influence on the set of
common TS after both UL and DL TBF have been allocated.
Sponsored-by: On-Waves ehf
Diffstat (limited to 'src')
| -rw-r--r-- | src/gprs_rlcmac_ts_alloc.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index b6f58861..22e03754 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -828,23 +828,6 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, ul_slots = dl_slots = lsb(dl_slots & ul_slots); else ul_slots = dl_slots = (dl_slots & ul_slots) & (1<<ts); - } else if (first_common_ts > 0) { - /* Make sure to keep the common TBF */ - uint8_t disable_dl_slots; - - /* Mark all slots below the common TBF, e.g. cTS=4 -> xxx----- */ - disable_dl_slots = (1 << (first_common_ts - 1)) - 1; - - /* Only disable common slots in that set */ - disable_dl_slots &= (dl_slots & ul_slots); - - /* Remove them from the uplink set */ - ul_slots &= ~disable_dl_slots; - - /* The disabled UL slots will not be used again for subsequent - * TBF, do not reserve them anymore */ - if (disable_dl_slots) - ms->set_reserved_slots(tbf->trx, ul_slots, dl_slots); } if (dl_slots == 0) { |