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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nm_channel_fsm: drop ipa link if SetChannelAttr fails<br><br>Now that we solved all the interdependency symbol mess, we can finally<br>enable call to this function.<br><br>Change-Id: Id4c724ef17beae4bb0918ebd1a809665b59e4861<br>---<br>M src/osmo-bsc/nm_channel_fsm.c<br>1 file changed, 2 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/nm_channel_fsm.c b/src/osmo-bsc/nm_channel_fsm.c</span><br><span>index 31b8c03..52ff437 100644</span><br><span>--- a/src/osmo-bsc/nm_channel_fsm.c</span><br><span>+++ b/src/osmo-bsc/nm_channel_fsm.c</span><br><span>@@ -95,16 +95,8 @@</span><br><span>        if (!ts->mo.set_attr_sent && !ts->mo.set_attr_ack_received) {</span><br><span>          ts->mo.set_attr_sent = true;</span><br><span>              ccomb = abis_nm_chcomb4pchan(ts->pchan_from_config);</span><br><span style="color: hsl(0, 100%, 40%);">-         if (abis_nm_set_channel_attr(ts, ccomb) == -EINVAL) {</span><br><span style="color: hsl(0, 100%, 40%);">-                   /* FIXME: using this here makes crazy lots of .o</span><br><span style="color: hsl(0, 100%, 40%);">-                           dependencies be fulled in, ending up in</span><br><span style="color: hsl(0, 100%, 40%);">-                         osmo_bsc_main.o which conficts due to containing its</span><br><span style="color: hsl(0, 100%, 40%);">-                    own main() */</span><br><span style="color: hsl(0, 100%, 40%);">-                        LOGPFSML(ts->mo.fi, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">-                               "FIXME: Here OML link should br dropped, "</span><br><span style="color: hsl(0, 100%, 40%);">-                            "something is wrong in your setup!\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                      //ipaccess_drop_oml_deferred(trx->bts);</span><br><span style="color: hsl(0, 100%, 40%);">-              }</span><br><span style="color: hsl(120, 100%, 40%);">+             if (abis_nm_set_channel_attr(ts, ccomb) == -EINVAL)</span><br><span style="color: hsl(120, 100%, 40%);">+                   ipaccess_drop_oml_deferred(trx->bts);</span><br><span>     }</span><br><span> </span><br><span>        if (state->administrative != NM_STATE_UNLOCKED && !ts->mo.adm_unlock_sent) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25710">change 25710</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/+/25710"/><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: Id4c724ef17beae4bb0918ebd1a809665b59e4861 </div>
<div style="display:none"> Gerrit-Change-Number: 25710 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>