diff options
author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-12-25 20:33:37 +0100 |
---|---|---|
committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-01-15 10:39:08 +0100 |
commit | f34f34495b201a283d9cd2f8fc80c096a86cbeeb (patch) | |
tree | 80f1e117651d0f6f0f1b69f434962b42a184d653 /src/gprs_rlcmac_ts_alloc.cpp | |
parent | df022f6cb20bdaacc0217dfe54bdcc6d7a578c54 (diff) |
alloc: Simplify the assignment of Trb and Ttb
Put the cases for MS_A/MS_B and MS_A/MS_C together.
Diffstat (limited to 'src/gprs_rlcmac_ts_alloc.cpp')
-rw-r--r-- | src/gprs_rlcmac_ts_alloc.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index f48d8d4f..b8028aac 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -236,13 +236,9 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, Type = ms_class->type; /* Tta and Ttb may depend on hopping or frequency change */ - if (Ttb == MS_A) + if (Ttb == MS_A || Ttb == MS_B) Ttb = 0; - if (Trb == MS_A) - Trb = 0; - if (Ttb == MS_B) - Ttb = 0; - if (Trb == MS_C) + if (Trb == MS_A || Trb == MS_C) Trb = 0; LOGP(DRLCMAC, LOGL_DEBUG, "- Rx=%d Tx=%d Sum Rx+Tx=%s Tta=%s Ttb=%d " |