<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/23398">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx: fix: do not call trx_if_close() two times<br><br>It's called by trx_phy_inst_open() if trx_if_open() fails.<br><br>Change-Id: Ic672f865ab513043a58979471a254a59d44daa6d<br>---<br>M src/osmo-bts-trx/trx_if.c<br>1 file changed, 2 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/23398/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c</span><br><span>index 05167ca..c6701cb 100644</span><br><span>--- a/src/osmo-bts-trx/trx_if.c</span><br><span>+++ b/src/osmo-bts-trx/trx_if.c</span><br><span>@@ -1225,20 +1225,16 @@</span><br><span>                     plink->u.osmotrx.remote_ip,</span><br><span>                       compute_port(pinst, 1, 0), trx_ctrl_read_cb);</span><br><span>      if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">-          goto err;</span><br><span style="color: hsl(120, 100%, 40%);">+             return rc;</span><br><span>   rc = trx_udp_open(l1h, &l1h->trx_ofd_data,</span><br><span>                      plink->u.osmotrx.local_ip,</span><br><span>                        compute_port(pinst, 0, 1),</span><br><span>                           plink->u.osmotrx.remote_ip,</span><br><span>                       compute_port(pinst, 1, 1), trx_data_read_cb);</span><br><span>      if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">-          goto err;</span><br><span style="color: hsl(120, 100%, 40%);">+             return rc;</span><br><span> </span><br><span>       return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-err:</span><br><span style="color: hsl(0, 100%, 40%);">-   trx_if_close(l1h);</span><br><span style="color: hsl(0, 100%, 40%);">-      return rc;</span><br><span> }</span><br><span> </span><br><span> /*! close the control + burst data sockets for one phy_instance */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/23398">change 23398</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/+/23398"/><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: Ic672f865ab513043a58979471a254a59d44daa6d </div>
<div style="display:none"> Gerrit-Change-Number: 23398 </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-MessageType: newchange </div>