This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
neels gerrit-no-reply at lists.osmocom.orgneels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21372 ) Change subject: fix AMR start-mode auto: reflect proper ICMI in MultiRate Config IE ...................................................................... fix AMR start-mode auto: reflect proper ICMI in MultiRate Config IE Send the proper ICMI value, instead of always sending ICMI=1 regardless of the AMR start-mode setting. To avoid test fallout from the fix, we should first merge osmo-ttcn3-hacks I4cff01c37d5c7e301e9a01f773b7e009a789519b Change-Id: I577ff590d7588fd7e3ee4846c7955ab8f84cf2b1 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 5 insertions(+), 1 deletion(-) 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 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index e97c1ba..0ca7f2c 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -467,6 +467,7 @@ mr = &bts->mr_full; else mr = &bts->mr_half; + mr_conf_bts = (struct gsm48_multi_rate_conf *)mr->gsm48_ie; if (lchan->activate.info.activ_for == FOR_VTY) /* If the channel is activated manually from VTY, then there is no @@ -503,7 +504,6 @@ * if the channel activation was triggerd by the VTY, do not * filter anything (see also comment above) */ if (lchan->activate.info.activ_for != FOR_VTY) { - mr_conf_bts = (struct gsm48_multi_rate_conf *)mr->gsm48_ie; rc_rate = calc_amr_rate_intersection(&mr_conf_filtered, mr_conf_bts, &mr_conf_filtered); if (rc_rate < 0) { LOG_LCHAN(lchan, LOGL_ERROR, @@ -512,6 +512,10 @@ } } + /* Set the ICMI according to the BTS. Above gsm48_mr_cfg_from_gsm0808_sc_cfg() always sets ICMI = 1, which + * carried through all of the above rate intersections. */ + mr_conf_filtered.icmi = mr_conf_bts->icmi; + /* Proceed with the generation of the multirate configuration IE * (MS and BTS) */ rc = gsm48_multirate_config(lchan->mr_ms_lv, &mr_conf_filtered, mr->ms_mode, mr->num_modes); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I577ff590d7588fd7e3ee4846c7955ab8f84cf2b1 Gerrit-Change-Number: 21372 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier at sysmocom.de> Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201130/e0903a19/attachment.htm>