<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/19194">View Change</a></p><div style="white-space:pre-wrap">Approvals:
lynxis lazus: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request<br><br>There's no real good explanation on why the DL TBF is dropped there,<br>since PKT RESOUCE REQUEST is used basically during UL TBF establishment.<br>Also, as decribed by TS 44.060 11.2.16 "Packet Resource Request":<br>"""<br>This message is sent on the PACCH by the mobile station to the network<br>to request a change in the uplink resources assigned.<br>"""<br><br>Change-Id: Iab4afb66f0d671f7ad54909d2685a1613e12ab4d<br>---<br>M src/pdch.cpp<br>M tests/tbf/TbfTest.err<br>2 files changed, 0 insertions(+), 36 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 6bddbfd..98d7678 100644</span><br><span>--- a/src/pdch.cpp</span><br><span>+++ b/src/pdch.cpp</span><br><span>@@ -549,7 +549,6 @@</span><br><span> </span><br><span> if (request->ID.UnionType) {</span><br><span> struct gprs_rlcmac_ul_tbf *ul_tbf;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_dl_tbf *dl_tbf;</span><br><span> uint32_t tlli = request->ID.u.TLLI;</span><br><span> bool found = true;</span><br><span> </span><br><span>@@ -564,7 +563,6 @@</span><br><span> </span><br><span> if (found) {</span><br><span> ul_tbf = ms->ul_tbf();</span><br><span style="color: hsl(0, 100%, 40%);">- dl_tbf = ms->dl_tbf();</span><br><span> /* We got a RACH so the MS was in packet idle mode and thus</span><br><span> * didn't have any active TBFs */</span><br><span> if (ul_tbf) {</span><br><span>@@ -573,12 +571,6 @@</span><br><span> tlli);</span><br><span> tbf_free(ul_tbf);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (dl_tbf) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTBFUL(dl_tbf, LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- "Got RACH from TLLI=0x%08x while TBF still exists. Release pending DL TBF\n",</span><br><span style="color: hsl(0, 100%, 40%);">- tlli);</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_free(dl_tbf);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> }</span><br><span> </span><br><span> LOGP(DRLCMAC, LOGL_DEBUG, "MS requests UL TBF "</span><br><span>diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err</span><br><span>index 0d097ee..6eb86cf 100644</span><br><span>--- a/tests/tbf/TbfTest.err</span><br><span>+++ b/tests/tbf/TbfTest.err</span><br><span>@@ -1885,13 +1885,6 @@</span><br><span> Found TFI=0.</span><br><span> +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++</span><br><span> ------------------------- RX : Uplink Control Block -------------------------</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) Got RACH from TLLI=0xf1223344 while TBF still exists. Release pending DL TBF</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) changes state from ASSIGN to RELEASING</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=RELEASING) free</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=RELEASING) stopping timer T0 [freeing TBF]</span><br><span style="color: hsl(0, 100%, 40%);">-PDCH(TS 7, TRX 0): Detaching TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=RELEASING), 0 TBFs, USFs = 00, TFIs = 00000000.</span><br><span style="color: hsl(0, 100%, 40%);">-Detaching TBF from MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=RELEASING)</span><br><span style="color: hsl(0, 100%, 40%);">-********** DL-TBF ends here **********</span><br><span> MS requests UL TBF in packet resource request of single block, so we provide one:</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/0</span><br><span>@@ -1925,27 +1918,6 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) [DOWNLINK] UPLINK ASSIGNED</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_WAIT_ACK to GPRS_RLCMAC_UL_ASS_NONE</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes state from ASSIGN to FLOW</span><br><span style="color: hsl(0, 100%, 40%);">-********** DL-TBF starts here **********</span><br><span style="color: hsl(0, 100%, 40%);">-Allocating DL TBF: MS_CLASS=1/0</span><br><span style="color: hsl(0, 100%, 40%);">-[DL] Slot Allocation (Algorithm A) for class 1</span><br><span style="color: hsl(0, 100%, 40%);">-- Skipping TS 0, because not enabled</span><br><span style="color: hsl(0, 100%, 40%);">-- Skipping TS 1, because not enabled</span><br><span style="color: hsl(0, 100%, 40%);">-- Skipping TS 2, because not enabled</span><br><span style="color: hsl(0, 100%, 40%);">-- Skipping TS 3, because not enabled</span><br><span style="color: hsl(0, 100%, 40%);">-- Skipping TS 4, because not enabled</span><br><span style="color: hsl(0, 100%, 40%);">-- Skipping TS 5, because not enabled</span><br><span style="color: hsl(0, 100%, 40%);">-- Skipping TS 6, because not enabled</span><br><span style="color: hsl(0, 100%, 40%);">-[DL] Assign downlink TS=7 TFI=0</span><br><span style="color: hsl(0, 100%, 40%);">-PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL), 1 TBFs, USFs = 01, TFIs = 00000001.</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 7</span><br><span style="color: hsl(0, 100%, 40%);">-Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 80</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) Trigger downlink assignment on PACCH</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL) Send dowlink assignment on PACCH, because TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) exists</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) changes DL ASS state from GPRS_RLCMAC_DL_ASS_NONE to GPRS_RLCMAC_DL_ASS_SEND_ASS</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL) changes state from NULL to ASSIGN</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) set ass. type PACCH [prev CCCH:0, PACCH:0]</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) starting timer T0 [assignment (PACCH)] with 2 sec. 0 microsec, cur_fn=0</span><br><span> Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) UL DATA TFI=0 received (V(Q)=0 .. V(R)=0)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) restarting timer T3169 [acked (data)] with 5 sec. 0 microsec, cur_fn=0</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/19194">change 19194</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/+/19194"/><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: Iab4afb66f0d671f7ad54909d2685a1613e12ab4d </div>
<div style="display:none"> Gerrit-Change-Number: 19194 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>