<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10156">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">preserve lchan-specific SI overrides on SACCH FILL<br><br>During SACCH FILL processing, update lchan SI values only<br>for lchans which follow BTS-global default values, keeping<br>lchan-specific overrides in place.<br><br>Change-Id: I515bbd9983fa894507386b241863a9aa4d279497<br>Fixes: eee7247ebe0d0a54a54b53b739bdd434dfceb511<br>Related: OS#3173<br>---<br>M include/osmo-bts/gsm_data_shared.h<br>M src/common/rsl.c<br>2 files changed, 12 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h</span><br><span>index e15abfe..baa0145 100644</span><br><span>--- a/include/osmo-bts/gsm_data_shared.h</span><br><span>+++ b/include/osmo-bts/gsm_data_shared.h</span><br><span>@@ -240,6 +240,8 @@</span><br><span> struct {</span><br><span> /* bitmask of all SI that are present/valid in si_buf */</span><br><span> uint32_t valid;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* bitmask of all SI that do not mirror the BTS-global SI values */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t overridden;</span><br><span> uint32_t last;</span><br><span> /* buffers where we put the pre-computed SI:</span><br><span> SI2Q_MAX_NUM is the max number of SI2quater messages (see 3GPP TS 44.018) */</span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index e28f313..a24c444 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -567,14 +567,14 @@</span><br><span> </span><br><span> lapdm_ui_prefix_bts(bts, TLVP_VAL(&tp, RSL_IE_L3_INFO), osmo_si, len);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Propagate SI change to all lchans. */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Propagate SI change to all lchans which adhere to BTS-global default. */</span><br><span> llist_for_each_entry(t, &bts->trx_list, list) {</span><br><span> int i, j;</span><br><span> for (i = 0; i < ARRAY_SIZE(t->ts); i++) {</span><br><span> struct gsm_bts_trx_ts *ts = &t->ts[i];</span><br><span> for (j = 0; j < ARRAY_SIZE(ts->lchan); j++) {</span><br><span> struct gsm_lchan *lchan = &ts->lchan[j];</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->state == LCHAN_S_NONE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->state == LCHAN_S_NONE || (lchan->si.overridden & (1 << osmo_si)))</span><br><span> continue;</span><br><span> lapdm_ui_prefix_lchan(lchan, TLVP_VAL(&tp, RSL_IE_L3_INFO), osmo_si, len);</span><br><span> }</span><br><span>@@ -588,14 +588,14 @@</span><br><span> </span><br><span> bts->si_valid &= ~(1 << osmo_si);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Propagate SI change to all lchans. */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Propagate SI change to all lchans which adhere to BTS-global default. */</span><br><span> llist_for_each_entry(t, &bts->trx_list, list) {</span><br><span> int i, j;</span><br><span> for (i = 0; i < ARRAY_SIZE(t->ts); i++) {</span><br><span> struct gsm_bts_trx_ts *ts = &t->ts[i];</span><br><span> for (j = 0; j < ARRAY_SIZE(ts->lchan); j++) {</span><br><span> struct gsm_lchan *lchan = &ts->lchan[j];</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->state == LCHAN_S_NONE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->state == LCHAN_S_NONE || (lchan->si.overridden & (1 << osmo_si)))</span><br><span> continue;</span><br><span> lchan->si.valid &= ~(1 << osmo_si);</span><br><span> }</span><br><span>@@ -1567,6 +1567,7 @@</span><br><span> {</span><br><span> struct abis_rsl_dchan_hdr *dch = msgb_l2(msg);</span><br><span> struct gsm_lchan *lchan = msg->lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span> struct tlv_parsed tp;</span><br><span> uint8_t rsl_si, osmo_si;</span><br><span> </span><br><span>@@ -1593,7 +1594,12 @@</span><br><span> }</span><br><span> if (TLVP_PRESENT(&tp, RSL_IE_L3_INFO)) {</span><br><span> uint16_t len = TLVP_LEN(&tp, RSL_IE_L3_INFO);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> lapdm_ui_prefix_lchan(lchan, TLVP_VAL(&tp, RSL_IE_L3_INFO), osmo_si, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (memcmp(GSM_BTS_SI(bts, osmo_si), TLVP_VAL(&tp, RSL_IE_L3_INFO), sizeof(sysinfo_buf_t) != 0))</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->si.overridden |= (1 << osmo_si);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->si.overridden &= ~(1 << osmo_si);</span><br><span> </span><br><span> LOGP(DRSL, LOGL_INFO, "%s Rx RSL SACCH FILLING (SI%s)\n",</span><br><span> gsm_lchan_name(lchan),</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10156">change 10156</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/10156"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I515bbd9983fa894507386b241863a9aa4d279497 </div>
<div style="display:none"> Gerrit-Change-Number: 10156 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>