Change in osmo-bts[master]: abis: Clear code and drop code not executed

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25451 )


Change subject: abis: Clear code and drop code not executed
......................................................................

abis: Clear code and drop code not executed

abis_init() sets "g_bts = bts;", hence bts object is the same as g_bts
(since we only have 1 BTS object in osmo-bts). As a result, dropping
checking first bts->... and later g_bts->... makes no sense: the later
condition will always be false.

Change-Id: I5018199221fb3c3329a59d0b91e827f077cef85d
---
M src/common/abis.c
1 file changed, 2 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/51/25451/1

diff --git a/src/common/abis.c b/src/common/abis.c
index 3325fab..7503798 100644
--- a/src/common/abis.c
+++ b/src/common/abis.c
@@ -102,18 +102,12 @@
 			LOGP(DABIS, LOGL_FATAL, "OML link was closed early within %" PRIu64 " seconds. "
 			     "If this situation persists, please check your BTS and BSC configuration files for errors. "
 			     "A common error is a mismatch between unit_id configuration parameters of BTS and BSC.\n",
-			     (uint64_t) (now.tv_sec - g_bts->oml_conn_established_timestamp.tv_sec));
+			     (uint64_t) (now.tv_sec - bts->oml_conn_established_timestamp.tv_sec));
 		}
 		bts->oml_link = NULL;
 		oml_rsl_was_connected = true;
 	}
-	memset(&g_bts->oml_conn_established_timestamp, 0, sizeof(bts->oml_conn_established_timestamp));
-
-	if (g_bts->osmo_link) {
-		e1inp_sign_link_destroy(g_bts->osmo_link);
-		g_bts->osmo_link = NULL;
-		oml_rsl_was_connected = true;
-	}
+	memset(&bts->oml_conn_established_timestamp, 0, sizeof(bts->oml_conn_established_timestamp));
 
 	/* Then iterate over the RSL signalling links */
 	llist_for_each_entry(trx, &bts->trx_list, list) {

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I5018199221fb3c3329a59d0b91e827f077cef85d
Gerrit-Change-Number: 25451
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210914/57c13c38/attachment.htm>