aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2013-12-25 20:33:37 +0100
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2013-12-25 20:36:02 +0100
commit55e75a0a300acaf93162ca4fe721d86000facdf4 (patch)
treef6696ac75c9f34cb82cda13d211e5b95396f9e29
parente0166a6d6ce12dfc785374b5c21307a174723023 (diff)
alloc: Simplify the assignment of Trb and Ttb
Put the cases for MS_A/MS_B and MS_A/MS_C together.
-rw-r--r--src/gprs_rlcmac_ts_alloc.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index f48d8d4..b8028aa 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 "