<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/15890">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rsl.c: Clean up some repeated use of long chains of pointers<br><br>Further accesses will be addter in forthcoming commit, so let's first<br>store the pointers in variables to clean up the code.<br><br>Change-Id: Ie5ea0f44dfb5731cab7e8e5a3dd3d791ee703df7<br>---<br>M src/osmo-bsc/abis_rsl.c<br>1 file changed, 9 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index 575f91d..6ffa415 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -295,12 +295,14 @@</span><br><span> </span><br><span> int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan, unsigned int fpc, int dbm)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+        struct gsm_bts_trx *trx = lchan->ts->trx;</span><br><span style="color: hsl(120, 100%, 40%);">+       struct gsm_bts *bts = trx->bts;</span><br><span>   struct abis_rsl_dchan_hdr *dh;</span><br><span>       struct msgb *msg;</span><br><span>    uint8_t chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span>  int ctl_lvl;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        ctl_lvl = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, dbm);</span><br><span style="color: hsl(120, 100%, 40%);">+ ctl_lvl = ms_pwr_ctl_lvl(bts->band, dbm);</span><br><span>         if (ctl_lvl < 0)</span><br><span>          return ctl_lvl;</span><br><span> </span><br><span>@@ -319,7 +321,7 @@</span><br><span>    /* indicate MS power control to be performed by BTS: */</span><br><span>      msgb_tl_put(msg, RSL_IE_MS_POWER_PARAM);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    msg->dst = lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+      msg->dst = trx->rsl_link;</span><br><span> </span><br><span>  return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -460,6 +462,8 @@</span><br><span> /* Chapter 8.4.1 */</span><br><span> int rsl_tx_chan_activ(struct gsm_lchan *lchan, uint8_t act_type, uint8_t ho_ref)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+      struct gsm_bts_trx *trx = lchan->ts->trx;</span><br><span style="color: hsl(120, 100%, 40%);">+       struct gsm_bts *bts = trx->bts;</span><br><span>   struct abis_rsl_dchan_hdr *dh;</span><br><span>       struct msgb *msg;</span><br><span>    int rc;</span><br><span>@@ -487,7 +491,7 @@</span><br><span>        ta = lchan->rqd_ta;</span><br><span> </span><br><span>   /* BS11 requires TA shifted by 2 bits */</span><br><span style="color: hsl(0, 100%, 40%);">-        if (lchan->ts->trx->bts->type == GSM_BTS_TYPE_BS11)</span><br><span style="color: hsl(120, 100%, 40%);">+       if (bts->type == GSM_BTS_TYPE_BS11)</span><br><span>               ta <<= 2;</span><br><span> </span><br><span>  memset(&cd, 0, sizeof(cd));</span><br><span>@@ -548,9 +552,9 @@</span><br><span> </span><br><span>    mr_config_for_bts(lchan, msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      msg->dst = lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+      msg->dst = trx->rsl_link;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_ACT_TOTAL]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHAN_ACT_TOTAL]);</span><br><span> </span><br><span>     return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/15890">change 15890</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-bsc/+/15890"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie5ea0f44dfb5731cab7e8e5a3dd3d791ee703df7 </div>
<div style="display:none"> Gerrit-Change-Number: 15890 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>