<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25779">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lchan: Setup early_rr_ia timer only once during init<br><br>There's no need to re-setup it every time.<br><br>Mark the cb as static since its private to the module, and move it<br>above its use point so it can be referenced.<br><br>Change-Id: I90324f26d8ca09d425c7523a25b3e6c951fa49d6<br>---<br>M src/common/lchan.c<br>1 file changed, 29 insertions(+), 28 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/79/25779/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/lchan.c b/src/common/lchan.c</span><br><span>index f7ee33b..747e8b0 100644</span><br><span>--- a/src/common/lchan.c</span><br><span>+++ b/src/common/lchan.c</span><br><span>@@ -52,6 +52,33 @@</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void early_rr_ia_delay_cb(void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!lchan->early_rr_ia) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The IA message has disappeared since the timer was started. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->state != LCHAN_S_ACTIVE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Release has happened since the timer was started. */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(lchan->early_rr_ia);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->early_rr_ia = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Activation is done, send the RR IA now. Put RR IA msg into the AGCH queue of the BTS. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts_agch_enqueue(bts, lchan->early_rr_ia) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* if there is no space in the queue: send DELETE IND */</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_tx_delete_ind(bts, lchan->early_rr_ia->data, lchan->early_rr_ia->len);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc2(bts->ctrs, BTS_CTR_AGCH_DELETED);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(lchan->early_rr_ia);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->early_rr_ia = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void gsm_lchan_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr)</span><br><span> {</span><br><span> lchan->ts = ts;</span><br><span>@@ -59,6 +86,8 @@</span><br><span> lchan->type = GSM_LCHAN_NONE;</span><br><span> gsm_lchan_name_update(lchan);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_setup(&lchan->early_rr_ia_delay, early_rr_ia_delay_cb, lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> INIT_LLIST_HEAD(&lchan->sapi_cmds);</span><br><span> INIT_LLIST_HEAD(&lchan->dl_tch_queue);</span><br><span> }</span><br><span>@@ -150,33 +179,6 @@</span><br><span> return get_value_string(lchan_s_names, s);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void early_rr_ia_delay_cb(void *data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_lchan *lchan = data;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!lchan->early_rr_ia) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* The IA message has disappeared since the timer was started. */</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->state != LCHAN_S_ACTIVE) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Release has happened since the timer was started. */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(lchan->early_rr_ia);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->early_rr_ia = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Activation is done, send the RR IA now. Put RR IA msg into the AGCH queue of the BTS. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts_agch_enqueue(bts, lchan->early_rr_ia) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* if there is no space in the queue: send DELETE IND */</span><br><span style="color: hsl(0, 100%, 40%);">- rsl_tx_delete_ind(bts, lchan->early_rr_ia->data, lchan->early_rr_ia->len);</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc2(bts->ctrs, BTS_CTR_AGCH_DELETED);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(lchan->early_rr_ia);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->early_rr_ia = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void lchan_set_state(struct gsm_lchan *lchan, enum gsm_lchan_state state)</span><br><span> {</span><br><span> DEBUGP(DL1C, "%s state %s -> %s\n",</span><br><span>@@ -197,7 +199,6 @@</span><br><span> /* Activation is done, send the RR IA now. Delay a bit more to give Um time to let the lchan</span><br><span> * light up for the MS */</span><br><span> osmo_timer_del(&lchan->early_rr_ia_delay);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_setup(&lchan->early_rr_ia_delay, early_rr_ia_delay_cb, lchan);</span><br><span> osmo_timer_schedule(&lchan->early_rr_ia_delay, 0,</span><br><span> osmo_tdef_get(abis_T_defs, -15, OSMO_TDEF_US, -1));</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25779">change 25779</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/+/25779"/><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: I90324f26d8ca09d425c7523a25b3e6c951fa49d6 </div>
<div style="display:none"> Gerrit-Change-Number: 25779 </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-MessageType: newchange </div>