<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24297">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm48_send_rr_ass_cmd(): rename lchan to new_lchan<br><br>Clarify that this is the lchan that is being assigned to the MS, in<br>contrast to the current lchan.<br><br>Change-Id: I0de017f7c43ec495c2cd0f05f313740f42ab0bb1<br>---<br>M src/osmo-bsc/gsm_04_08_rr.c<br>1 file changed, 10 insertions(+), 10 deletions(-)<br><br></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 e308575..764af72 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>@@ -566,14 +566,14 @@</span><br><span> }</span><br><span> </span><br><span> /* Chapter 9.1.2: Assignment Command */</span><br><span style="color: hsl(0, 100%, 40%);">-int gsm48_send_rr_ass_cmd(struct gsm_lchan *current_lchan, struct gsm_lchan *lchan, uint8_t power_command)</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm48_send_rr_ass_cmd(struct gsm_lchan *current_lchan, struct gsm_lchan *new_lchan, uint8_t power_command)</span><br><span> {</span><br><span> struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 ASS CMD");</span><br><span> struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh));</span><br><span> struct gsm48_ass_cmd *ass =</span><br><span> (struct gsm48_ass_cmd *) msgb_put(msg, sizeof(*ass));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DRR, "-> ASSIGNMENT COMMAND tch_mode=0x%02x\n", lchan->tch_mode);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DRR, "-> ASSIGNMENT COMMAND tch_mode=0x%02x\n", new_lchan->tch_mode);</span><br><span> </span><br><span> msg->lchan = current_lchan;</span><br><span> gh->proto_discr = GSM48_PDISC_RR;</span><br><span>@@ -587,28 +587,28 @@</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, lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_lchan2chan_desc(&ass->chan_desc, new_lchan);</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 style="color: hsl(0, 100%, 40%);">- if (lchan->ts->hopping.enabled) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (new_lchan->ts->hopping.enabled) {</span><br><span> const struct gsm48_system_information_type_1 *si1 = \</span><br><span style="color: hsl(0, 100%, 40%);">- GSM_BTS_SI(lchan->ts->trx->bts, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ GSM_BTS_SI(new_lchan->ts->trx->bts, 1);</span><br><span> msgb_tv_fixed_put(msg, GSM48_IE_CELL_CH_DESC,</span><br><span> sizeof(si1->cell_channel_description),</span><br><span> si1->cell_channel_description);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tv_put(msg, GSM48_IE_CHANMODE_1, lchan->tch_mode);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tv_put(msg, GSM48_IE_CHANMODE_1, new_lchan->tch_mode);</span><br><span> </span><br><span> /* Mobile Allocation (freq. hopping), TLV (see 3GPP TS 44.018, 10.5.2.21) */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->ts->hopping.enabled) {</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tlv_put(msg, GSM48_IE_MA_AFTER, lchan->ts->hopping.ma_len,</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ts->hopping.ma_data);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (new_lchan->ts->hopping.enabled) {</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tlv_put(msg, GSM48_IE_MA_AFTER, new_lchan->ts->hopping.ma_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ new_lchan->ts->hopping.ma_data);</span><br><span> }</span><br><span> </span><br><span> /* in case of multi rate we need to attach a config */</span><br><span style="color: hsl(0, 100%, 40%);">- mr_config_for_ms(lchan, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ mr_config_for_ms(new_lchan, msg);</span><br><span> </span><br><span> return gsm48_sendmsg(msg);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24297">change 24297</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/+/24297"/><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: I0de017f7c43ec495c2cd0f05f313740f42ab0bb1 </div>
<div style="display:none"> Gerrit-Change-Number: 24297 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: fixeria <vyanitskiy@sysmocom.de> </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>