<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11218">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">layer23/l1ctl.c: avoid confusion between L1CTL / L1 headers<br><br>As we assign the payload following L1CTL header to 'msg->l1h',<br>it makes sense to avoid possible naming confusion.<br><br>Change-Id: I5d21ca8664b3445f472d3ffde90d0e11805dcb16<br>---<br>M src/host/layer23/src/common/l1ctl.c<br>1 file changed, 7 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c</span><br><span>index c8695ca..642cde8 100644</span><br><span>--- a/src/host/layer23/src/common/l1ctl.c</span><br><span>+++ b/src/host/layer23/src/common/l1ctl.c</span><br><span>@@ -872,10 +872,10 @@</span><br><span> int l1ctl_recv(struct osmocom_ms *ms, struct msgb *msg)</span><br><span> {</span><br><span> int rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- struct l1ctl_hdr *l1h;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct l1ctl_hdr *hdr;</span><br><span> </span><br><span> /* Make sure a message has L1CTL header (pointed by msg->l1h) */</span><br><span style="color: hsl(0, 100%, 40%);">- if (msgb_l1len(msg) < sizeof(*l1h)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msgb_l1len(msg) < sizeof(*hdr)) {</span><br><span> LOGP(DL1C, LOGL_ERROR, "Short L1CTL message, "</span><br><span> "missing the header (len=%u)\n", msgb_l1len(msg));</span><br><span> msgb_free(msg);</span><br><span>@@ -883,14 +883,14 @@</span><br><span> }</span><br><span> </span><br><span> /* Pull the L1CTL header from the msgb */</span><br><span style="color: hsl(0, 100%, 40%);">- l1h = (struct l1ctl_hdr *) msg->l1h;</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr = (struct l1ctl_hdr *) msg->l1h;</span><br><span> msgb_pull(msg, sizeof(struct l1ctl_hdr));</span><br><span> </span><br><span> /* move the l1 header pointer to point _BEHIND_ l1ctl_hdr,</span><br><span> as the l1ctl header is of no interest to subsequent code */</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l1h = l1h->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->l1h = hdr->data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- switch (l1h->msg_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (hdr->msg_type) {</span><br><span> case L1CTL_FBSB_CONF:</span><br><span> rc = rx_l1_fbsb_conf(ms, msg);</span><br><span> msgb_free(msg);</span><br><span>@@ -908,7 +908,7 @@</span><br><span> break;</span><br><span> case L1CTL_PM_CONF:</span><br><span> rc = rx_l1_pm_conf(ms, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- if (l1h->flags & L1CTL_F_DONE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (hdr->flags & L1CTL_F_DONE)</span><br><span> osmo_signal_dispatch(SS_L1CTL, S_L1CTL_PM_DONE, ms);</span><br><span> msgb_free(msg);</span><br><span> break;</span><br><span>@@ -937,7 +937,7 @@</span><br><span> msgb_free(msg);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1C, LOGL_ERROR, "Unknown MSG: %u\n", l1h->msg_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1C, LOGL_ERROR, "Unknown MSG: %u\n", hdr->msg_type);</span><br><span> msgb_free(msg);</span><br><span> break;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11218">change 11218</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/11218"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5d21ca8664b3445f472d3ffde90d0e11805dcb16 </div>
<div style="display:none"> Gerrit-Change-Number: 11218 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>