tbf: Re-send dl assignment if we can upgrade to multislot

The current code would only ever assign one PDCH for the initial
assignment (from CCCH). Only if reuse_tbf is called the algorithm would
actually use multiple DL PDCHs if possible.

This patch introduced a tbf attribute upgrade_to_multislot that is set
if we have multiple PDCH configured, and support multislot assignment,
but can only assign a single PDCH (alloc_algorithm_b, parameter single
is set). In this case after the assignment completes (and the MS is
listening on a PDCH) we resend a DL assignment though the PACCH and this
time we can assign multiple timeslots.

1 files changed, 20 insertions, 2 deletions

diff --git a/src/tbf.cpp b/src/tbf.cpp
index dd1f0fb3..3a2ad735 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -574,11 +574,29 @@ void gprs_rlcmac_tbf::handle_timeout()
 					"in assign state\n", tbf_name(this));
 		}
 		if ((state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH))) {
-			/* change state to FLOW, so scheduler will start transmission */
 			dir.dl.wait_confirm = 0;
 			if (state_is(GPRS_RLCMAC_ASSIGN)) {
-				tbf_new_state(this, GPRS_RLCMAC_FLOW);
 				tbf_assign_control_ts(this);
+
+				if (!upgrade_to_multislot) {
+					/* change state to FLOW, so scheduler
+					 * will start transmission */
+					tbf_new_state(this, GPRS_RLCMAC_FLOW);
+					break;
+				}
+
+				/* This tbf can be upgraded to use multiple DL
+				 * timeslots and now that there is already one
+				 * slot assigned send another DL assignment via
+				 * PDCH. */
+
+				/* keep to flags */
+				state_flags &= GPRS_RLCMAC_FLAG_TO_MASK;
+				state_flags &= ~(1 << GPRS_RLCMAC_FLAG_CCCH);
+
+				update();
+
+				bts->trigger_dl_ass(this, this, NULL);
 			} else
 				LOGP(DRLCMAC, LOGL_NOTICE, "%s Continue flow after "
 					"IMM.ASS confirm\n", tbf_name(this));