<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/23670">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">l1sap: use the passed 'trx' pointer in l1sap_chan_act()<br><br>Change-Id: Id94363f2a22eb905ae01e68ddfdf48fc8c646aaf<br>Related: SYS#4895, OS#4941<br>---<br>M src/common/l1sap.c<br>1 file changed, 5 insertions(+), 5 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/70/23670/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index 9bb8be3..aee4717 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -1977,14 +1977,14 @@</span><br><span>            /* our L1 only supports one global TSC for all channels</span><br><span>               * one one TRX, so we need to make sure not to activate</span><br><span>               * channels with a different TSC!! */</span><br><span style="color: hsl(0, 100%, 40%);">-           if (cd->h0.tsc != (lchan->ts->trx->bts->bsic & 7)) {</span><br><span style="color: hsl(120, 100%, 40%);">+               if (cd->h0.tsc != (trx->bts->bsic & 7)) {</span><br><span>                       LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "lchan TSC %u != BSIC-TSC %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                             cd->h0.tsc, lchan->ts->trx->bts->bsic & 7);</span><br><span style="color: hsl(120, 100%, 40%);">+                                cd->h0.tsc, trx->bts->bsic & 7);</span><br><span>                      return -RSL_ERR_SERV_OPT_UNIMPL;</span><br><span>             }</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   lchan->s = lchan->ts->trx->bts->radio_link_timeout.current;</span><br><span style="color: hsl(120, 100%, 40%);">+    lchan->s = trx->bts->radio_link_timeout.current;</span><br><span> </span><br><span>        rc = l1sap_chan_act_dact_modify(trx, chan_nr, PRIM_INFO_ACTIVATE, 0);</span><br><span>        if (rc)</span><br><span>@@ -1993,8 +1993,8 @@</span><br><span>      /* Init DTX DL FSM if necessary */</span><br><span>   if (trx->bts->dtxd && lchan->type != GSM_LCHAN_SDCCH) {</span><br><span>             char name[32];</span><br><span style="color: hsl(0, 100%, 40%);">-          snprintf(name, sizeof(name), "bts%u-trx%u-ts%u-ss%u", lchan->ts->trx->bts->nr,</span><br><span style="color: hsl(0, 100%, 40%);">-                     lchan->ts->trx->nr, lchan->ts->nr, lchan->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+             snprintf(name, sizeof(name), "bts%u-trx%u-ts%u-ss%u",</span><br><span style="color: hsl(120, 100%, 40%);">+                        trx->bts->nr, trx->nr, lchan->ts->nr, lchan->nr);</span><br><span>                 lchan->tch.dtx.dl_amr_fsm = osmo_fsm_inst_alloc(&dtx_dl_amr_fsm,</span><br><span>                                                              tall_bts_ctx,</span><br><span>                                                                lchan,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/23670">change 23670</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/+/23670"/><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: Id94363f2a22eb905ae01e68ddfdf48fc8c646aaf </div>
<div style="display:none"> Gerrit-Change-Number: 23670 </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>