<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25940">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  osmith: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Properly handle dyn TS TCH with vamos after updating subslots_per_pchan<br><br>In the case of ts->pchan_from_config=GSM_PCHAN_OSMO_DYN,<br>ts->max_primary_lchans will be 8 due to SDCCH8 support, and we don't<br>want to set lchan->vamos.is_secondary=true for lchans at the end of the<br>array.<br><br>Related: OS#5278<br>Change-Id: If86af5fafe059d5e830c1f6d37034f7325d9a96c<br>---<br>M src/osmo-bsc/timeslot_fsm.c<br>1 file changed, 10 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c</span><br><span>index 93fc380..86fea3c 100644</span><br><span>--- a/src/osmo-bsc/timeslot_fsm.c</span><br><span>+++ b/src/osmo-bsc/timeslot_fsm.c</span><br><span>@@ -201,19 +201,24 @@</span><br><span> {</span><br><span>       int i;</span><br><span>       struct gsm_lchan *lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+      uint8_t max_lchans_possible_vamos;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         ts->pchan_is = pchan_is;</span><br><span>  ts->max_primary_lchans = pchan_subslots(ts->pchan_is);</span><br><span style="color: hsl(0, 100%, 40%);">-    LOG_TS(ts, LOGL_DEBUG, "pchan_is=%s max_primary_lchans=%d max_lchans_possible=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">-         gsm_pchan_name(ts->pchan_is), ts->max_primary_lchans, ts->max_lchans_possible);</span><br><span style="color: hsl(120, 100%, 40%);">+       max_lchans_possible_vamos = pchan_subslots_vamos(ts->pchan_is);</span><br><span style="color: hsl(120, 100%, 40%);">+    LOG_TS(ts, LOGL_DEBUG, "pchan_is=%s max_primary_lchans=%d max_lchans_possible=%d (%u VAMOS)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+            gsm_pchan_name(ts->pchan_is), ts->max_primary_lchans, ts->max_lchans_possible,</span><br><span style="color: hsl(120, 100%, 40%);">+               max_lchans_possible_vamos);</span><br><span>   switch (ts->pchan_is) {</span><br><span>   case GSM_PCHAN_TCH_F:</span><br><span>        case GSM_PCHAN_TCH_H:</span><br><span>                for (i = 0; i < ts->max_lchans_possible; i++) {</span><br><span>                        lchan = &ts->lchan[i];</span><br><span style="color: hsl(0, 100%, 40%);">-                   if (i < ts->max_primary_lchans)</span><br><span style="color: hsl(0, 100%, 40%);">-                           lchan->vamos.is_secondary = false;</span><br><span style="color: hsl(0, 100%, 40%);">-                   else</span><br><span style="color: hsl(120, 100%, 40%);">+                  if (i >= ts->max_primary_lchans &&</span><br><span style="color: hsl(120, 100%, 40%);">+                          (i - ts->max_primary_lchans) < (int)max_lchans_possible_vamos)</span><br><span>                             lchan->vamos.is_secondary = true;</span><br><span style="color: hsl(120, 100%, 40%);">+                  else</span><br><span style="color: hsl(120, 100%, 40%);">+                          lchan->vamos.is_secondary = false;</span><br><span>                        lchan_fsm_update_id(lchan);</span><br><span>          }</span><br><span>            break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25940">change 25940</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-bsc/+/25940"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If86af5fafe059d5e830c1f6d37034f7325d9a96c </div>
<div style="display:none"> Gerrit-Change-Number: 25940 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>