<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24369">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">allow explixit TSC Set and TSC on chan activ / modif / assignment<br><br>Activating / modifying to a VAMOS mode will require picking specific TSC<br>Set / TSC. It is a bad idea to pick the TSC in each message encoding<br>function, rather make this choice centrally.<br><br>So far we pick the training sequence code to use based on the timeslot<br>configuration, and this TSC is determined only upon encoding the RSL<br>messages.<br><br>Instead, pick the TSC to use upon the initial lchan activation /<br>modification request; store this in the request structs and pass through<br>the activation / modification code paths.<br><br>For VAMOS modes, we also need to pick a TSC Set. Do so also upon activ /<br>modif request. Note that the TSC Set is not yet applied in this patch,<br>it will be applied in upcoming VAMOS patches.<br><br>The activ / modif request may pass -1 for tsc_set and/or tsc to indicate<br>no specific choice of TSC Set and TSC, resulting in the same behavior as<br>before this patch.<br><br>For example, lchan->activate.info.tsc* may be passed as -1. The exact<br>choice for tsc_set and tsc is then stored in lchan->activate.tsc*, i.e.<br>one level up (the .info sub-struct is considered as immutable input<br>args). The lchan->activate.tsc* are the values actually encoded in RSL<br>messages. After the ACK, the lchan->activate.tsc* is stored in<br>lchan->tsc* to indicate the TSC actually in use. Same for modif.<br><br>Note that in 3GPP TS 45.002, the TSC Set are numbered 1 to 4, while the<br>TSC are numbered 0 to 7. On the wire, though, TSC Set is sent as 0 to 3<br>value. This is a weird discrepancy, odd choice made by the spec authors.<br>For conformance with the spec wording, I decided to pass the TSC Set<br>number as a 1-4 ranged value, and only convert it to the 0-3 on-the-wire<br>format upon message encoding. So log messages and VTY output will<br>indicate the first TSC Set as "1", but the first TSC as "0", as defined<br>in 3GPP TS 45.002, even if that is somewhat weird.<br><br>Related: SYS#5315 OS#4940<br>Change-Id: Ic665125255d7354f5499d10dda1dd866ab243d24<br>---<br>M include/osmocom/bsc/assignment_fsm.h<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/assignment_fsm.c<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/gsm_04_08_rr.c<br>M src/osmo-bsc/lchan_fsm.c<br>M src/osmo-bsc/lcs_loc_req.c<br>8 files changed, 81 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/assignment_fsm.h b/include/osmocom/bsc/assignment_fsm.h</span><br><span>index d4ed846..3a64f7d 100644</span><br><span>--- a/include/osmocom/bsc/assignment_fsm.h</span><br><span>+++ b/include/osmocom/bsc/assignment_fsm.h</span><br><span>@@ -41,7 +41,8 @@</span><br><span> </span><br><span> void assignment_fsm_init();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int reassignment_request_to_lchan(enum assign_for assign_for, struct gsm_lchan *lchan, struct gsm_lchan *to_lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+int reassignment_request_to_lchan(enum assign_for assign_for, struct gsm_lchan *lchan, struct gsm_lchan *to_lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsc_set, int tsc);</span><br><span> int reassignment_request_to_chan_type(enum assign_for assign_for, struct gsm_lchan *lchan,</span><br><span> enum gsm_chan_t new_lchan_type);</span><br><span> </span><br><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index f469e41..f2e6cfa 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -163,6 +163,13 @@</span><br><span> * multiplexing, user request via VTY). In these situations, select a target lchan beforehand and point</span><br><span> * target_lchan to it. */</span><br><span> struct gsm_lchan *target_lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TSC Set to use, or -1 for automatically determining the TSC Set to use. Valid range is 1 to 4, as described</span><br><span style="color: hsl(120, 100%, 40%);">+ * in 3GPP TS 45.002. */</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TSC to use, or -1 for automatically determining the TSC to use. Valid range is 0 to 7, as described in 3GPP</span><br><span style="color: hsl(120, 100%, 40%);">+ * TS 45.002. */</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsc;</span><br><span> };</span><br><span> </span><br><span> /* State of an ongoing Assignment, while the assignment_fsm is still busy. This serves as state separation to keep the</span><br><span>@@ -609,6 +616,13 @@</span><br><span> struct gsm_lchan *re_use_mgw_endpoint_from_lchan;</span><br><span> bool ta_known;</span><br><span> uint8_t ta;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TSC Set to use, or -1 for automatically determining the TSC Set to use. Valid range is 1 to 4, as described</span><br><span style="color: hsl(120, 100%, 40%);">+ * in 3GPP TS 45.002. */</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TSC to use, or -1 for automatically determining the TSC to use. Valid range is 0 to 7, as described in 3GPP</span><br><span style="color: hsl(120, 100%, 40%);">+ * TS 45.002. */</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsc;</span><br><span> };</span><br><span> </span><br><span> enum lchan_modify_for {</span><br><span>@@ -626,6 +640,13 @@</span><br><span> struct channel_mode_and_rate ch_mode_rate;</span><br><span> bool requires_voice_stream;</span><br><span> uint16_t msc_assigned_cic;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TSC Set to use, or -1 for automatically determining the TSC Set to use. Valid range is 1 to 4, as described</span><br><span style="color: hsl(120, 100%, 40%);">+ * in 3GPP TS 45.002. */</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TSC to use, or -1 for automatically determining the TSC to use. Valid range is 0 to 7, as described in 3GPP</span><br><span style="color: hsl(120, 100%, 40%);">+ * TS 45.002. */</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsc;</span><br><span> };</span><br><span> </span><br><span> struct gsm_lchan {</span><br><span>@@ -651,11 +672,15 @@</span><br><span> * occur later, e.g. during release, that we don't send a NACK out of context. */</span><br><span> bool concluded;</span><br><span> enum gsm0808_cause gsm0808_error_cause;</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc;</span><br><span> } activate;</span><br><span> </span><br><span> struct {</span><br><span> struct lchan_modify_info info;</span><br><span> struct gsm48_multi_rate_conf mr_conf_filtered;</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc;</span><br><span> bool concluded;</span><br><span> } modify;</span><br><span> </span><br><span>@@ -730,6 +755,12 @@</span><br><span> * channel_mode_and_rate. */</span><br><span> struct channel_mode_and_rate current_ch_mode_rate;</span><br><span> struct gsm48_multi_rate_conf current_mr_conf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Circuit-Switched TSC Set in use, or -1 if no specific TSC Set was requested. The valid range is 1-4 as</span><br><span style="color: hsl(120, 100%, 40%);">+ * described in the spec 3GPP TS 45.002. */</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Training Sequence Code in use. The valid range is 0-7 as described in the spec 3GPP TS 45.002. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc;</span><br><span> };</span><br><span> </span><br><span> /* One Timeslot in a TRX */</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index c2a2005..71bf0bb 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -528,7 +528,7 @@</span><br><span> }</span><br><span> </span><br><span> memset(&cd, 0, sizeof(cd));</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_lchan2chan_desc(&cd, lchan, gsm_ts_tsc(lchan->ts));</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_lchan2chan_desc(&cd, lchan, lchan->activate.tsc);</span><br><span> </span><br><span> msg = rsl_msgb_alloc();</span><br><span> dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh));</span><br><span>@@ -1801,7 +1801,7 @@</span><br><span> ia->proto_discr = GSM48_PDISC_RR;</span><br><span> ia->msg_type = GSM48_MT_RR_IMM_ASS;</span><br><span> ia->page_mode = GSM48_PM_SAME;</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_lchan2chan_desc(&ia->chan_desc, lchan, gsm_ts_tsc(lchan->ts));</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_lchan2chan_desc(&ia->chan_desc, lchan, lchan->tsc);</span><br><span> </span><br><span> /* use request reference extracted from CHAN_RQD */</span><br><span> memcpy(&ia->req_ref, lchan->rqd_ref, sizeof(ia->req_ref));</span><br><span>diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c</span><br><span>index b96dbb3..81de958 100644</span><br><span>--- a/src/osmo-bsc/assignment_fsm.c</span><br><span>+++ b/src/osmo-bsc/assignment_fsm.c</span><br><span>@@ -439,7 +439,7 @@</span><br><span> }</span><br><span> </span><br><span> static int _reassignment_request(enum assign_for assign_for, struct gsm_lchan *lchan, struct gsm_lchan *to_lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- enum gsm_chan_t new_lchan_type)</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_chan_t new_lchan_type, int tsc_set, int tsc)</span><br><span> {</span><br><span> struct gsm_subscriber_connection *conn = lchan->conn;</span><br><span> struct assignment_request req = {</span><br><span>@@ -450,6 +450,8 @@</span><br><span> .n_ch_mode_rate = 1,</span><br><span> .ch_mode_rate_list = { lchan->current_ch_mode_rate },</span><br><span> .target_lchan = to_lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc_set = tsc_set,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc = tsc,</span><br><span> };</span><br><span> </span><br><span> if (to_lchan)</span><br><span>@@ -469,15 +471,16 @@</span><br><span> return osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_ASSIGNMENT_START, &req);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int reassignment_request_to_lchan(enum assign_for assign_for, struct gsm_lchan *lchan, struct gsm_lchan *to_lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+int reassignment_request_to_lchan(enum assign_for assign_for, struct gsm_lchan *lchan, struct gsm_lchan *to_lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsc_set, int tsc)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return _reassignment_request(assign_for, lchan, to_lchan, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ return _reassignment_request(assign_for, lchan, to_lchan, 0, tsc_set, tsc);</span><br><span> }</span><br><span> </span><br><span> int reassignment_request_to_chan_type(enum assign_for assign_for, struct gsm_lchan *lchan,</span><br><span> enum gsm_chan_t new_lchan_type)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return _reassignment_request(assign_for, lchan, NULL, new_lchan_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ return _reassignment_request(assign_for, lchan, NULL, new_lchan_type, -1, -1);</span><br><span> }</span><br><span> </span><br><span> void assignment_fsm_start(struct gsm_subscriber_connection *conn, struct gsm_bts *bts,</span><br><span>@@ -635,6 +638,8 @@</span><br><span> .re_use_mgw_endpoint_from_lchan = conn->lchan,</span><br><span> .ta = conn->lchan->last_ta,</span><br><span> .ta_known = true,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc_set = req->tsc_set,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc = req->tsc,</span><br><span> };</span><br><span> lchan_activate(conn->assignment.new_lchan, &activ_info);</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 89f8c0e..ec625c4 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -1876,7 +1876,7 @@</span><br><span> vty_out(vty, "Error: cannot find free lchan of type %s%s",</span><br><span> gsm_lchant_name(from_lchan->type), VTY_NEWLINE);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (reassignment_request_to_lchan(ACTIVATE_FOR_VTY, from_lchan, to_lchan)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (reassignment_request_to_lchan(ACTIVATE_FOR_VTY, from_lchan, to_lchan, -1, -1)) {</span><br><span> vty_out(vty, "Error: not allowed to start assignment for %s%s",</span><br><span> gsm_lchan_name(from_lchan), VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span>@@ -6044,7 +6044,10 @@</span><br><span> /* Activate / Deactivate a single lchan with a specific codec mode */</span><br><span> static int lchan_act_single(struct vty *vty, struct gsm_lchan *lchan, const char *codec_str, int amr_mode, int activate)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct lchan_activate_info info = { };</span><br><span style="color: hsl(120, 100%, 40%);">+ struct lchan_activate_info info = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc_set = -1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc = -1,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> uint16_t amr_modes[8] =</span><br><span> { GSM0808_SC_CFG_AMR_4_75, GSM0808_SC_CFG_AMR_4_75_5_90_7_40_12_20, GSM0808_SC_CFG_AMR_5_90,</span><br><span> GSM0808_SC_CFG_AMR_6_70, GSM0808_SC_CFG_AMR_7_40, GSM0808_SC_CFG_AMR_7_95, GSM0808_SC_CFG_AMR_10_2,</span><br><span>diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>index 153f102..c0efafb 100644</span><br><span>--- a/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>+++ b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>@@ -618,7 +618,7 @@</span><br><span> * the chan_desc. But as long as multi-slot configurations</span><br><span> * are not used we seem to be fine.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_lchan2chan_desc(&ass->chan_desc, new_lchan, gsm_ts_tsc(new_lchan->ts));</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_lchan2chan_desc(&ass->chan_desc, new_lchan, new_lchan->tsc);</span><br><span> ass->power_command = power_command;</span><br><span> </span><br><span> /* Cell Channel Description (freq. hopping), TV (see 3GPP TS 44.018, 10.5.2.1b) */</span><br><span>@@ -681,6 +681,7 @@</span><br><span> struct gsm48_chan_mode_modify *cmm =</span><br><span> (struct gsm48_chan_mode_modify *) msgb_put(msg, sizeof(*cmm));</span><br><span> struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc;</span><br><span> </span><br><span> DEBUGP(DRR, "-> CHANNEL MODE MODIFY mode=0x%02x\n", mode);</span><br><span> </span><br><span>@@ -690,7 +691,8 @@</span><br><span> </span><br><span> /* fill the channel information element, this code</span><br><span> * should probably be shared with rsl_rx_chan_rqd() */</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_lchan2chan_desc(&cmm->chan_desc, lchan, gsm_ts_tsc(lchan->ts));</span><br><span style="color: hsl(120, 100%, 40%);">+ tsc = (lchan->modify.tsc >= 0) ? lchan->modify.tsc : gsm_ts_tsc(lchan->ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_lchan2chan_desc(&cmm->chan_desc, lchan, tsc);</span><br><span> cmm->mode = mode;</span><br><span> </span><br><span> /* in case of multi rate we need to attach a config */</span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index a3438f7..1610ac3 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -457,6 +457,8 @@</span><br><span> .last_error = lchan->last_error,</span><br><span> </span><br><span> .release.rr_cause = GSM48_RR_CAUSE_NORMAL,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc_set = 1,</span><br><span> };</span><br><span> }</span><br><span> </span><br><span>@@ -713,6 +715,15 @@</span><br><span> </span><br><span> lchan->encr = lchan->activate.info.encr;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->activate.info.tsc_set > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->activate.tsc_set = lchan->activate.info.tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->activate.tsc_set = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Use the TSC provided in the modification request, if any. Otherwise use the timeslot's configured</span><br><span style="color: hsl(120, 100%, 40%);">+ * TSC. */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->activate.tsc = (lchan->activate.info.tsc >= 0) ? lchan->activate.info.tsc : gsm_ts_tsc(lchan->ts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> rc = rsl_tx_chan_activ(lchan, act_type, ho_ref);</span><br><span> if (rc) {</span><br><span> lchan_fail_to(LCHAN_ST_UNUSED, "Tx Chan Activ failed: %s (%d)", strerror(-rc), rc);</span><br><span>@@ -786,6 +797,8 @@</span><br><span> </span><br><span> lchan->current_ch_mode_rate = lchan->activate.info.ch_mode_rate;</span><br><span> lchan->current_mr_conf = lchan->activate.mr_conf_filtered;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->tsc_set = lchan->activate.tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->tsc = lchan->activate.tsc;</span><br><span> LOG_LCHAN(lchan, LOGL_INFO, "Rx Activ ACK %s\n",</span><br><span> gsm48_chan_mode_name(lchan->current_ch_mode_rate.chan_mode));</span><br><span> </span><br><span>@@ -958,6 +971,8 @@</span><br><span> /* The Channel Mode Modify was ACKed, now the requested values become the accepted and used values. */</span><br><span> lchan->current_ch_mode_rate = lchan->modify.info.ch_mode_rate;</span><br><span> lchan->current_mr_conf = lchan->modify.mr_conf_filtered;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->tsc_set = lchan->modify.tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->tsc = lchan->modify.tsc;</span><br><span> </span><br><span> if (lchan->modify.info.requires_voice_stream</span><br><span> && !lchan->fi_rtp) {</span><br><span>@@ -1117,15 +1132,25 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->modify.info.tsc_set > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->modify.tsc_set = lchan->modify.info.tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->modify.tsc_set = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Use the TSC provided in the modification request, if any. Otherwise use the timeslot's configured</span><br><span style="color: hsl(120, 100%, 40%);">+ * TSC. */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->modify.tsc = (lchan->modify.info.tsc >= 0) ? lchan->modify.info.tsc : gsm_ts_tsc(lchan->ts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> LOG_LCHAN(lchan, LOGL_INFO,</span><br><span style="color: hsl(0, 100%, 40%);">- "Modification requested: %s voice=%s MGW-ci=%s type=%s tch-mode=%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Modification requested: %s voice=%s MGW-ci=%s type=%s tch-mode=%s tsc=%d/%u\n",</span><br><span> lchan_modify_for_name(lchan->modify.info.modify_for),</span><br><span> lchan->modify.info.requires_voice_stream ? "yes" : "no",</span><br><span> lchan->modify.info.requires_voice_stream ?</span><br><span> (use_mgwep_ci ? osmo_mgcpc_ep_ci_name(use_mgwep_ci) : "new")</span><br><span> : "none",</span><br><span> gsm_lchant_name(lchan->type),</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_chan_mode_name(lchan->modify.info.ch_mode_rate.chan_mode));</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_chan_mode_name(lchan->modify.info.ch_mode_rate.chan_mode),</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->modify.tsc_set, lchan->modify.tsc);</span><br><span> </span><br><span> lchan_fsm_state_chg(LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK);</span><br><span> return;</span><br><span>diff --git a/src/osmo-bsc/lcs_loc_req.c b/src/osmo-bsc/lcs_loc_req.c</span><br><span>index ef9ee27..ee85c91 100644</span><br><span>--- a/src/osmo-bsc/lcs_loc_req.c</span><br><span>+++ b/src/osmo-bsc/lcs_loc_req.c</span><br><span>@@ -369,7 +369,7 @@</span><br><span> .cause = BSSLAP_CAUSE_INTRA_BSS_HO,</span><br><span> },</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_lchan2chan_desc(&apdu->reset.chan_desc, lchan, gsm_ts_tsc(lchan->ts));</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_lchan2chan_desc(&apdu->reset.chan_desc, lchan, lchan->tsc);</span><br><span> }</span><br><span> </span><br><span> lcs_loc_req_send(lcs_loc_req, &bsslap);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24369">change 24369</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/+/24369"/><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: Ic665125255d7354f5499d10dda1dd866ab243d24 </div>
<div style="display:none"> Gerrit-Change-Number: 24369 </div>
<div style="display:none"> Gerrit-PatchSet: 11 </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: 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>