<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/19195">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in MS RadioAccCap<br><br>If the information is not found in the message, 0 (unknown MS class)<br>will be returned. If the MS already had some previous information on the<br>MS class, let's not lose it by setting it back to 0.<br><br>Take the opportunity to drop related log lines which are no needed,<br>since set_(egprs_)ms_class() functions already log the value changes.<br><br>Change-Id: Icd52209fd4395d78dc770e7869d1b1fe45a18ca0<br>---<br>M src/pdch.cpp<br>M tests/tbf/TbfTest.err<br>2 files changed, 6 insertions(+), 19 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 98d7678..3436e5b 100644</span><br><span>--- a/src/pdch.cpp</span><br><span>+++ b/src/pdch.cpp</span><br><span>@@ -588,20 +588,13 @@</span><br><span> }</span><br><span> if (request->Exist_MS_Radio_Access_capability2) {</span><br><span> uint8_t ms_class, egprs_ms_class;</span><br><span style="color: hsl(0, 100%, 40%);">- ms_class = Decoding::get_ms_class_by_capability(</span><br><span style="color: hsl(0, 100%, 40%);">- &request->MS_Radio_Access_capability2);</span><br><span style="color: hsl(0, 100%, 40%);">- ms->set_ms_class(ms_class);</span><br><span style="color: hsl(0, 100%, 40%);">- egprs_ms_class =</span><br><span style="color: hsl(0, 100%, 40%);">- Decoding::get_egprs_ms_class_by_capability(</span><br><span style="color: hsl(0, 100%, 40%);">- &request->MS_Radio_Access_capability2);</span><br><span style="color: hsl(0, 100%, 40%);">- ms->set_egprs_ms_class(egprs_ms_class);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_class = Decoding::get_ms_class_by_capability(&request->MS_Radio_Access_capability2);</span><br><span style="color: hsl(120, 100%, 40%);">+ egprs_ms_class = Decoding::get_egprs_ms_class_by_capability(&request->MS_Radio_Access_capability2);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ms_class)</span><br><span style="color: hsl(120, 100%, 40%);">+ ms->set_ms_class(ms_class);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (egprs_ms_class)</span><br><span style="color: hsl(120, 100%, 40%);">+ ms->set_egprs_ms_class(egprs_ms_class);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ms->ms_class())</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRLCMAC, LOGL_NOTICE, "MS does not give us a class.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- if (ms->egprs_ms_class())</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRLCMAC, LOGL_INFO,</span><br><span style="color: hsl(0, 100%, 40%);">- "MS supports EGPRS multislot class %d.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ms->egprs_ms_class());</span><br><span> </span><br><span> ul_tbf = tbf_alloc_ul(bts_data(), ms, trx_no(), tlli);</span><br><span> if (!ul_tbf) {</span><br><span>diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err</span><br><span>index 6eb86cf..800d4f8 100644</span><br><span>--- a/tests/tbf/TbfTest.err</span><br><span>+++ b/tests/tbf/TbfTest.err</span><br><span>@@ -3111,7 +3111,6 @@</span><br><span> Modifying MS object, TLLI = 0x00000000, TA 220 -> 7</span><br><span> Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1</span><br><span style="color: hsl(0, 100%, 40%);">-MS supports EGPRS multislot class 1.</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/1</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS</span><br><span>@@ -3202,7 +3201,6 @@</span><br><span> Modifying MS object, TLLI = 0x00000000, TA 220 -> 7</span><br><span> Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1</span><br><span style="color: hsl(0, 100%, 40%);">-MS supports EGPRS multislot class 1.</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/1</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS</span><br><span>@@ -5840,7 +5838,6 @@</span><br><span> Modifying MS object, TLLI = 0x00000000, TA 220 -> 7</span><br><span> Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1</span><br><span style="color: hsl(0, 100%, 40%);">-MS supports EGPRS multislot class 1.</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/1</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS</span><br><span>@@ -6004,7 +6001,6 @@</span><br><span> Modifying MS object, TLLI = 0x00000000, TA 220 -> 7</span><br><span> Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1</span><br><span style="color: hsl(0, 100%, 40%);">-MS supports EGPRS multislot class 1.</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/1</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS</span><br><span>@@ -6329,7 +6325,6 @@</span><br><span> Modifying MS object, TLLI = 0x00000000, TA 220 -> 7</span><br><span> Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1</span><br><span style="color: hsl(0, 100%, 40%);">-MS supports EGPRS multislot class 1.</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/1</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS</span><br><span>@@ -7910,7 +7905,6 @@</span><br><span> MS requests UL TBF in packet resource request of single block, but there is no resource request scheduled!</span><br><span> Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11</span><br><span> Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11</span><br><span style="color: hsl(0, 100%, 40%);">-MS supports EGPRS multislot class 11.</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=11/11</span><br><span> [UL] Slot Allocation (Algorithm A) for class 11</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/19195">change 19195</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/+/19195"/><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: Icd52209fd4395d78dc770e7869d1b1fe45a18ca0 </div>
<div style="display:none"> Gerrit-Change-Number: 19195 </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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>