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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix AMR start-mode auto: reflect proper ICMI in MultiRate Config IE<br><br>Send the proper ICMI value, instead of always sending ICMI=1 regardless<br>of the AMR start-mode setting.<br><br>To avoid test fallout from the fix, we should first merge<br>osmo-ttcn3-hacks I4cff01c37d5c7e301e9a01f773b7e009a789519b<br><br>Change-Id: I577ff590d7588fd7e3ee4846c7955ab8f84cf2b1<br>---<br>M src/osmo-bsc/lchan_fsm.c<br>1 file changed, 5 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index e97c1ba..0ca7f2c 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -467,6 +467,7 @@</span><br><span>                 mr = &bts->mr_full;</span><br><span>   else</span><br><span>                 mr = &bts->mr_half;</span><br><span style="color: hsl(120, 100%, 40%);">+    mr_conf_bts = (struct gsm48_multi_rate_conf *)mr->gsm48_ie;</span><br><span> </span><br><span>   if (lchan->activate.info.activ_for == FOR_VTY)</span><br><span>            /* If the channel is activated manually from VTY, then there is no</span><br><span>@@ -503,7 +504,6 @@</span><br><span>      * if the channel activation was triggerd by the VTY, do not</span><br><span>          * filter anything (see also comment above) */</span><br><span>       if (lchan->activate.info.activ_for != FOR_VTY) {</span><br><span style="color: hsl(0, 100%, 40%);">-             mr_conf_bts = (struct gsm48_multi_rate_conf *)mr->gsm48_ie;</span><br><span>               rc_rate = calc_amr_rate_intersection(&mr_conf_filtered, mr_conf_bts, &mr_conf_filtered);</span><br><span>             if (rc_rate < 0) {</span><br><span>                        LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span>@@ -512,6 +512,10 @@</span><br><span>          }</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Set the ICMI according to the BTS. Above gsm48_mr_cfg_from_gsm0808_sc_cfg() always sets ICMI = 1, which</span><br><span style="color: hsl(120, 100%, 40%);">+     * carried through all of the above rate intersections. */</span><br><span style="color: hsl(120, 100%, 40%);">+    mr_conf_filtered.icmi = mr_conf_bts->icmi;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>      /* Proceed with the generation of the multirate configuration IE</span><br><span>      * (MS and BTS) */</span><br><span>   rc = gsm48_multirate_config(lchan->mr_ms_lv, &mr_conf_filtered, mr->ms_mode, mr->num_modes);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21372">change 21372</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/+/21372"/><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: I577ff590d7588fd7e3ee4846c7955ab8f84cf2b1 </div>
<div style="display:none"> Gerrit-Change-Number: 21372 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>