diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c index 4d1df6722..2c252fd56 100644 --- a/src/gb/frame_relay.c +++ b/src/gb/frame_relay.c @@ -652,7 +652,7 @@ static int rx_lmi_q933_status(struct msgb *msg, struct tlv_parsed *tp) /* check for mandatory IEs */ if (!TLVP_PRES_LEN(tp, Q933_IEI_REPORT_TYPE, 1)) { - LOGPFRL(link, LOGL_NOTICE, "Rx STATUSL: Missing TLV Q933 Report Type\n"); + LOGPFRL(link, LOGL_NOTICE, "Rx STATUS: Missing TLV Q933 Report Type\n"); return -1; } diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 35e0dd9ec..4e848be8b 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -83,11 +83,6 @@ /* nanoseconds per bit (504) */ #define BIT_DURATION_NS (1000000000 / SUPERCHANNEL_LINERATE) -struct gre_hdr { - uint16_t flags; - uint16_t ptype; -} __attribute__ ((packed)); - static void free_bind(struct gprs_ns2_vc_bind *bind); static int fr_dlci_rx_cb(void *cb_data, struct msgb *msg); @@ -256,13 +251,13 @@ static int fr_netif_ofd_cb(struct osmo_fd *bfd, uint32_t what) if (!(what & OSMO_FD_READ)) return 0; - msg = msgb_alloc(NS_ALLOC_SIZE, "Gb/NS/FR/GRE Rx"); + msg = msgb_alloc(NS_ALLOC_SIZE, "Gb/NS/FR Rx"); if (!msg) return -ENOMEM; rc = recvfrom(bfd->fd, msg->data, NS_ALLOC_SIZE, 0, (struct sockaddr *)&sll, &sll_len); if (rc < 0) { - LOGBIND(bind, LOGL_ERROR, "recv error %s during NS-FR-GRE recv\n", strerror(errno)); + LOGBIND(bind, LOGL_ERROR, "recv error %s during NS-FR recv\n", strerror(errno)); goto out_err; } else if (rc == 0) { goto out_err;