[PATCH] osmo-pcu[master]: Simplify TS alloc: avoid TS reassignment

[Max]

Review at  https://gerrit.osmocom.org/4085

Simplify TS alloc: avoid TS reassignment

Assign reserved_*_slots only when multislot masks are found to avoid
reassignment and make code easier to follow.

Change-Id: I9b0482f4ea75ead9855cd78e33c8e70d0ccf4484
Related: OS#2282
---
M src/gprs_rlcmac_ts_alloc.cpp
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/85/4085/1

diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index 76a84c7..4ab6543 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -850,8 +850,8 @@
                return -EINVAL;
        }
 
-       reserved_dl_slots = dl_slots = ms->reserved_dl_slots();
-       reserved_ul_slots = ul_slots = ms->reserved_ul_slots();
+       dl_slots = ms->reserved_dl_slots();
+       ul_slots = ms->reserved_ul_slots();
        first_common_ts = ms->first_common_ts();
        trx = ms->current_trx();
 
@@ -880,11 +880,11 @@
                rc = find_multi_slots(trx, ms, &ul_slots, &dl_slots);
                if (rc < 0)
                        return rc;
-
-               reserved_dl_slots = dl_slots;
-               reserved_ul_slots = ul_slots;
        }
 
+       reserved_dl_slots = dl_slots;
+       reserved_ul_slots = ul_slots;
+
        /* Step 3: Derive the slot set for the current TBF */
        if (single) {
                /* Make sure to consider the first common slot only */

-- 
To view, visit https://gerrit.osmocom.org/4085
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b0482f4ea75ead9855cd78e33c8e70d0ccf4484
Gerrit-PatchSet: 1
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Max <msur...@sysmocom.de>