<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25771">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tbf: Document temporary change of control_ts and move code assigning it back to FSM<br><br>Change-Id: I1b7eb7802060778487e5729ee789b2323b6636f8<br>---<br>M src/pdch.cpp<br>M src/tbf_fsm.c<br>2 files changed, 8 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/pdch.cpp b/src/pdch.cpp</span><br><span>index dbdd47f..ca3a0ea 100644</span><br><span>--- a/src/pdch.cpp</span><br><span>+++ b/src/pdch.cpp</span><br><span>@@ -384,8 +384,6 @@</span><br><span>                      tbf_free(tbf);</span><br><span> </span><br><span>           osmo_fsm_inst_dispatch(new_tbf->state_fsm.fi, TBF_EV_ASSIGN_ACK_PACCH, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-                tbf_assign_control_ts(new_tbf);</span><br><span>              /* there might be LLC packets waiting in the queue, but the DL</span><br><span>                * TBF might have been released while the UL TBF has been</span><br><span>             * established */</span><br><span>@@ -417,8 +415,6 @@</span><br><span>                      tbf_free(tbf);</span><br><span> </span><br><span>           osmo_fsm_inst_dispatch(new_tbf->state_fsm.fi, TBF_EV_ASSIGN_ACK_PACCH, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-                tbf_assign_control_ts(new_tbf);</span><br><span>              return;</span><br><span> </span><br><span>  case PDCH_ULC_POLL_CELL_CHG_CONTINUE:</span><br><span>@@ -717,7 +713,13 @@</span><br><span>                         goto return_unref;</span><br><span>           }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-           /* set control ts to current MS's TS, until assignment complete */</span><br><span style="color: hsl(120, 100%, 40%);">+                /* Set control TS to the TS where this PktResReq was received,</span><br><span style="color: hsl(120, 100%, 40%);">+                 * which in practice happens to be the control_ts from the</span><br><span style="color: hsl(120, 100%, 40%);">+             * previous UL-TBF or SBA. When CTRL ACK is received as RRBP of the Pkt</span><br><span style="color: hsl(120, 100%, 40%);">+                * UL Ass scheduled below, then TBF_EV_ASSIGN_ACK_PACCH will be</span><br><span style="color: hsl(120, 100%, 40%);">+                * sent to tbf_fsm which will call tbf_assign_control_ts(),</span><br><span style="color: hsl(120, 100%, 40%);">+            * effectively setting back control_ts to</span><br><span style="color: hsl(120, 100%, 40%);">+              * tbf->initial_common_ts. */</span><br><span>             LOGPTBF(ul_tbf, LOGL_DEBUG, "change control TS %d -> %d until assignment is complete.\n",</span><br><span>                       ul_tbf->control_ts, ts_no);</span><br><span> </span><br><span>diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c</span><br><span>index 84d5bcc..36981e6 100644</span><br><span>--- a/src/tbf_fsm.c</span><br><span>+++ b/src/tbf_fsm.c</span><br><span>@@ -157,6 +157,7 @@</span><br><span>            mod_ass_type(ctx, GPRS_RLCMAC_FLAG_PACCH, true);</span><br><span>             break;</span><br><span>       case TBF_EV_ASSIGN_ACK_PACCH:</span><br><span style="color: hsl(120, 100%, 40%);">+         tbf_assign_control_ts(ctx->tbf);</span><br><span>          if (ctx->state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH)) {</span><br><span>                  /* We now know that the PACCH really existed */</span><br><span>                      LOGPTBF(ctx->tbf, LOGL_INFO,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25771">change 25771</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-pcu/+/25771"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1b7eb7802060778487e5729ee789b2323b6636f8 </div>
<div style="display:none"> Gerrit-Change-Number: 25771 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>