Change in osmo-bts[master]: l1sap: use the passed 'trx' pointer in l1sap_chan_act()

[fixeria]

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


Change subject: l1sap: use the passed 'trx' pointer in l1sap_chan_act()
......................................................................

l1sap: use the passed 'trx' pointer in l1sap_chan_act()

Change-Id: Id94363f2a22eb905ae01e68ddfdf48fc8c646aaf
Related: SYS#4895, OS#4941
---
M src/common/l1sap.c
1 file changed, 5 insertions(+), 5 deletions(-)



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

diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 9bb8be3..aee4717 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -1977,14 +1977,14 @@
 		/* our L1 only supports one global TSC for all channels
 		 * one one TRX, so we need to make sure not to activate
 		 * channels with a different TSC!! */
-		if (cd->h0.tsc != (lchan->ts->trx->bts->bsic & 7)) {
+		if (cd->h0.tsc != (trx->bts->bsic & 7)) {
 			LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "lchan TSC %u != BSIC-TSC %u\n",
-				  cd->h0.tsc, lchan->ts->trx->bts->bsic & 7);
+				  cd->h0.tsc, trx->bts->bsic & 7);
 			return -RSL_ERR_SERV_OPT_UNIMPL;
 		}
 	}
 
-	lchan->s = lchan->ts->trx->bts->radio_link_timeout.current;
+	lchan->s = trx->bts->radio_link_timeout.current;
 
 	rc = l1sap_chan_act_dact_modify(trx, chan_nr, PRIM_INFO_ACTIVATE, 0);
 	if (rc)
@@ -1993,8 +1993,8 @@
 	/* Init DTX DL FSM if necessary */
 	if (trx->bts->dtxd && lchan->type != GSM_LCHAN_SDCCH) {
 		char name[32];
-		snprintf(name, sizeof(name), "bts%u-trx%u-ts%u-ss%u", lchan->ts->trx->bts->nr,
-			 lchan->ts->trx->nr, lchan->ts->nr, lchan->nr);
+		snprintf(name, sizeof(name), "bts%u-trx%u-ts%u-ss%u",
+			 trx->bts->nr, trx->nr, lchan->ts->nr, lchan->nr);
 		lchan->tch.dtx.dl_amr_fsm = osmo_fsm_inst_alloc(&dtx_dl_amr_fsm,
 								tall_bts_ctx,
 								lchan,

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Id94363f2a22eb905ae01e68ddfdf48fc8c646aaf
Gerrit-Change-Number: 23670
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210407/10bcc34d/attachment.htm>