Change in libosmocore[master]: frame_relay, gprs_ns2_fr: Fix log messages, remove unused struct

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26211 )

Change subject: frame_relay, gprs_ns2_fr: Fix log messages, remove unused struct
......................................................................

frame_relay, gprs_ns2_fr: Fix log messages, remove unused struct

Fix typo and remove any reference to GRE from gprs_ns2_fr.c.
GRE code is in gprs_ns2_frgre.c

Change-Id: I51c756f3c9d918552591bf87861cb4799721ac37
---
M src/gb/frame_relay.c
M src/gb/gprs_ns2_fr.c
2 files changed, 3 insertions(+), 8 deletions(-)

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



diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c
index 4d1df67..2c252fd 100644
--- a/src/gb/frame_relay.c
+++ b/src/gb/frame_relay.c
@@ -652,7 +652,7 @@
 
 	/* 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 35e0dd9..4e848be 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 @@
 	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;

-- 
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26211
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I51c756f3c9d918552591bf87861cb4799721ac37
Gerrit-Change-Number: 26211
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211111/9e41abe5/attachment.htm>