Change in osmo-bsc[master]: lchan_fsm: do not include 12.2k in active set on HR channels

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13095 )

Change subject: lchan_fsm: do not include 12.2k in active set on HR channels
......................................................................

lchan_fsm: do not include 12.2k in active set on HR channels

When "Config-NB-Code = 1" is set via the S-bits, then the resulting
multirate configuration IE will contain 12.2K. Since the generator
function is not aware if the lchan is activated for HR or FR it sets the
flag for 12.2k always.

We have to add a check here in order to set the 12.2k flag in the IE
back to 0 so that the active set contains a set of useable rates.

Change-Id: I40e7f568f4822040a2d1e78f22dbba0e49d0167e
Related: SYS#4470
---
M src/osmo-bsc/lchan_fsm.c
1 file changed, 9 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c
index 0c54efb..7cbba44 100644
--- a/src/osmo-bsc/lchan_fsm.c
+++ b/src/osmo-bsc/lchan_fsm.c
@@ -545,6 +545,15 @@
 			return;
 		}
 
+		/* Do not include 12.2 kbps rate when S1 is set. */
+		if (lchan->type == GSM_LCHAN_TCH_H && (info->s15_s0 & GSM0808_SC_CFG_AMR_4_75_5_90_7_40_12_20)) {
+			/* See also 3GPP TS 28.062, chapter 7.11.3.1.3: "In case this Configuration
+			 * "Config-NB-Code = 1" is signalled in the TFO Negotiation for the HR_AMR
+			 * Codec Type,then it shall be assumed that AMR mode 12.2 kbps is (of course)
+			 * not included. */
+			mr_conf.m12_2 = 0;
+		}
+
 		if (lchan_mr_config(lchan, &mr_conf) < 0) {
 			lchan_fail("Can not generate multirate configuration IE\n");
 			return;

-- 
To view, visit https://gerrit.osmocom.org/13095
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I40e7f568f4822040a2d1e78f22dbba0e49d0167e
Gerrit-Change-Number: 13095
Gerrit-PatchSet: 10
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190319/ddfc3777/attachment.htm>