<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13857">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;">mobile/gsm48_mm.c: use proper types for gsm48_rr_hdr<br><br>Change-Id: I29ed122b8956260b9f847cc0e3e81a28d6762632<br>---<br>M src/host/layer23/src/mobile/gsm48_mm.c<br>1 file changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c</span><br><span>index 02d861e..872dce5 100644</span><br><span>--- a/src/host/layer23/src/mobile/gsm48_mm.c</span><br><span>+++ b/src/host/layer23/src/mobile/gsm48_mm.c</span><br><span>@@ -3583,7 +3583,7 @@</span><br><span>  */</span><br><span> </span><br><span> static int gsm48_rcv_rr_sapi3(struct osmocom_ms *ms, struct msgb *msg,</span><br><span style="color: hsl(0, 100%, 40%);">- int msg_type, uint8_t sapi)</span><br><span style="color: hsl(120, 100%, 40%);">+                         uint32_t msg_type, uint8_t sapi)</span><br><span> {</span><br><span>  struct gsm48_mmlayer *mm = &ms->mmlayer;</span><br><span>      struct gsm48_mm_conn *conn;</span><br><span>@@ -3895,12 +3895,12 @@</span><br><span> {</span><br><span>   struct gsm48_mmlayer *mm = &ms->mmlayer;</span><br><span>      struct gsm48_rr_hdr *rrh = (struct gsm48_rr_hdr *)msg->data;</span><br><span style="color: hsl(0, 100%, 40%);">- int msg_type = rrh->msg_type;</span><br><span style="color: hsl(0, 100%, 40%);">-        int sapi = rrh->sapi;</span><br><span style="color: hsl(120, 100%, 40%);">+      uint32_t msg_type = rrh->msg_type;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sapi = rrh->sapi;</span><br><span>         int i, rc;</span><br><span> </span><br><span>       LOGP(DMM, LOGL_INFO, "(ms %s) Received '%s' from RR in state %s "</span><br><span style="color: hsl(0, 100%, 40%);">-             "(sapi %d)\n", ms->name, get_rr_name(msg_type),</span><br><span style="color: hsl(120, 100%, 40%);">+          "(sapi %u)\n", ms->name, get_rr_name(msg_type),</span><br><span>                 gsm48_mm_state_names[mm->state], sapi);</span><br><span> </span><br><span>       if (sapi)</span><br><span>@@ -3969,7 +3969,7 @@</span><br><span> {</span><br><span>       struct gsm48_mmlayer *mm = &ms->mmlayer;</span><br><span>      struct gsm48_rr_hdr *rrh = (struct gsm48_rr_hdr *)msg->data;</span><br><span style="color: hsl(0, 100%, 40%);">- int sapi = rrh->sapi;</span><br><span style="color: hsl(120, 100%, 40%);">+      uint8_t sapi = rrh->sapi;</span><br><span>         struct gsm48_hdr *gh = msgb_l3(msg);</span><br><span>         uint8_t pdisc = gh->proto_discr & 0x0f;</span><br><span>       uint8_t msg_type = gh->msg_type & 0xbf;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13857">change 13857</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/13857"/><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: I29ed122b8956260b9f847cc0e3e81a28d6762632 </div>
<div style="display:none"> Gerrit-Change-Number: 13857 </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>