<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24516">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fixup for Mode Modify TSC<br><br>Use lchan->modify.tsc in gsm48_lchan_modify().<br><br>The TSC is chosen exactly once upon LCHAN_EV_REQUEST_MODE_MODIFY<br>(lchan_fsm.c), and that should be the only place calling gsm_ts_tsc().<br>All other mode modify code should just use the final lchan->modify.tsc.<br><br>This fixes an error in patch:<br>Ic665125255d7354f5499d10dda1dd866ab243d24<br>"allow explixit TSC Set and TSC on chan activ / modif / assignment"<br><br>Thanks to coverity for actually detecting this mistake.<br><br>Related: SYS#5315 OS#4940 CID#236233<br>Change-Id: I87ecf7d9266f37f4c775d029e277b614671a9401<br>---<br>M src/osmo-bsc/gsm_04_08_rr.c<br>1 file changed, 1 insertion(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/16/24516/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><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 058a107..5948e94 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>@@ -681,7 +681,6 @@</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(0, 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>@@ -689,10 +688,7 @@</span><br><span>   gh->proto_discr = GSM48_PDISC_RR;</span><br><span>         gh->msg_type = GSM48_MT_RR_CHAN_MODE_MODIF;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      /* fill the channel information element, this code</span><br><span style="color: hsl(0, 100%, 40%);">-       * should probably be shared with rsl_rx_chan_rqd() */</span><br><span style="color: hsl(0, 100%, 40%);">-  tsc = (lchan->modify.tsc >= 0) ? lchan->modify.tsc : gsm_ts_tsc(lchan->ts);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_lchan2chan_desc(&cmm->chan_desc, lchan, tsc);</span><br><span style="color: hsl(120, 100%, 40%);">+    gsm48_lchan2chan_desc(&cmm->chan_desc, lchan, lchan->modify.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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24516">change 24516</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/+/24516"/><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: I87ecf7d9266f37f4c775d029e277b614671a9401 </div>
<div style="display:none"> Gerrit-Change-Number: 24516 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>