Change in osmo-bts[master]: osmo-bts-trx: fix: do not call trx_if_close() two times

laforge gerrit-no-reply at lists.osmocom.org
Fri Mar 19 07:17:45 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23398 )

Change subject: osmo-bts-trx: fix: do not call trx_if_close() two times
......................................................................

osmo-bts-trx: fix: do not call trx_if_close() two times

It's called by trx_phy_inst_open() if trx_if_open() fails.

Change-Id: Ic672f865ab513043a58979471a254a59d44daa6d
---
M src/osmo-bts-trx/trx_if.c
1 file changed, 2 insertions(+), 6 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index 05167ca..c6701cb 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -1225,20 +1225,16 @@
 			  plink->u.osmotrx.remote_ip,
 			  compute_port(pinst, 1, 0), trx_ctrl_read_cb);
 	if (rc < 0)
-		goto err;
+		return rc;
 	rc = trx_udp_open(l1h, &l1h->trx_ofd_data,
 			  plink->u.osmotrx.local_ip,
 			  compute_port(pinst, 0, 1),
 			  plink->u.osmotrx.remote_ip,
 			  compute_port(pinst, 1, 1), trx_data_read_cb);
 	if (rc < 0)
-		goto err;
+		return rc;
 
 	return 0;
-
-err:
-	trx_if_close(l1h);
-	return rc;
 }
 
 /*! close the control + burst data sockets for one phy_instance */

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23398
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ic672f865ab513043a58979471a254a59d44daa6d
Gerrit-Change-Number: 23398
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210319/16293e53/attachment.htm>


More information about the gerrit-log mailing list