<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11956">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: trx_count_free_ts: Fix counting of GSM_PCHAN_PDCH<br><br>PDCH were not counted since ts_for_each_lchan translates to<br>ts_as_pchan_for_each_lchan(GSM_PCHAN_PDCH), and then pchan_subslots()<br>returns 0 through subslots_per_pchan.<br><br>Change-Id: I7a785b70fd0a34a52504e9a46b4b27889463f67e<br>---<br>M src/osmo-bsc/gsm_data.c<br>1 file changed, 9 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/56/11956/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 6d39642..f9cdd4f 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -1616,7 +1616,11 @@</span><br><span>                        continue;</span><br><span> </span><br><span>                if (ts->pchan_is == GSM_PCHAN_PDCH) {</span><br><span style="color: hsl(0, 100%, 40%);">-                        /* Dynamic timeslots in PDCH mode will become TCH if needed. */</span><br><span style="color: hsl(120, 100%, 40%);">+                       /* PDCH TS don't appear in ts_for_each_lchan */</span><br><span style="color: hsl(120, 100%, 40%);">+                   if (pchan == GSM_PCHAN_PDCH && lchan_state_is(lchan, LCHAN_ST_UNUSED))</span><br><span style="color: hsl(120, 100%, 40%);">+                                count++;</span><br><span style="color: hsl(120, 100%, 40%);">+                      /* Dynamic timeslots in PDCH mode will become TCH if needed,</span><br><span style="color: hsl(120, 100%, 40%);">+                     and since now pchan is PDCH, we now they are unused. */</span><br><span>                   switch (ts->pchan_on_init) {</span><br><span>                      case GSM_PCHAN_TCH_F_PDCH:</span><br><span>                           if (pchan == GSM_PCHAN_TCH_F)</span><br><span>@@ -1630,9 +1634,11 @@</span><br><span>                                       count += 2;</span><br><span>                          continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-                   default:</span><br><span style="color: hsl(0, 100%, 40%);">-                                /* Not dynamic, not applicable. */</span><br><span style="color: hsl(120, 100%, 40%);">+                    case GSM_PCHAN_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+                          /* PDCH Already counted before switch statement */</span><br><span>                           continue;</span><br><span style="color: hsl(120, 100%, 40%);">+                     default:</span><br><span style="color: hsl(120, 100%, 40%);">+                              OSMO_ASSERT(false);</span><br><span>                  }</span><br><span>            }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11956">change 11956</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/11956"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I7a785b70fd0a34a52504e9a46b4b27889463f67e </div>
<div style="display:none"> Gerrit-Change-Number: 11956 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>