<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12586">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon: register both l1ctl_fsm and trx_fsm on DSO load<br><br>Change-Id: I7111e368afa47c88ff3c610bae9044f2d5baf037<br>---<br>M src/host/trxcon/l1ctl_link.c<br>M src/host/trxcon/trx_if.c<br>2 files changed, 10 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c</span><br><span>index 20cb70c..23019fd 100644</span><br><span>--- a/src/host/trxcon/l1ctl_link.c</span><br><span>+++ b/src/host/trxcon/l1ctl_link.c</span><br><span>@@ -269,7 +269,6 @@</span><br><span>      l1l_new->wq.bfd.fd = -1;</span><br><span> </span><br><span>      /* Allocate a new dedicated state machine */</span><br><span style="color: hsl(0, 100%, 40%);">-    osmo_fsm_register(&l1ctl_fsm);</span><br><span>   l1l_new->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l_new,</span><br><span>               NULL, LOGL_DEBUG, "l1ctl_link");</span><br><span> </span><br><span>@@ -308,3 +307,8 @@</span><br><span>         osmo_fsm_inst_free(l1l->fsm);</span><br><span>     talloc_free(l1l);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static __attribute__((constructor)) void on_dso_load(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+       OSMO_ASSERT(osmo_fsm_register(&l1ctl_fsm) == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c</span><br><span>index 982fb40..91b87a2 100644</span><br><span>--- a/src/host/trxcon/trx_if.c</span><br><span>+++ b/src/host/trxcon/trx_if.c</span><br><span>@@ -660,7 +660,6 @@</span><br><span>           goto error;</span><br><span> </span><br><span>      /* Allocate a new dedicated state machine */</span><br><span style="color: hsl(0, 100%, 40%);">-    osmo_fsm_register(&trx_fsm);</span><br><span>     trx_new->fsm = osmo_fsm_inst_alloc(&trx_fsm, trx_new,</span><br><span>                 NULL, LOGL_DEBUG, "trx_interface");</span><br><span> </span><br><span>@@ -710,3 +709,8 @@</span><br><span>      osmo_fsm_inst_free(trx->fsm);</span><br><span>     talloc_free(trx);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static __attribute__((constructor)) void on_dso_load(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+       OSMO_ASSERT(osmo_fsm_register(&trx_fsm) == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12586">change 12586</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/12586"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7111e368afa47c88ff3c610bae9044f2d5baf037 </div>
<div style="display:none"> Gerrit-Change-Number: 12586 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>