fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35694?usp=email )

Change subject: mobile: VTY: disable DATA_CALL_TR_V34_9600 (not supported) ......................................................................

mobile: VTY: disable DATA_CALL_TR_V34_9600 (not supported)

We cannot initiate V.34 data calls because gsm48_encode_bearer_cap() does not support octet 6d. This variant should not be selectable.

Change-Id: Ibafb9a693654672fb9a6abf665c500a27c87bf22 Related: OS#4396, OS#6344 --- M src/host/layer23/src/mobile/mnccms.c M src/host/layer23/src/mobile/vty_interface.c 2 files changed, 19 insertions(+), 2 deletions(-)

Approvals: jolly: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved

diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index 95d7f0d..2a4989d 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -244,7 +244,10 @@ [DATA_CALL_TR_V34_9600] = { .ir = GSM48_BCAP_IR_16k, .ur = GSM48_BCAP_UR_9600, - .mt = GSM48_BCAP_MT_V34, /* XXX */ + .mt = GSM48_BCAP_MT_V32, + /* (Octet 6c) Modem type: According to ITU-T Rec. V.32 + * (Octet 6d) Other modem type: According to ITU-T Rec. V.34 (2) + * TODO: gsm48_encode_bearer_cap() does not support octet 6d */ }, #endif [DATA_CALL_TR_V110_300] = { diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index edff584..7b9a199 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -656,8 +656,9 @@ { DATA_CALL_TR_V26ter_2400, "2400 bps (V.26ter)" }, { DATA_CALL_TR_V32_4800, "4800 bps (V.32)" }, { DATA_CALL_TR_V32_9600, "9600 bps (V.32)" }, - { DATA_CALL_TR_V34_9600, "9600 bps (V.34)" }, #if 0 + /* TODO: V.34 is not supported, see notes in bcap_data_set[] */ + { DATA_CALL_TR_V34_9600, "9600 bps (V.34)" }, /* TODO: rates below 2400 bps are not supported */ { DATA_CALL_TR_V110_300, "300 bps (V.110)" }, { DATA_CALL_TR_V110_1200, "1200 bps (V.110)" },