<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25543">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Avoid sending Load Indications when BTS is not RSL-connected<br><br>Change-Id: I97e8dd7dd58ee2ec90c3a38d45dfd944db44c412<br>---<br>M include/osmo-bts/bts.h<br>M src/common/abis.c<br>M src/common/bts.c<br>M src/common/bts_trx.c<br>M src/common/load_indication.c<br>M src/common/oml.c<br>6 files changed, 16 insertions(+), 2 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/43/25543/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h</span><br><span>index a601423..fab7f96 100644</span><br><span>--- a/include/osmo-bts/bts.h</span><br><span>+++ b/include/osmo-bts/bts.h</span><br><span>@@ -409,6 +409,8 @@</span><br><span> int lchan_init_lapdm(struct gsm_lchan *lchan);</span><br><span> </span><br><span> void load_timer_start(struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+void load_timer_stop(struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+bool load_timer_is_running(const struct gsm_bts *bts);</span><br><span> void bts_update_status(enum bts_global_status which, int on);</span><br><span> </span><br><span> struct gsm_time *get_time(struct gsm_bts *bts);</span><br><span>diff --git a/src/common/abis.c b/src/common/abis.c</span><br><span>index 1b489c1..3451b2e 100644</span><br><span>--- a/src/common/abis.c</span><br><span>+++ b/src/common/abis.c</span><br><span>@@ -213,6 +213,8 @@</span><br><span> if (trx->rsl_link) {</span><br><span> e1inp_sign_link_destroy(trx->rsl_link);</span><br><span> trx->rsl_link = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx == trx->bts->c0)</span><br><span style="color: hsl(120, 100%, 40%);">+ load_timer_stop(trx->bts);</span><br><span> }</span><br><span> /* Note: Here we could send NM_EV_RSL_DOWN to each</span><br><span> * trx->(bb_transc.)mo.fi, but we are starting shutdown of the</span><br><span>diff --git a/src/common/bts.c b/src/common/bts.c</span><br><span>index 67e6736..191c331 100644</span><br><span>--- a/src/common/bts.c</span><br><span>+++ b/src/common/bts.c</span><br><span>@@ -345,7 +345,6 @@</span><br><span> </span><br><span> /* configurable via OML */</span><br><span> bts->load.ccch.load_ind_period = 112;</span><br><span style="color: hsl(0, 100%, 40%);">- load_timer_start(bts);</span><br><span> bts->rtp_jitter_buf_ms = 100;</span><br><span> bts->max_ta = 63;</span><br><span> bts->ny1 = 4;</span><br><span>diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c</span><br><span>index ed742d5..127e797 100644</span><br><span>--- a/src/common/bts_trx.c</span><br><span>+++ b/src/common/bts_trx.c</span><br><span>@@ -217,6 +217,9 @@</span><br><span> oml_tx_failure_event_rep(&trx->bb_transc.mo, NM_SEVER_MAJOR, OSMO_EVT_MAJ_RSL_FAIL,</span><br><span> "Failed to establish RSL link (%d)", rc);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx == trx->bts->c0)</span><br><span style="color: hsl(120, 100%, 40%);">+ load_timer_start(trx->bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/common/load_indication.c b/src/common/load_indication.c</span><br><span>index c9b2645..69af9c6 100644</span><br><span>--- a/src/common/load_indication.c</span><br><span>+++ b/src/common/load_indication.c</span><br><span>@@ -94,3 +94,8 @@</span><br><span> {</span><br><span> osmo_timer_del(&bts->load.ccch.timer);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bool load_timer_is_running(const struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_timer_pending(&bts->load.ccch.timer);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index d2cf877..f841853 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -670,7 +670,10 @@</span><br><span> /* 9.4.11 CCCH Load Indication Period */</span><br><span> if (TLVP_PRES_LEN(&tp, NM_ATT_CCCH_L_I_P, 1)) {</span><br><span> bts->load.ccch.load_ind_period = *TLVP_VAL(&tp, NM_ATT_CCCH_L_I_P);</span><br><span style="color: hsl(0, 100%, 40%);">- load_timer_start(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (load_timer_is_running(bts)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ load_timer_stop(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ load_timer_start(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* 9.4.44 RACH Busy Threshold */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25543">change 25543</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/+/25543"/><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: I97e8dd7dd58ee2ec90c3a38d45dfd944db44c412 </div>
<div style="display:none"> Gerrit-Change-Number: 25543 </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>