aboutsummaryrefslogtreecommitdiffstats
path: root/src/gprs_rlcmac_ts_alloc.cpp
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2013-12-25 20:22:35 +0100
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2014-01-15 10:34:09 +0100
commit8f399de135ae93a5f0841836846a7c54a600d5f0 (patch)
treeafb5940f370e9204deb8ae8875ced36d8747763a /src/gprs_rlcmac_ts_alloc.cpp
parentba263680400d5d22baee765f84783c8ba294dbd2 (diff)
tbf: Kill the tsc member as it duplicates data
We can just use first_ts and the trx/pdch to extract this information. Avoid duplication of data.
Diffstat (limited to 'src/gprs_rlcmac_ts_alloc.cpp')
-rw-r--r--src/gprs_rlcmac_ts_alloc.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index 8d8e7f04..44c0efb2 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -155,7 +155,6 @@ int alloc_algorithm_a(struct gprs_rlcmac_bts *bts,
return -EINVAL;
pdch = &tbf->trx->pdch[ts];
- tbf->tsc = pdch->tsc;
if (tbf->direction == GPRS_RLCMAC_UL_TBF) {
int8_t usf; /* must be signed */
@@ -274,7 +273,7 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts,
}
/* check if TSC changes */
if (tsc < 0)
- tbf->tsc = tsc = pdch->tsc;
+ tsc = pdch->tsc;
else if (tsc != pdch->tsc) {
LOGP(DRLCMAC, LOGL_ERROR, "Skipping TS %d of TRX=%d, "
"because it has different TSC than lower TS "
@@ -427,7 +426,7 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts,
}
/* check if TSC changes */
if (tsc < 0)
- tbf->tsc = tsc = pdch->tsc;
+ tsc = pdch->tsc;
else if (tsc != pdch->tsc) {
LOGP(DRLCMAC, LOGL_ERROR, "Skipping TS %d of "
"TRX=%d, because it has different TSC "