<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/26211">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">frame_relay, gprs_ns2_fr: Fix log messages, remove unused struct<br><br>Fix typo and remove any reference to GRE from gprs_ns2_fr.c.<br>GRE code is in gprs_ns2_frgre.c<br><br>Change-Id: I51c756f3c9d918552591bf87861cb4799721ac37<br>---<br>M src/gb/frame_relay.c<br>M src/gb/gprs_ns2_fr.c<br>2 files changed, 3 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c</span><br><span>index 4d1df67..2c252fd 100644</span><br><span>--- a/src/gb/frame_relay.c</span><br><span>+++ b/src/gb/frame_relay.c</span><br><span>@@ -652,7 +652,7 @@</span><br><span> </span><br><span>     /* check for mandatory IEs */</span><br><span>        if (!TLVP_PRES_LEN(tp, Q933_IEI_REPORT_TYPE, 1)) {</span><br><span style="color: hsl(0, 100%, 40%);">-              LOGPFRL(link, LOGL_NOTICE, "Rx STATUSL: Missing TLV Q933 Report Type\n");</span><br><span style="color: hsl(120, 100%, 40%);">+           LOGPFRL(link, LOGL_NOTICE, "Rx STATUS: Missing TLV Q933 Report Type\n");</span><br><span>           return -1;</span><br><span>   }</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c</span><br><span>index 35e0dd9..4e848be 100644</span><br><span>--- a/src/gb/gprs_ns2_fr.c</span><br><span>+++ b/src/gb/gprs_ns2_fr.c</span><br><span>@@ -83,11 +83,6 @@</span><br><span> /* nanoseconds per bit (504) */</span><br><span> #define BIT_DURATION_NS (1000000000 / SUPERCHANNEL_LINERATE)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gre_hdr {</span><br><span style="color: hsl(0, 100%, 40%);">-  uint16_t flags;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t ptype;</span><br><span style="color: hsl(0, 100%, 40%);">-} __attribute__ ((packed));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void free_bind(struct gprs_ns2_vc_bind *bind);</span><br><span> static int fr_dlci_rx_cb(void *cb_data, struct msgb *msg);</span><br><span> </span><br><span>@@ -256,13 +251,13 @@</span><br><span>        if (!(what & OSMO_FD_READ))</span><br><span>              return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   msg = msgb_alloc(NS_ALLOC_SIZE, "Gb/NS/FR/GRE Rx");</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = msgb_alloc(NS_ALLOC_SIZE, "Gb/NS/FR Rx");</span><br><span>    if (!msg)</span><br><span>            return -ENOMEM;</span><br><span> </span><br><span>  rc = recvfrom(bfd->fd, msg->data, NS_ALLOC_SIZE, 0, (struct sockaddr *)&sll, &sll_len);</span><br><span>        if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                LOGBIND(bind, LOGL_ERROR, "recv error %s during NS-FR-GRE recv\n", strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+                LOGBIND(bind, LOGL_ERROR, "recv error %s during NS-FR recv\n", strerror(errno));</span><br><span>           goto out_err;</span><br><span>        } else if (rc == 0) {</span><br><span>                goto out_err;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/26211">change 26211</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/libosmocore/+/26211"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I51c756f3c9d918552591bf87861cb4799721ac37 </div>
<div style="display:none"> Gerrit-Change-Number: 26211 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@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: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>