<p>dexter <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25765">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts: set ncc_permitted from bts_alloc<br><br>The value ncc_permitted is preset in osmo_bsc_main.c from<br>bootstrap_bts(). It is a constant value that also cannot be changed via<br>the VTY. Therefore it should be set from bts_alloc(). This also fixes<br>the problem that when the BTS is added at runtime from the VTY. BTSs<br>added at runtime would have an all zero ncc_permitted until the next<br>restart of osmo_bsc.<br><br>Change-Id: I9f02277d7b4b4bcb383e749435416a0b22efd5e8<br>Related: SYS#5369<br>---<br>M src/osmo-bsc/bts.c<br>M src/osmo-bsc/osmo_bsc_main.c<br>M tests/gsm0408/gsm0408_test.ok<br>3 files changed, 2 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index 092c790..fe18b59 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -273,6 +273,7 @@</span><br><span> bts->si_common.chan_desc.t3212 = osmo_tdef_get(net->T_defs, 3212, OSMO_TDEF_CUSTOM, -1);</span><br><span> bts->si_common.cell_options.pwrc = 0; /* PWRC not set */</span><br><span> bts->si_common.cell_sel_par.acs = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->si_common.ncc_permitted = 0xff;</span><br><span> gsm_bts_set_radio_link_timeout(bts, 32); /* Use RADIO LINK TIMEOUT of 32 */</span><br><span> </span><br><span> INIT_LLIST_HEAD(&bts->abis_queue);</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index 28a56a7..3a1a673 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_main.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>@@ -510,8 +510,6 @@</span><br><span> bts->si_common.chan_desc.ccch_conf = (n << 1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->si_common.ncc_permitted = 0xff;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* ACC ramping is initialized from vty/config */</span><br><span> </span><br><span> /* Initialize the BTS state */</span><br><span>diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok</span><br><span>index b22d0c2..0bb7ee0 100644</span><br><span>--- a/tests/gsm0408/gsm0408_test.ok</span><br><span>+++ b/tests/gsm0408/gsm0408_test.ok</span><br><span>@@ -169,7 +169,7 @@</span><br><span> BTS deallocated OK in test_si2q_long()</span><br><span> BTS allocation OK in test_si_ba_ind()</span><br><span> Testing if BA-IND is set as expected in SI2xxx and SI5xxx</span><br><span style="color: hsl(0, 100%, 40%);">-SI2: 59 06 1a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 e5 04 00 </span><br><span style="color: hsl(120, 100%, 40%);">+SI2: 59 06 1a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ff e5 04 00 </span><br><span> SI2bis: 55 06 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 e5 04 00 2b </span><br><span> SI2ter: 49 06 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 2b 2b 2b 2b </span><br><span> SI5: 06 1d 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25765">change 25765</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/+/25765"/><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: I9f02277d7b4b4bcb383e749435416a0b22efd5e8 </div>
<div style="display:none"> Gerrit-Change-Number: 25765 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@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-MessageType: merged </div>