<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18965">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Avoid selecting channels from administratively locked trx<br><br>Found while playing with "rf_locked 1" on a 2TRX setup with channel<br>allocator descend. After applying the setting, the 1st TRX is still used<br>to allocate the channels. After this patch is applied, the BSC correctly<br>allocates channels from TRX0.<br><br>Change-Id: I5201d2749363c9cbd0706177bde09117b163cbe3<br>---<br>M src/osmo-bsc/gsm_data.c<br>M tests/handover/handover_test.c<br>2 files changed, 10 insertions(+), 4 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/65/18965/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 9bf6f82..2f2b2c8 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -1459,10 +1459,13 @@</span><br><span> }</span><br><span> </span><br><span> bool nm_is_running(const struct gsm_nm_state *s) {</span><br><span style="color: hsl(0, 100%, 40%);">-  return (s->operational == NM_OPSTATE_ENABLED) && (</span><br><span style="color: hsl(0, 100%, 40%);">-           (s->availability == NM_AVSTATE_OK) ||</span><br><span style="color: hsl(0, 100%, 40%);">-                (s->availability == 0xff)</span><br><span style="color: hsl(0, 100%, 40%);">-    );</span><br><span style="color: hsl(120, 100%, 40%);">+    if (s->operational != NM_OPSTATE_ENABLED)</span><br><span style="color: hsl(120, 100%, 40%);">+          return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((s->availability != NM_AVSTATE_OK) && (s->availability != 0xff))</span><br><span style="color: hsl(120, 100%, 40%);">+            return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (s->administrative != NM_STATE_UNLOCKED)</span><br><span style="color: hsl(120, 100%, 40%);">+                return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span> }</span><br><span> </span><br><span> /* determine the logical channel type based on the physical channel type */</span><br><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index b08e2a3..1a756cd 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -197,14 +197,17 @@</span><br><span> </span><br><span>        bts->c0->mo.nm_state.operational = NM_OPSTATE_ENABLED;</span><br><span>         bts->c0->mo.nm_state.availability = NM_AVSTATE_OK;</span><br><span style="color: hsl(120, 100%, 40%);">+      bts->c0->mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span>       bts->c0->bb_transc.mo.nm_state.operational = NM_OPSTATE_ENABLED;</span><br><span>       bts->c0->bb_transc.mo.nm_state.availability = NM_AVSTATE_OK;</span><br><span style="color: hsl(120, 100%, 40%);">+    bts->c0->bb_transc.mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span> </span><br><span>         /* 4 full rate and 4 half rate channels */</span><br><span>   for (i = 1; i <= 6; i++) {</span><br><span>                bts->c0->ts[i].pchan_from_config = (i < 5) ? GSM_PCHAN_TCH_F : GSM_PCHAN_TCH_H;</span><br><span>             bts->c0->ts[i].mo.nm_state.operational = NM_OPSTATE_ENABLED;</span><br><span>           bts->c0->ts[i].mo.nm_state.availability = NM_AVSTATE_OK;</span><br><span style="color: hsl(120, 100%, 40%);">+                bts->c0->ts[i].mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span>         }</span><br><span> </span><br><span>        for (i = 0; i < ARRAY_SIZE(bts->c0->ts); i++) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18965">change 18965</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/+/18965"/><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: I5201d2749363c9cbd0706177bde09117b163cbe3 </div>
<div style="display:none"> Gerrit-Change-Number: 18965 </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-MessageType: newchange </div>