commit f34f34495b201a283d9cd2f8fc80c096a86cbeeb
author Holger Hans Peter Freyther <holger@moiji-mobile.com> Wed Dec 25 20:33:37 2013 +0100
committer Holger Hans Peter Freyther <holger@moiji-mobile.com> Wed Jan 15 10:39:08 2014 +0100
tree 80f1e117651d0f6f0f1b69f434962b42a184d653
parent df022f6cb20bdaacc0217dfe54bdcc6d7a578c54

alloc: Simplify the assignment of Trb and Ttb

Put the cases for MS_A/MS_B and MS_A/MS_C together.

src/gprs_rlcmac_ts_alloc.cpp

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 @@
 	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 "