Change in osmo-pcu[master]: tbf: Document temporary change of control_ts and move code assigning ...

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25771 )


Change subject: tbf: Document temporary change of control_ts and move code assigning it back to FSM
......................................................................

tbf: Document temporary change of control_ts and move code assigning it back to FSM

Change-Id: I1b7eb7802060778487e5729ee789b2323b6636f8
---
M src/pdch.cpp
M src/tbf_fsm.c
2 files changed, 8 insertions(+), 5 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/71/25771/1

diff --git a/src/pdch.cpp b/src/pdch.cpp
index dbdd47f..ca3a0ea 100644
--- a/src/pdch.cpp
+++ b/src/pdch.cpp
@@ -384,8 +384,6 @@
 			tbf_free(tbf);
 
 		osmo_fsm_inst_dispatch(new_tbf->state_fsm.fi, TBF_EV_ASSIGN_ACK_PACCH, NULL);
-
-		tbf_assign_control_ts(new_tbf);
 		/* there might be LLC packets waiting in the queue, but the DL
 		 * TBF might have been released while the UL TBF has been
 		 * established */
@@ -417,8 +415,6 @@
 			tbf_free(tbf);
 
 		osmo_fsm_inst_dispatch(new_tbf->state_fsm.fi, TBF_EV_ASSIGN_ACK_PACCH, NULL);
-
-		tbf_assign_control_ts(new_tbf);
 		return;
 
 	case PDCH_ULC_POLL_CELL_CHG_CONTINUE:
@@ -717,7 +713,13 @@
 			goto return_unref;
 		}
 
-		/* set control ts to current MS's TS, until assignment complete */
+		/* Set control TS to the TS where this PktResReq was received,
+		 * which in practice happens to be the control_ts from the
+		 * previous UL-TBF or SBA. When CTRL ACK is received as RRBP of the Pkt
+		 * UL Ass scheduled below, then TBF_EV_ASSIGN_ACK_PACCH will be
+		 * sent to tbf_fsm which will call tbf_assign_control_ts(),
+		 * effectively setting back control_ts to
+		 * tbf->initial_common_ts. */
 		LOGPTBF(ul_tbf, LOGL_DEBUG, "change control TS %d -> %d until assignment is complete.\n",
 			ul_tbf->control_ts, ts_no);
 
diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c
index 84d5bcc..36981e6 100644
--- a/src/tbf_fsm.c
+++ b/src/tbf_fsm.c
@@ -157,6 +157,7 @@
 		mod_ass_type(ctx, GPRS_RLCMAC_FLAG_PACCH, true);
 		break;
 	case TBF_EV_ASSIGN_ACK_PACCH:
+		tbf_assign_control_ts(ctx->tbf);
 		if (ctx->state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH)) {
 			/* We now know that the PACCH really existed */
 			LOGPTBF(ctx->tbf, LOGL_INFO,

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25771
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I1b7eb7802060778487e5729ee789b2323b6636f8
Gerrit-Change-Number: 25771
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211013/15a4212b/attachment.htm>