<p>Stefan Sperling has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10156">View Change</a></p><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 src/common/rsl.c<br>1 file changed, 10 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/56/10156/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index e28f313..bcf36d7 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -564,10 +564,12 @@</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>            struct gsm_bts_trx *t;</span><br><span style="color: hsl(120, 100%, 40%);">+                sysinfo_buf_t old_bts_global_si;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+          memcpy(&old_bts_global_si, GSM_BTS_SI(bts, osmo_si), sizeof(old_bts_global_si));</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>@@ -576,6 +578,9 @@</span><br><span>                                        struct gsm_lchan *lchan = &ts->lchan[j];</span><br><span>                                      if (lchan->state == LCHAN_S_NONE)</span><br><span>                                                 continue;</span><br><span style="color: hsl(120, 100%, 40%);">+                                     if (memcmp(&old_bts_global_si, GSM_LCHAN_SI(lchan, osmo_si),</span><br><span style="color: hsl(120, 100%, 40%);">+                                                 sizeof(old_bts_global_si)) != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                                           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>                    }</span><br><span>@@ -588,7 +593,7 @@</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>@@ -597,6 +602,9 @@</span><br><span>                                        struct gsm_lchan *lchan = &ts->lchan[j];</span><br><span>                                      if (lchan->state == LCHAN_S_NONE)</span><br><span>                                                 continue;</span><br><span style="color: hsl(120, 100%, 40%);">+                                     if (memcmp(GSM_BTS_SI(bts, osmo_si), GSM_LCHAN_SI(lchan, osmo_si),</span><br><span style="color: hsl(120, 100%, 40%);">+                                               sizeof(sysinfo_buf_t)) != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                                               continue;</span><br><span>                                    lchan->si.valid &= ~(1 << osmo_si);</span><br><span>                             }</span><br><span>                    }</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: newchange </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: 1 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>