<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/21027">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  dexter: Looks good to me, approved; Verified
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fixup: vty: call bts_model_vty_init() from bts_vty_init()<br><br>Now bts_model_vty_init() must be called only once, otherwise the<br>process would crash when bts_model_init() is called from main().<br><br>Change-Id: I262c39896b5db86c54ad9aa7042c7ca6657815d9<br>Related: SYS#4937, OS#3036<br>---<br>M src/osmo-bts-litecell15/main.c<br>M src/osmo-bts-oc2g/main.c<br>M src/osmo-bts-octphy/l1_if.c<br>M src/osmo-bts-sysmo/main.c<br>M src/osmo-bts-trx/main.c<br>M src/osmo-bts-virtual/main.c<br>6 files changed, 0 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-litecell15/main.c b/src/osmo-bts-litecell15/main.c</span><br><span>index e29efd5..985d7db 100644</span><br><span>--- a/src/osmo-bts-litecell15/main.c</span><br><span>+++ b/src/osmo-bts-litecell15/main.c</span><br><span>@@ -112,8 +112,6 @@</span><br><span> </span><br><span>      bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      bts_model_vty_init(bts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>     return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c</span><br><span>index 9b0ebec..12c489f 100644</span><br><span>--- a/src/osmo-bts-oc2g/main.c</span><br><span>+++ b/src/osmo-bts-oc2g/main.c</span><br><span>@@ -113,8 +113,6 @@</span><br><span> </span><br><span>    bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      bts_model_vty_init(bts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>     return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c</span><br><span>index 4dc399e..f69a535 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_if.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_if.c</span><br><span>@@ -781,8 +781,6 @@</span><br><span>    osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1);</span><br><span>        osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       bts_model_vty_init(bts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>     return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c</span><br><span>index 9befcda..2057a05 100644</span><br><span>--- a/src/osmo-bts-sysmo/main.c</span><br><span>+++ b/src/osmo-bts-sysmo/main.c</span><br><span>@@ -80,8 +80,6 @@</span><br><span>      bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP);</span><br><span>       bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    bts_model_vty_init(bts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>     return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c</span><br><span>index 166af7e..021c3c7 100644</span><br><span>--- a/src/osmo-bts-trx/main.c</span><br><span>+++ b/src/osmo-bts-trx/main.c</span><br><span>@@ -147,8 +147,6 @@</span><br><span> </span><br><span>        bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    bts_model_vty_init(bts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>     return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c</span><br><span>index e5b7206..e5e44ed 100644</span><br><span>--- a/src/osmo-bts-virtual/main.c</span><br><span>+++ b/src/osmo-bts-virtual/main.c</span><br><span>@@ -70,8 +70,6 @@</span><br><span>      osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR);</span><br><span>       osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      bts_model_vty_init(bts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>     return 0;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/21027">change 21027</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-bts/+/21027"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I262c39896b5db86c54ad9aa7042c7ca6657815d9 </div>
<div style="display:none"> Gerrit-Change-Number: 21027 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>